Final tweaks to agents