some more minor edits