a bunch of edits...