Fixed a lot of Bugs about the Animation