Lots of little fixes, plus chapter 9 example.

cleanup