cli: more changes to the cli command