fixed more cli problems (more to follow for sure)