animation, bug fixes