small edits
merge