finished more minor edits