animations and fixes