A few more minor edits