Edits to take care of some remaining issues in the text that Caleb wrote.