Fix animations and a few minor tweaks