Minor edits, comments added
Weird merge issue, so I took the raw data from Kurt's last commit and put it in my branch