Fixed a few animation bugs
Merge branch 'anim-state-bugs'