misc fixes

Misc issues/things I noticed while reading through (most of) this tutorial.