Bunch of comment fixes
Merge pull request #60 from smokin-guns/master

Bunch of comment fixes