Updated plot and pf code for new file naming conventions, RM pf