A variety of animation and FSM fixes