chapter 8

(and typo fix in 7-2)