various changes from laptop repo
fixed merge in pssm
fixed merge