Merge pull request #613 from afs/comments

Improve some comments