minor edits
merging