fixing bugs, improving benchmarks