Fixed switches, removed old sysouts and added TODO to Controller for
properties