Loadtest tweaks

I'll add some comments throughout the diff to explain the different changes.