Fix calculation of 2-electron energy and calculation in solver