Add pf config + misc changes