update for lots of comments in PR #169