add/modify comments
Merge pull request #506 from forumbyr/master

add/modify comments; delete unused code.