fix animations
change some variable namings