Implemented several changes to the benchmarking class. Further work is
necessary.