lots of small edits