PFS updates

There are also some ACG key name corrections in here