first stab at fixing benchmarks