Added safety check for when controller goes offline. Also added joystick...

... enabled override of controller