Some fixes, trying to make clearAnimals work