Minor additions and fixes from the review

[hlgr360]

Thanks for the pull .. @Kodrafo is currently on vacation until the end of the week. We will review the changes and either merge or comment .. :) ...