minor update, cleanup and improved calculation PFD