lots of tiny edits