Improvements to the super-energyshot.