clean-up; anim working