Minor fixes to the animation, now it's more "logical"