finally all animations ironed out