PPM: various changes
Merge pull request #457 from JakeSFR/sfr

PPM: various changes