Beefing up `Agents` to make it sane, and in preparation for coming fun