More animation, fixed some bugs