add comments
Merge pull request #20 from streetlight/master

add comments, clean up