Feature/summer optimize benchmark

Follows on from earlier PR, mostly optimizations, but more benchmarking