finishing touches plus benchmarking code