worked through most edits