several bugs fixed, now correct for non-interacting, particle-conserving Hamiltonians