minor edits
merged branches
minor changes_2