Fixed some animation and input bugs