Some misc late night controler refactoring.