more progress on comments.
Merge pull request #178 from jivedesign/master

more progress on comments.