added the surface currents and normalized fluxes