several cli improvements