Bugfixes on the animation