comment out friend class from pfarg
merge master to jz
remove pfARG lines from scrm
clean up pfarg code from master