Animation bug fixes

some fixes