more edits

mostly giving up on dealing with the comments in this submission round