synced txt file
Added some comments accidentally synced to master
various minor edits
Merge branch 'master' into ben-work-in-progress

Trying to fix a merge issue.