Various changes and improvements & PF Model Fitting  - working on it