minor fix, Comment UI
docblocks update

[ci skip]