some fixes regarding animation refactoring