Edits to chapters 5 and 1