animations, bug fixes