Use Caliper for benchmarks and some small fixes