Minor changes
wip
Add some more Benchmark's