properly end 'run' mode, improve timings
0.2.1