animation + fixes