Average P1,P2,P3 S for funnel plots; fix bugs in ordering of facets and parititions; add box plots for f and modified f