Finished incorporating all of Michael's round 1 comments