animation and bug fixes
merge conflict on animation and bug fixes