WIP. Add Animals flag, various tweaks