Merging in intervene functionality, and some additional CLI refinements