comments; typos; minor refactorings
Merge branch 'comments'