reverted to standard cartesian controllers
changed deadman switch to #5