various whitespace and comments fixes (nw)
Merge pull request #75 from shattered/_23d4641

various whitespace and comments fixes (nw)