Animation Changes and Fixes