Fixing animation and keybidings, and commit