Merge branch 'john' into 'main'

Misc. changes I found when going through the tutorial

See merge request !20