Minor tweaks and batching the plotwatt readings