many small edits