diff --git a/objectPerformance/cfg_plots/V29/electron_matching.yaml b/objectPerformance/cfg_plots/V29/electron_matching.yaml
index 3aa0d2b8..7ca9cf12 100644
--- a/objectPerformance/cfg_plots/V29/electron_matching.yaml
+++ b/objectPerformance/cfg_plots/V29/electron_matching.yaml
@@ -41,7 +41,7 @@ ElectronsMatchingBarrel:
   ylabel: "Matching Efficiency (Barrel)"
   binning:
     min: 0
-    max: 150
+    max: 100
     step: 3
 
 ElectronsMatchingEndcap:
@@ -87,5 +87,5 @@ ElectronsMatchingEndcap:
   ylabel: "Matching Efficiency (Endcap)"
   binning:
     min: 0
-    max: 150
+    max: 100
     step: 3
diff --git a/objectPerformance/cfg_plots/V29/electron_trigger.yaml b/objectPerformance/cfg_plots/V29/electron_trigger.yaml
index c843c782..2e615595 100644
--- a/objectPerformance/cfg_plots/V29/electron_trigger.yaml
+++ b/objectPerformance/cfg_plots/V29/electron_trigger.yaml
@@ -45,7 +45,7 @@ ElectronsTriggerBarrel:
   ylabel: "Trigger Efficiency (barrel, L1 $p_T > <threshold>$ GeV)"
   binning:
     min: 0
-    max: 150
+    max: 100
     step: 1.5
 
 ElectronsTriggerEndcap:
@@ -95,5 +95,5 @@ ElectronsTriggerEndcap:
   ylabel: "Trigger Efficiency (endcap, L1 $p_T > <threshold>$ GeV)"
   binning:
     min: 0
-    max: 150
+    max: 100
     step: 1.5
diff --git a/objectPerformance/cfg_plots/V29/jets_matching.yaml b/objectPerformance/cfg_plots/V29/jets_matching.yaml
index 9fb5c078..b979ebdb 100644
--- a/objectPerformance/cfg_plots/V29/jets_matching.yaml
+++ b/objectPerformance/cfg_plots/V29/jets_matching.yaml
@@ -49,12 +49,12 @@ JetMatchingBarrel:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    caloJet:
-      match_dR: 0.3
-      suffix: "Pt"
-      label: "Calo Jet"
-      cuts:
-        - "abs({eta}) < 2.5"
+    # caloJet:
+    #   match_dR: 0.3
+    #   suffix: "Pt"
+    #   label: "Calo Jet"
+    #   cuts:
+    #     - "abs({eta}) < 2.5"
     phase1PuppiJet:
       match_dR: 0.3
       suffix: "Pt"
@@ -77,7 +77,7 @@ JetMatchingBarrel:
   ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
   binning:
     min: 0
-    max: 700
+    max: 500
     step: 10
 
 JetMatchingEndcap:
@@ -93,12 +93,12 @@ JetMatchingEndcap:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    caloJet:
-      match_dR: 0.3
-      suffix: "Pt"
-      label: "Calo Jet"
-      cuts:
-        - "abs({eta}) < 5"
+    # caloJet:
+    #   match_dR: 0.3
+    #   suffix: "Pt"
+    #   label: "Calo Jet"
+    #   cuts:
+    #     - "abs({eta}) < 5"
     phase1PuppiJet:
       match_dR: 0.3
       suffix: "Pt"
@@ -121,8 +121,8 @@ JetMatchingEndcap:
   ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
   binning:
     min: 0
-    max: 900
-    step: 20
+    max: 500
+    step: 10
 
 JetMatchingForward:
   sample: TT
@@ -137,12 +137,12 @@ JetMatchingForward:
       object:
         - "abs({eta}) < 5"
   test_objects:
-    caloJet:
-      match_dR: 0.3
-      suffix: "Pt"
-      label: "Calo Jet"
-      cuts:
-        - "abs({eta}) < 5"
+    # caloJet:
+    #   match_dR: 0.3
+    #   suffix: "Pt"
+    #   label: "Calo Jet"
+    #   cuts:
+    #     - "abs({eta}) < 5"
     phase1PuppiJet:
       match_dR: 0.3
       suffix: "Pt"
@@ -159,6 +159,6 @@ JetMatchingForward:
   ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
   binning:
     min: 0
-    max: 700
+    max: 500
     step: 10
 
diff --git a/objectPerformance/cfg_plots/V29/jets_matching_eta.yaml b/objectPerformance/cfg_plots/V29/jets_matching_eta.yaml
index 5256f4d2..a0bf6e5d 100644
--- a/objectPerformance/cfg_plots/V29/jets_matching_eta.yaml
+++ b/objectPerformance/cfg_plots/V29/jets_matching_eta.yaml
@@ -12,12 +12,12 @@ JetMatching_Eta_Pt40To100:
       object:
         - "abs({eta}) < 5"
   test_objects:
-    caloJet:
-      match_dR: 0.3
-      suffix: "Eta"
-      label: "Calo Jet"
-      cuts:
-        - "abs({eta}) < 5"
+    # caloJet:
+    #   match_dR: 0.3
+    #   suffix: "Eta"
+    #   label: "Calo Jet"
+    #   cuts:
+    #     - "abs({eta}) < 5"
     phase1PuppiJet:
       match_dR: 0.3
       suffix: "Eta"
@@ -56,12 +56,12 @@ JetMatching_Eta_Pt100ToInf:
       object:
         - "abs({eta}) < 5"
   test_objects:
-    caloJet:
-      match_dR: 0.3
-      suffix: "Eta"
-      label: "Calo Jet"
-      cuts:
-        - "abs({eta}) < 5"
+    # caloJet:
+    #   match_dR: 0.3
+    #   suffix: "Eta"
+    #   label: "Calo Jet"
+    #   cuts:
+    #     - "abs({eta}) < 5"
     phase1PuppiJet:
       match_dR: 0.3
       suffix: "Eta"
diff --git a/objectPerformance/cfg_plots/V29/jets_trigger.yaml b/objectPerformance/cfg_plots/V29/jets_trigger.yaml
index 543e34b7..73bdfb45 100644
--- a/objectPerformance/cfg_plots/V29/jets_trigger.yaml
+++ b/objectPerformance/cfg_plots/V29/jets_trigger.yaml
@@ -11,12 +11,12 @@ JetTurnonBarrel:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    caloJet:
-      match_dR: 0.3
-      suffix: "Pt"
-      label: "Calo Jet"
-      cuts:
-        - "abs({eta}) < 2.5"
+    # caloJet:
+    #   match_dR: 0.3
+    #   suffix: "Pt"
+    #   label: "Calo Jet"
+    #   cuts:
+    #     - "abs({eta}) < 2.5"
     phase1PuppiJet:
       match_dR: 0.3
       suffix: "Pt"
@@ -43,7 +43,7 @@ JetTurnonBarrel:
   ylabel: "Trigger Efficiency (<threshold> GeV, barrel)"
   binning:
     min: 0
-    max: 700
+    max: 500
     step: 10
 
 JetTurnonEndcap:
@@ -59,12 +59,12 @@ JetTurnonEndcap:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    caloJet:
-      match_dR: 0.3
-      suffix: "Pt"
-      label: "Calo Jet"
-      cuts:
-        - "abs({eta}) < 5"
+    # caloJet:
+    #   match_dR: 0.3
+    #   suffix: "Pt"
+    #   label: "Calo Jet"
+    #   cuts:
+    #     - "abs({eta}) < 5"
     phase1PuppiJet:
       match_dR: 0.3
       suffix: "Pt"
@@ -91,8 +91,8 @@ JetTurnonEndcap:
   ylabel: "Trigger Efficiency (<threshold> GeV, endcap)"
   binning:
     min: 0
-    max: 900
-    step: 20
+    max: 500
+    step: 10
 
 JetTurnonForward:
   sample: TT
@@ -107,12 +107,12 @@ JetTurnonForward:
       object:
         - "abs({eta}) < 5"
   test_objects:
-    caloJet:
-      match_dR: 0.3
-      suffix: "Pt"
-      label: "Calo Jet"
-      cuts:
-        - "abs({eta}) < 5"
+    # caloJet:
+    #   match_dR: 0.3
+    #   suffix: "Pt"
+    #   label: "Calo Jet"
+    #   cuts:
+    #     - "abs({eta}) < 5"
     phase1PuppiJet:
       match_dR: 0.3
       suffix: "Pt"
@@ -133,5 +133,5 @@ JetTurnonForward:
   ylabel: "Trigger Efficiency (<threshold> GeV, forward)"
   binning:
     min: 0
-    max: 700
+    max: 500
     step: 10
diff --git a/objectPerformance/cfg_plots/V29/jets_trigger_fwd.yaml b/objectPerformance/cfg_plots/V29/jets_trigger_fwd.yaml
index d60e6f41..bfc26425 100644
--- a/objectPerformance/cfg_plots/V29/jets_trigger_fwd.yaml
+++ b/objectPerformance/cfg_plots/V29/jets_trigger_fwd.yaml
@@ -11,12 +11,12 @@ JetTurnonFwd_3p7to7:
       object:
         - "abs({eta}) < 7"
   test_objects:
-    caloJet:
-      match_dR: 0.3
-      suffix: "Pt"
-      label: "Calo Jet"
-      cuts:
-        - "abs({eta}) < 7"
+    # caloJet:
+    #   match_dR: 0.3
+    #   suffix: "Pt"
+    #   label: "Calo Jet"
+    #   cuts:
+    #     - "abs({eta}) < 7"
     phase1PuppiJet:
       match_dR: 0.3
       suffix: "Pt"
diff --git a/objectPerformance/cfg_plots/V29/met_ht_mht.yaml b/objectPerformance/cfg_plots/V29/met_ht_mht.yaml
index c5090d22..a634e72d 100644
--- a/objectPerformance/cfg_plots/V29/met_ht_mht.yaml
+++ b/objectPerformance/cfg_plots/V29/met_ht_mht.yaml
@@ -16,7 +16,7 @@ HT:
       label: "Tracker HT"
     phase1PuppiHT:
       suffix: ""
-      label: "Phase1 Puppi HT"
+      label: "Histogrammed Puppi HT"
     seededConePuppiHT:
       suffix: ""
       label: "SeededCone HT"
@@ -47,6 +47,12 @@ MHT30:
     trackerMHT:
       suffix: ""
       label: "Tracker MHT"
+    phase1PuppiMHT:
+      suffix: "et"
+      label: "Histogrammed Puppi MHT"
+    seededConePuppiMHT:
+      suffix: "et"
+      label: "SeededCone MHT"
   thresholds: [70, 150]
   scalings:
     method: "naive"
@@ -71,9 +77,12 @@ MHT15:
         - "{pt} > 15"
     trafo: "MHT"
   test_objects:
+    trackerMHT:
+      suffix: ""
+      label: "Tracker MHT"
     phase1PuppiMHT:
       suffix: "et"
-      label: "Phase1 Puppi MHT"
+      label: "Histogrammed Puppi MHT"
     seededConePuppiMHT:
       suffix: "et"
       label: "SeededCone MHT"
diff --git a/objectPerformance/cfg_plots/V29/muon_matching.yaml b/objectPerformance/cfg_plots/V29/muon_matching.yaml
index 2ae1039c..3a70ec76 100644
--- a/objectPerformance/cfg_plots/V29/muon_matching.yaml
+++ b/objectPerformance/cfg_plots/V29/muon_matching.yaml
@@ -28,7 +28,7 @@ MuonsMatchingBarrel:
   ylabel: "Matching Efficiency (barrel)"
   binning:
     min: 0
-    max: 150
+    max: 100
     step: 3
 
 MuonsMatchingOverlap:
@@ -64,7 +64,7 @@ MuonsMatchingOverlap:
   ylabel: "Matching Efficiency (overlap)"
   binning:
     min: 0
-    max: 150
+    max: 100
     step: 3
 
 MuonsMatchingEndcap:
@@ -100,5 +100,5 @@ MuonsMatchingEndcap:
   ylabel: "Matching Efficiency (endcap)"
   binning:
     min: 0
-    max: 150
-    step: 3
\ No newline at end of file
+    max: 100
+    step: 3
diff --git a/objectPerformance/cfg_plots/V29/photons_matching.yaml b/objectPerformance/cfg_plots/V29/photons_matching.yaml
index 16e4fd66..2fa9e3bc 100644
--- a/objectPerformance/cfg_plots/V29/photons_matching.yaml
+++ b/objectPerformance/cfg_plots/V29/photons_matching.yaml
@@ -41,7 +41,7 @@ PhotonsMatching_Barrel:
   ylabel: "Matching Efficiency (Barrel)"
   binning:
     min: 0
-    max: 150
+    max: 100
     step: 3
 
 PhotonsMatching_Endcap:
@@ -88,5 +88,5 @@ PhotonsMatching_Endcap:
   ylabel: "Matching Efficiency (Endcap)"
   binning:
     min: 0
-    max: 150
+    max: 100
     step: 3
diff --git a/objectPerformance/cfg_plots/V29/photons_trigger.yaml b/objectPerformance/cfg_plots/V29/photons_trigger.yaml
index 30111dbd..65cc3b0e 100644
--- a/objectPerformance/cfg_plots/V29/photons_trigger.yaml
+++ b/objectPerformance/cfg_plots/V29/photons_trigger.yaml
@@ -45,7 +45,7 @@ PhotonsTrigger_Barrel:
   ylabel: "Trigger Efficiency (barrel, L1 $p_T > <threshold>$ GeV)"
   binning:
     min: 0
-    max: 150
+    max: 100
     step: 1.5
 
 PhotonsTrigger_Endcap:
@@ -96,5 +96,5 @@ PhotonsTrigger_Endcap:
   ylabel: "Trigger Efficiency (endcap, L1 $p_T > <threshold>$ GeV)"
   binning:
     min: 0
-    max: 150
+    max: 100
     step: 1.5
diff --git a/rates/plots/rates_emulator_125x_v29.py b/rates/plots/rates_emulator_125x_v29.py
index e2a2146c..b63c4ceb 100644
--- a/rates/plots/rates_emulator_125x_v29.py
+++ b/rates/plots/rates_emulator_125x_v29.py
@@ -290,10 +290,9 @@ def NNTauLooseOfflineEtCutEndcap(offline) : return (offline-21.639)/1.551
 
 #-------------muons--------------
     if (obj=='gmtTkMuon'):
-      offlinescalingcut = "( ( abs(gmtTkMuonEta[])<0.83 && gmtTkMuonPt[]>("+str(gmtTkMuonOfflineEtCutBarrel(x))+")) || (abs(gmtTkMuonEta[])>0.83 && abs(gmtTkMuonEta[])<1.24 && gmtTkMuonPt[]>("+str(gmtTkMuonOfflineEtCutOverlap(x))+")) || (abs(gmtTkMuonEta[])>1.24 &&  abs(gmtTkMuonEta[])<2.4 && gmtTkMuonPt[]>("+str(gmtTkMuonOfflineEtCutEndcap(x))+")) )"
+      offlinescalingcut = "(((gmtTkMuonPt[] < 8 && gmtTkMuonQual > 0) || (gmtTkMuonPt[] > 8)) && ( ( abs(gmtTkMuonEta[])<0.83 && gmtTkMuonPt[]>("+str(gmtTkMuonOfflineEtCutBarrel(x))+")) || (abs(gmtTkMuonEta[])>0.83 && abs(gmtTkMuonEta[])<1.24 && gmtTkMuonPt[]>("+str(gmtTkMuonOfflineEtCutOverlap(x))+")) || (abs(gmtTkMuonEta[])>1.24 &&  abs(gmtTkMuonEta[])<2.4 && gmtTkMuonPt[]>("+str(gmtTkMuonOfflineEtCutEndcap(x))+")) ))"
       offlinecut = "Sum$( "+offlinescalingcut+"  && abs(gmtTkMuonEta[])<2.4)>0"
-      onlinecut  = "Sum$( gmtTkMuonPt[]>"+str(x)+" && gmtTkMuonBx[]==0 && abs(gmtTkMuonEta[])<2.4)>0"
-
+      onlinecut  = "Sum$(((gmtTkMuonPt[] < 8 && gmtTkMuonQual > 0) || (gmtTkMuonPt[] > 8)) && ((gmtTkMuonPt[]>"+str(x)+" && gmtTkMuonBx[]==0 && abs(gmtTkMuonEta[])<2.4)))>0"
 
     if (obj=='gmtMuon'):
       offlinescalingcut = "( ( abs(gmtMuonEta[])<0.83 && gmtMuonPt[]>("+str(gmtMuonOfflineEtCutBarrel(x))+")) || (abs(gmtMuonEta[])>0.83 && abs(gmtMuonEta[])<1.24 && gmtMuonQual[]>=12 && gmtMuonPt[]>("+str(gmtMuonOfflineEtCutOverlap(x))+")) || (abs(gmtMuonEta[])>1.24 &&  abs(gmtMuonEta[])<2.4 && gmtMuonPt[]>("+str(gmtMuonOfflineEtCutEndcap(x))+")) )"