Various edits and clarifications and style fixes