final first pass of edits