Minor improvements to chapters 2 and 3