fixed null pointer and other things mostly in the animation thing