misc fixes

Misc issues/things I noticed while reading through (most of) this tutorial.
Merge pull request #4 from solussd/patch-1

misc fixes