Minor updates

A couple more updates for Chapter 2. Would you like me to keep the commits and pull requests small, or  or you happy for me to update more in one go? (around a chapter a time, and I'll make sure there's at least one commit per file).