Processed most of the reviewer's commentary
Cleaned up some references