cleaned up animations and made some small changes