more minor work on the CLI class