Animations and bugfixes