added energy graph, changed graph outputs