update for single-run reporing, and many other things