New Benchmarks + some fixes.