animation fix
cleanup + animating