Reordered intervention points to address two bugs/feature requests, and replaced exit instructions with stop and go commands