fix to Z and plotting
lots of changes to plots and adding separate fr and Z and loose cutflow