fixed more cli problems (what the hell I changed this already)