various cli interface refinements