more optimizations; updated benchmark results