changed objective energy norm to be in MWh. adjusted EA params