Incorporate patches to chapter 1, and the add chapter 5

Hi Peter

I've re-created the b.1 branch from scratch, so I guess it'd be best if you deleted any pre-existing copy.

Cheers
Ron