benchmarks and minor bug fix