animations + fixes