Remove some debugging stuff
Fix diagonalization of overlap matrices