Minor tweaks to energy system