Fixed and improved EnergyNetwork a bit