Re: animate: audit and some fixes