cli.js: slight changes