Small fixes

Whilst reading I'm doing some improvements of your book. It's great experience.

I've made lots of commits so you can follow them easily one by one.
I recommend you read my commit messages and changes thoroughly before merging as I'm not sure if all of them are the best choices.