Benchmark improvements + more comments