Edits to last few sections, see #82