Better animations and other stuff