fix output of tot dipole, misc fixes