Minor behaviour tweaks
Merge branch 'master' of https://github.com/Bonemind/ProftaakMW