adds and cleans up run helpers