improve benchmarks, fix functional rbtree bench
minor cleanup