major edits, midnight-ish commit.