Did corrections, and peer reviewed Jeff's work.

Let me know if anything looks wrong