Animations and other fixes