Added animations, fixed defaults