bug fixes in Animation