More animation changes

and some bugs