cli improvements