ROADMAP-1091 #bugfixes, finishing touches