bugfixes in controller and dalliance