Minor refactoring and tweaks. Trying to reduce the wait time to clean-up a benchmark run
Minor tweaks... We have a real problem at 4 partitions per site that we need to track down now...