bunch of small edits