diff --git a/scripts/corrections/make_theory_corr.py b/scripts/corrections/make_theory_corr.py
index 9b3d8248f..c14370e77 100644
--- a/scripts/corrections/make_theory_corr.py
+++ b/scripts/corrections/make_theory_corr.py
@@ -56,11 +56,11 @@ def parse_args():
         "--proc",
         type=str,
         required=True,
-        choices=[
-            "z",
-            "w",
-            "bsm",
-        ],
+        # choices=[
+        #     "z",
+        #     "w",
+        #     "bsm",
+        # ],
         help="Process",
     )
     parser.add_argument(
@@ -214,7 +214,7 @@ def main():
     if args.proc == "z":
         eventgen_procs = ["ZmumuPostVFP"]
         filesByProc = {"ZmumuPostVFP": args.corrFiles}
-    else:
+    elif args.proc in ["w", "bsm"]:
         wpfiles = list(
             filter(
                 lambda x: "wp" in os.path.basename(x).lower() or "Wp" in x,
@@ -253,6 +253,9 @@ def main():
                 "WtoNMu_MN-30-V-0p001",
                 "WtoNMu_MN-50-V-0p001",
             ]
+    else:
+        eventgen_procs = [args.proc]
+        filesByProc = {args.proc: args.corrFiles}
 
     minnloh = hh.sumHists(
         [
@@ -355,7 +358,7 @@ def main():
     generator = args.generator
     if args.postfix:
         generator += args.postfix
-    outfile = f"{args.outpath}/{generator}Corr{args.proc.upper()}.pkl.lz4"
+    outfile = f"{args.outpath}/{generator}Corr{args.proc[0].upper()}.pkl.lz4"
 
     meta_dict = {}
     for f in [args.minnloFile] + args.corrFiles:
diff --git a/scripts/histmakers/w_z_gen_dists.py b/scripts/histmakers/w_z_gen_dists.py
index 88b99601b..ab34abfff 100644
--- a/scripts/histmakers/w_z_gen_dists.py
+++ b/scripts/histmakers/w_z_gen_dists.py
@@ -127,6 +127,7 @@
     nanoVersion="v9",
     base_path=args.dataPath,
     mode=analysis_label,
+    era=args.era,
 )
 
 logger.debug(f"Will process samples {[d.name for d in datasets]}")
diff --git a/utilities/common.py b/utilities/common.py
index 6aa4e42ba..da0e23dcb 100644
--- a/utilities/common.py
+++ b/utilities/common.py
@@ -101,10 +101,22 @@
 zprocs_recoil_lowpu = ["Zmumu", "Zee"]
 wprocs_recoil_lowpu = ["Wminusmunu", "Wminusenu", "Wplusmunu", "Wplusenu"]
 
+# 5020GeV samples
+wprocs_5020GeV = [
+    "Wminusmunu5020GeV",
+    "Wminusenu5020GeV",
+    "Wminustaunu5020GeV",
+    "Wplusmunu5020GeV",
+    "Wplusenu5020GeV",
+    "Wplustaunu5020GeV",
+]
+zprocs_5020GeV = ["Zmumu5020GeV", "Zee5020GeV", "Ztautau5020GeV"]
+vprocs_5020GeV = wprocs_5020GeV + zprocs_5020GeV
+
 background_MCprocs = ["Top", "Diboson", "QCD", "DYlowMass"]
-zprocs_all = zprocs_lowpu + zprocs
-wprocs_all = wprocs_lowpu + wprocs
-vprocs_all = vprocs_lowpu + vprocs
+zprocs_all = zprocs + zprocs_lowpu + zprocs_5020GeV
+wprocs_all = wprocs + wprocs_lowpu + wprocs_5020GeV
+vprocs_all = vprocs + vprocs_lowpu + vprocs_5020GeV
 
 # input files for muon momentum scale nuisances
 calib_dir = f"{data_dir}/calibration/"
diff --git a/utilities/io_tools/input_tools.py b/utilities/io_tools/input_tools.py
index 971c1e535..b72ad6c22 100644
--- a/utilities/io_tools/input_tools.py
+++ b/utilities/io_tools/input_tools.py
@@ -203,6 +203,15 @@ def read_dyturbo_vars_hist(base_name, var_axis=None, axes=("Y", "qT"), charge=No
         "kappaFO0.5": "murH-mufH",
         "kappaFO2.": "mur2-muf2",
     }
+    scales_map = {
+        "pdf0": "mur1-muf1",
+        "kappaFO0.5-kappaf2.": "mur0p5-muf1",
+        "kappaFO2.-kappaf0.5": "mur2-muf1",
+        "kappaf0.5": "mur1-muf0p5",
+        "kappaf2.": "mur1-muf2",
+        "kappaFO0.5": "mur0p5-muf0p5",
+        "kappaFO2.": "mur2-muf2",
+    }
 
     var_hist = None
     if var_axis is None:
diff --git a/wremnants/datasets/datasetDict2017G_v9.py b/wremnants/datasets/datasetDict2017G_v9.py
index 3159afbe6..c2a8a3f62 100644
--- a/wremnants/datasets/datasetDict2017G_v9.py
+++ b/wremnants/datasets/datasetDict2017G_v9.py
@@ -19,42 +19,42 @@
         "lumicsv": lumicsv,
         "lumijson": lumijson,
     },
-    "Zmumu2017G": {
+    "Zmumu5020GeV": {
         "filepaths": [
             "{BASE_PATH}/DYJetsToMuMu_H2ErratumFix_PDFExt_TuneCP5_5020GeV-powhegMiNNLO-pythia8-photos/RunIISummer20UL17pp5TeVNanoAODv9-106X_mc2017_realistic_forppRef5TeV_v3-v2",
         ],
         "xsec": xsec_DYJetsToLL,
         "group": "Zmumu",
     },
-    "Ztautau2017G": {
+    "Ztautau5020GeV": {
         "filepaths": [
             "{BASE_PATH}/DYJetsToTauTau_TauToMuorE_H2ErratumFix_PDFExt_TuneCP5_5020GeV-powhegMiNNLO-pythia8-photos/RunIISummer20UL17pp5TeVNanoAODv9-106X_mc2017_realistic_forppRef5TeV_v3-v2",
         ],
         "xsec": xsec_DYJetsToLL * common.Z_TAU_TO_LEP_RATIO,
         "group": "Ztautau",
     },
-    "Wplusmunu2017G": {
+    "Wplusmunu5020GeV": {
         "filepaths": [
             "{BASE_PATH}/WplusJetsToMuNu_H2ErratumFix_PDFExt_TuneCP5_5020GeV-powhegMiNNLO-pythia8-photos/RunIISummer20UL17pp5TeVNanoAODv9-106X_mc2017_realistic_forppRef5TeV_v3-v2",
         ],
         "xsec": xsec_WplusJetsToMuNu,
         "group": "Wmunu",
     },
-    "Wminusmunu2017G": {
+    "Wminusmunu5020GeV": {
         "filepaths": [
             "{BASE_PATH}/WminusJetsToMuNu_H2ErratumFix_PDFExt_TuneCP5_5020GeV-powhegMiNNLO-pythia8-photos/RunIISummer20UL17pp5TeVNanoAODv9-106X_mc2017_realistic_forppRef5TeV_v3-v2",
         ],
         "xsec": xsec_WminusJetsToMuNu,
         "group": "Wmunu",
     },
-    # "Wplustaunu2017G": {
+    # "Wplustaunu5020GeV": {
     #     "filepaths": [
     #         "{BASE_PATH}/WplusJetsToTauNu_TauToMuorE_H2ErratumFix_PDFExt_TuneCP5_5020GeV-powhegMiNNLO-pythia8-photos/RunIISummer20UL17pp5TeVNanoAODv9-106X_mc2017_realistic_forppRef5TeV_v3-v2",
     #     ],
     #     "xsec": common.BR_TAUToMU * xsec_WplusJetsToMuNu,
     #     "group": "Wtaunu",
     # },
-    "Wminustaunu2017G": {
+    "Wminustaunu5020GeV": {
         "filepaths": [
             "{BASE_PATH}/WminusJetsToTauNu_TauToMuorE_H2ErratumFix_PDFExt_TuneCP5_5020GeV-powhegMiNNLO-pythia8-photos/RunIISummer20UL17pp5TeVNanoAODv9-106X_mc2017_realistic_forppRef5TeV_v3-v2",
         ],