major edits, evening commit.