Some animation updates and fixes