small changes to the animations
All merge fixes, new changes, and animations