Moving to SOAD guess, switching to two space indent mpqc style, small amount of reorganization of the wfn->scf->clscf structure.