more edits

first round of edits complete