severel bugfixes regarding animations