small edits
merged