Some fixes on the animation...