Mostly minor edits