Minor edits
Merged changes, made more edits.