mostly benchmarking and some clean up