more cli changes