a lot of small edits