start of final round of major edits!