fixed more cli problems