minor changes
Merge branch 'nico-branch'
hotfix for home_controller bug
more debug hotfixes