Fixed a bit of animation bug but still need more testing