Made a bunch of small changes, mainly stylistic, and added a few flags for discussion tomorrow.