fixes to controller