Editing for clarity and correctness
Merge pull request #1 from codemiller/master

Merging, but will roll back a few of these (e.g., comma outside quotes...)