Fix + normalize computation of FS / PFS; add unit tests