More animation simplification and change in speed
Getting rid of magic number nonsense.