Controller: tweaks and bug fixes