removing old comments, making minor edits
merged bunch of small conflicts.