benchmarks and perf improvements