Various fixes and some Chapter 9 exercises