animations and a few bug fixes