Edits up to section 2.1.1.