added animations, fixed a bug