Minor tweaks to power system logic, still incomplete