Ok, some
Minor tweaks
Another very minor tweak
Working on updating the workload model