controller fixes
controller fixes