more fixes, smart_animal