Final touches on the CLI