bug fixes and anim