Pfs boons

Merge before release.