Minor changes to animations and paint