Miscellaneous fixes. Testing and fixing behavior and animal, mostly.