minor cleanup, add stop_flow
3 files changed