More simple changes from Jon Forrest
And more Jon Forrest changes
Merge pull request #20 from nobozo/master

Probably the last of ch1-2 edits.