Fix animations, other minor cosmetic tweaks