fixes to animator, some more stuff