Evan's revisions, mainly trying to clarify and clean up

Let me know if any of the changes are weird and I can fix!