Lots of comments a a few very minor code cleanups
Merge pull request #16 from kajames/18mar13

Lots of comments a a few very minor code cleanups