Animations and Bugfix