PFS and ACG changes

I copied my changes to another folder, deleted and recreated by branch,
then copied back in.
Merge pull request #100 from mjmeans/pfs

PFS and ACG changes