Fixes:
* missing commas
* comment logging
Merge pull request #2 from yhwh/current-master

General clean up. Thanks @yhwh