Review and PF score improvements