major edits, afternoon commit.