Addition to Ch 3, 7, fixes in Ch 2, Ch 4