updates
Merge pull request #59 from timrichardson/1970e6f5596a96358cbcba2202bc1fa69211a389

Minor improvements to ch 6 & 7