More minor corrections
Merge pull request #23 from nobozo/master

Up through Chap. 5