Chap 4 review plus many other minor changes.
Merge pull request #22 from nobozo/master

Chapter 4 edits