Fix PSSM bugs, not finished