More minor edits, ready for feedback