Cleanup the DocBlocks, add missing variables.
Merge pull request #37 from vinkla/fixup-docblocks

Cleanup DocBlocks and comments.