a few last improvements to using both momenta in diagonalizations