Patch for controllers

Update that addresses some bugs people were having using controllers.