Fixes #3, #7 and #8; fixes overriden controllers (missing return)