Fix padding issues
Issue #9 - Add ability for comments.

Just the initial pass. Lots more to do!