a bunch of edits, some responding to reviewer comments