Fixing animation stuff