Copy-editing for chapter 2
Add index for chapter 2.
Plus lots of stuff to make it more robust