bug fixes and tweaks
Merge branch 'master' of https://github.com/SEPR13-SAW/ini-hou