Bunch of controller bugfixes and adjustments.