add animations
fix bugs