made minor edits throughout
merged