jay's updates
clean up comments
Merge pull request #1 from pzhine/master

jay's updates