minor tweaks
Merge branch 'trunk' of https://github.com/jeroen77/kabaal into trunk