Update for correct number of cores
Add in tabbing of benchmark results
Tidy up