Chapter 8

Various small changes.