multiple improvements to animator