Last bit of comments

Looks like it works now.

I will create another separate branch for issuing pull request,
because this branch has code in an earlier pull request, which
has not been merged into the upstream.