cleaning up and tweaks to animations