Further edits in ch. 2