first round of edits and notes