Small improvements to Chapter 6
Merge pull request #217 from rylev/ch6-changes

Small improvements to Chapter 6