Final edits
Tweaked comments