Committing some changes before I pull Les' version
Fixed conflict
Fixed references. Made some more edits. Mostly complete.