builder class, from_cli. tests. tweaks.