diff --git a/.github/labels/common_labels.txt b/.github/labels/common_labels.txt
index 055bf53bfb..4ea4bd760b 100644
--- a/.github/labels/common_labels.txt
+++ b/.github/labels/common_labels.txt
@@ -24,9 +24,10 @@
 {"name": "reporting: DTC NOAA R2O","color": "fbca04","description": "NOAA Research to Operations DTC Project"}
 {"name": "reporting: HSUP 1-3a","color": "fbca04","description": "Hurricane Supplemental Project 1-3a"}
 {"name": "reporting: HSUP 4-1b","color": "fbca04","description": "Hurricane Supplemental Project 4-1b"}
-{"name": "requestor: USAF","color": "3101c1","description": "United States Air Force"}
 {"name": "requestor: Army/ARL","color": "3101c1","description": "United States Army Research Laboratory"}
+{"name": "requestor: Australian BOM","color": "3101c1","description": "Australian Bureau of Meteorology"}
 {"name": "requestor: Community","color": "3101c1","description": "General Community"}
+{"name": "requestor: CSU/CIRA","color": "3101c1","description": "Colorado State University, Cooperative Institute for Research in the Atmosphere"}
 {"name": "requestor: DTC/T&E","color": "3101c1","description": "General DTC Testing and Evaluation work"}
 {"name": "requestor: DTC/MRW","color": "3101c1","description": "DTC Medium Range Weather T&E"}
 {"name": "requestor: DTC/SRW","color": "3101c1","description": "DTC Short Range Weather T&E"}
@@ -45,6 +46,7 @@
 {"name": "requestor: NOAA/GSL","color": "3101c1","description": "NOAA Global Systems Laboratory"}
 {"name": "requestor: NOAA/HFIP","color": "3101c1","description": "NOAA Hurricane Forecast Improvement Project"}
 {"name": "requestor: NOAA/MDL","color": "3101c1","description": "NOAA Meteorological Development Laboratory"}
+{"name": "requestor: NOAA/NHC","color": "3101c1","description": "NOAA National Hurricane Center"}
 {"name": "requestor: NOAA/NSSL","color": "3101c1","description": "NOAA National Severe Storms Laboratory"}
 {"name": "requestor: NOAA/OPC","color": "3101c1","description": "NOAA Ocean Prediction Center"}
 {"name": "requestor: NOAA/other","color": "3101c1","description": "NOAA Laboratory, not otherwise specified"}
@@ -58,6 +60,7 @@
 {"name": "requestor: University/other","color": "3101c1","description": "University Collaborator, not otherwise specified"}
 {"name": "requestor: University/SBU","color": "3101c1","description": "Stony Brook University"}
 {"name": "requestor: University/UIUC","color": "3101c1","description": "University of Illinois, Urbana-Champaign"}
+{"name": "requestor: USAF","color": "3101c1","description": "United States Air Force"}
 {"name": "required: FOR DEVELOPMENT RELEASE", "color": "e400f5", "description": "Required to be completed in the development release for the assigned project"}
 {"name": "required: FOR OFFICIAL RELEASE", "color": "e400f5", "description": "Required to be completed in the official release for the assigned milestone"}
 {"name": "type: bug","color": "e5bf7e","description": "Fix something that is not working"}
diff --git a/docs/Users_Guide/wrappers.rst b/docs/Users_Guide/wrappers.rst
index fe5a6b5a80..b29a86b7b9 100644
--- a/docs/Users_Guide/wrappers.rst
+++ b/docs/Users_Guide/wrappers.rst
@@ -454,32 +454,8 @@ ${METPLUS_CENSOR_VAL}
    * - :term:`ENSEMBLE_STAT_CENSOR_VAL`
      - censor_val
 
-${METPLUS_ENS_FILE_TYPE}
-""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`ENS_ENSEMBLE_STAT_INPUT_DATATYPE`
-     - ens.file_type
-
-${METPLUS_ENS_THRESH}
-"""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`ENSEMBLE_STAT_ENS_THRESH`
-     - fcst.ens_thresh
-
-${METPLUS_VLD_THRESH}
-"""""""""""""""""""""
+${METPLUS_ENS_MEMBER_IDS}
+"""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -487,10 +463,10 @@ ${METPLUS_VLD_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`ENSEMBLE_STAT_VLD_THRESH`
-     - fcst.vld_thresh
+   * - :term:`ENSEMBLE_STAT_ENS_MEMBER_IDS`
+     - ens_member_ids
 
-${METPLUS_OBS_THRESH}
+${METPLUS_CONTROL_ID}
 """""""""""""""""""""
 
 .. list-table::
@@ -499,28 +475,8 @@ ${METPLUS_OBS_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`ENSEMBLE_STAT_OBS_THRESH`
-     - obs_thresh
-
-${METPLUS_ENS_FIELD}
-""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`ENS_VAR<n>_NAME`
-     - ens.field.name
-   * - :term:`ENS_VAR<n>_LEVELS`
-     - ens.field.level
-   * - :term:`ENS_VAR<n>_THRESH`
-     - ens.field.cat_thresh
-   * - :term:`ENS_VAR<n>_OPTIONS`
-     - n/a
-
-.. note:: For more information on controlling the forecast field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
+   * - :term:`ENSEMBLE_STAT_CONTROL_ID`
+     - control_id
 
 ${METPLUS_PROB_CAT_THRESH}
 """"""""""""""""""""""""""
@@ -570,6 +526,30 @@ ${METPLUS_FCST_FILE_TYPE}
    * - :term:`FCST_ENSEMBLE_STAT_INPUT_DATATYPE`
      - fcst.file_type
 
+${METPLUS_ENS_THRESH}
+"""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`ENSEMBLE_STAT_ENS_THRESH`
+     - fcst.ens_thresh
+
+${METPLUS_VLD_THRESH}
+"""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`ENSEMBLE_STAT_VLD_THRESH`
+     - fcst.vld_thresh
+
 ${METPLUS_FCST_FIELD}
 """""""""""""""""""""
 
@@ -622,6 +602,7 @@ ${METPLUS_OBS_FIELD}
 
 .. note:: For more information on controlling the observation field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
 
+	  
 ${METPLUS_MESSAGE_TYPE}
 """""""""""""""""""""""
 
@@ -634,6 +615,43 @@ ${METPLUS_MESSAGE_TYPE}
    * - :term:`ENSEMBLE_STAT_MESSAGE_TYPE`
      - message_type
 
+${METPLUS_OBS_THRESH}
+"""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`ENSEMBLE_STAT_OBS_THRESH`
+     - obs_thresh
+
+${METPLUS_OBS_QUALITY_INC}
+""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`ENSEMBLE_STAT_OBS_QUALITY_INC`
+     - obs_quality_inc
+
+       
+${METPLUS_OBS_QUALITY_EXC}
+""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`ENSEMBLE_STAT_OBS_QUALITY_EXC`
+     - obs_quality_exc
+
 ${METPLUS_DUPLICATE_FLAG}
 """""""""""""""""""""""""
 
@@ -900,44 +918,8 @@ ${METPLUS_NC_ORANK_FLAG_DICT}
    * - :term:`ENSEMBLE_STAT_NC_ORANK_FLAG_WEIGHT`
      - nc_orank_flag.weight
 
-${METPLUS_OUTPUT_PREFIX}
-""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`ENSEMBLE_STAT_OUTPUT_PREFIX`
-     - output_prefix
-
-${METPLUS_OBS_QUALITY_INC}
-""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`ENSEMBLE_STAT_OBS_QUALITY_INC`
-     - obs_quality_inc
-
-${METPLUS_OBS_QUALITY_EXC}
-""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`ENSEMBLE_STAT_OBS_QUALITY_EXC`
-     - obs_quality_exc
-
-${METPLUS_ENS_MEMBER_IDS}
-"""""""""""""""""""""""""
+${METPLUS_GRID_WEIGHT_FLAG}
+"""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -945,11 +927,11 @@ ${METPLUS_ENS_MEMBER_IDS}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`ENSEMBLE_STAT_ENS_MEMBER_IDS`
-     - ens_member_ids
+   * - :term:`ENSEMBLE_STAT_GRID_WEIGHT_FLAG`
+     - grid_weight_flag
 
-${METPLUS_CONTROL_ID}
-"""""""""""""""""""""
+${METPLUS_OUTPUT_PREFIX}
+""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -957,8 +939,8 @@ ${METPLUS_CONTROL_ID}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`ENSEMBLE_STAT_CONTROL_ID`
-     - control_id
+   * - :term:`ENSEMBLE_STAT_OUTPUT_PREFIX`
+     - output_prefix
 
 ${METPLUS_MET_CONFIG_OVERRIDES}
 """""""""""""""""""""""""""""""
@@ -972,19 +954,6 @@ ${METPLUS_MET_CONFIG_OVERRIDES}
    * - :term:`ENSEMBLE_STAT_MET_CONFIG_OVERRIDES`
      - n/a
 
-${METPLUS_GRID_WEIGHT_FLAG}
-"""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`ENSEMBLE_STAT_GRID_WEIGHT_FLAG`
-     - grid_weight_flag
-
-
 .. _example_wrapper:
 
 Example
@@ -1344,8 +1313,8 @@ ${METPLUS_ENS_FILE_TYPE}
    * - :term:`GEN_ENS_PROD_ENS_FILE_TYPE`
      - ens.file_type
 
-${METPLUS_ENS_ENS_THRESH}
-"""""""""""""""""""""""""
+${METPLUS_ENS_THRESH}
+"""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -1356,8 +1325,8 @@ ${METPLUS_ENS_ENS_THRESH}
    * - :term:`GEN_ENS_PROD_ENS_THRESH`
      - ens.ens_thresh
 
-${METPLUS_ENS_VLD_THRESH}
-"""""""""""""""""""""""""
+${METPLUS_VLD_THRESH}
+"""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -1388,6 +1357,30 @@ ${METPLUS_ENS_FIELD}
 
 .. note:: For more information on controlling the forecast field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
 
+${METPLUS_ENS_MEMBER_IDS}
+"""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`GEN_ENS_PROD_ENS_MEMBER_IDS`
+     - ens_member_ids
+
+${METPLUS_CONTROL_ID}
+"""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`GEN_ENS_PROD_CONTROL_ID`
+     - control_id
+
 ${METPLUS_NBRHD_PROB_DICT}
 """"""""""""""""""""""""""
 
@@ -1524,30 +1517,6 @@ ${METPLUS_ENSEMBLE_FLAG_DICT}
    * - :term:`GEN_ENS_PROD_ENSEMBLE_FLAG_CLIMO_CDP`
      - ensemble_flag.climo_cdp
 
-${METPLUS_ENS_MEMBER_IDS}
-"""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`GEN_ENS_PROD_ENS_MEMBER_IDS`
-     - ens_member_ids
-
-${METPLUS_CONTROL_ID}
-"""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`GEN_ENS_PROD_CONTROL_ID`
-     - control_id
-
 ${METPLUS_MET_CONFIG_OVERRIDES}
 """""""""""""""""""""""""""""""
 
@@ -1560,7 +1529,6 @@ ${METPLUS_MET_CONFIG_OVERRIDES}
    * - :term:`GEN_ENS_PROD_MET_CONFIG_OVERRIDES`
      - n/a
 
-
 .. _gen_vx_mask_wrapper:
 
 GenVxMask
@@ -3291,8 +3259,8 @@ ${METPLUS_REGRID_DICT}
    * - :term:`GRID_STAT_REGRID_CENSOR_VAL`
      - regrid.censor_val
 
-${METPLUS_FCST_FIELD}
-"""""""""""""""""""""
+${METPLUS_CENSOR_THRESH}
+""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -3300,19 +3268,61 @@ ${METPLUS_FCST_FIELD}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`FCST_VAR<n>_NAME`
-     - fcst.field.name
-   * - :term:`FCST_VAR<n>_LEVELS`
-     - fcst.field.level
-   * - :term:`FCST_VAR<n>_THRESH`
-     - fcst.field.cat_thresh
-   * - :term:`FCST_VAR<n>_OPTIONS`
-     - n/a
+   * - :term:`GRID_STAT_CENSOR_THRESH`
+     - censor_thresh
 
-.. note:: For more information on controlling the forecast field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
+${METPLUS_CENSOR_VAL}
+"""""""""""""""""""""
 
-${METPLUS_FCST_FILE_TYPE}
-"""""""""""""""""""""""""
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`GRID_STAT_CENSOR_VAL`
+     - censor_val
+
+.. _grid-stat-met-conf-cat-thresh:
+
+${METPLUS_CAT_THRESH}
+"""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`GRID_STAT_CAT_THRESH`
+     - cat_thresh
+
+${METPLUS_NC_PAIRS_VAR_NAME}
+""""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`GRID_STAT_NC_PAIRS_VAR_NAME`
+     - nc_pairs_var_name
+
+${METPLUS_HSS_EC_VALUE}
+"""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`GRID_STAT_HSS_EC_VALUE`
+     - hss_ec_value
+
+${METPLUS_FCST_FILE_TYPE}
+"""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -3323,8 +3333,8 @@ ${METPLUS_FCST_FILE_TYPE}
    * - :term:`FCST_GRID_STAT_FILE_TYPE`
      - fcst.file_type
 
-${METPLUS_OBS_FIELD}
-""""""""""""""""""""
+${METPLUS_FCST_FIELD}
+"""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -3332,16 +3342,16 @@ ${METPLUS_OBS_FIELD}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`OBS_VAR<n>_NAME`
+   * - :term:`FCST_VAR<n>_NAME`
      - fcst.field.name
-   * - :term:`OBS_VAR<n>_LEVELS`
+   * - :term:`FCST_VAR<n>_LEVELS`
      - fcst.field.level
-   * - :term:`OBS_VAR<n>_THRESH`
+   * - :term:`FCST_VAR<n>_THRESH`
      - fcst.field.cat_thresh
-   * - :term:`OBS_VAR<n>_OPTIONS`
+   * - :term:`FCST_VAR<n>_OPTIONS`
      - n/a
 
-.. note:: For more information on controlling the observation field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
+.. note:: For more information on controlling the forecast field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
 
 ${METPLUS_OBS_FILE_TYPE}
 """"""""""""""""""""""""
@@ -3355,6 +3365,26 @@ ${METPLUS_OBS_FILE_TYPE}
    * - :term:`OBS_GRID_STAT_FILE_TYPE`
      - obs.file_type
 
+${METPLUS_OBS_FIELD}
+""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`OBS_VAR<n>_NAME`
+     - fcst.field.name
+   * - :term:`OBS_VAR<n>_LEVELS`
+     - fcst.field.level
+   * - :term:`OBS_VAR<n>_THRESH`
+     - fcst.field.cat_thresh
+   * - :term:`OBS_VAR<n>_OPTIONS`
+     - n/a
+
+.. note:: For more information on controlling the observation field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
+
 ${METPLUS_CLIMO_MEAN_DICT}
 """"""""""""""""""""""""""
 
@@ -3415,6 +3445,26 @@ ${METPLUS_CLIMO_STDEV_DICT}
    * - :term:`GRID_STAT_CLIMO_STDEV_HOUR_INTERVAL`
      - climo_stdev.hour_interval
 
+.. _grid-stat-met-conf-climo-cdf:
+
+${METPLUS_CLIMO_CDF_DICT}
+"""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`GRID_STAT_CLIMO_CDF_BINS`
+     - climo_cdf.cdf_bins
+   * - :term:`GRID_STAT_CLIMO_CDF_CENTER_BINS`
+     - climo_cdf.center_bins
+   * - :term:`GRID_STAT_CLIMO_CDF_WRITE_BINS`
+     - climo_cdf.write_bins
+   * - :term:`GRID_STAT_CLIMO_CDF_DIRECT_PROB`
+     - climo_cdf.direct_prob
+
 ${METPLUS_MASK_DICT}
 """"""""""""""""""""
 
@@ -3431,6 +3481,26 @@ ${METPLUS_MASK_DICT}
 
 .. note:: Since the default value in the MET config file for 'grid' is grid = [ "FULL" ];, setting GRID_STAT_MASK_GRID to an empty string will result in a value of grid = []; in the MET config file.
 
+${METPLUS_INTERP_DICT}
+""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`GRID_STAT_INTERP_FIELD`
+     - interp.field
+   * - :term:`GRID_STAT_INTERP_VLD_THRESH`
+     - interp.vld_thresh
+   * - :term:`GRID_STAT_INTERP_SHAPE`
+     - interp.shape
+   * - :term:`GRID_STAT_INTERP_TYPE_METHOD`
+     - interp.type.method
+   * - :term:`GRID_STAT_INTERP_TYPE_WIDTH`
+     - interp.type.width
+
 ${METPLUS_NBRHD_SHAPE}
 """"""""""""""""""""""
 
@@ -3467,20 +3537,8 @@ ${METPLUS_NBRHD_COV_THRESH}
    * - :term:`GRID_STAT_NEIGHBORHOOD_COV_THRESH`
      - nbrhd.cov_thresh
 
-${METPLUS_OUTPUT_PREFIX}
-""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`GRID_STAT_OUTPUT_PREFIX`
-     - output_prefix
-
-${METPLUS_MET_CONFIG_OVERRIDES}
-"""""""""""""""""""""""""""""""
+${METPLUS_FOURIER_DICT}
+"""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -3488,13 +3546,13 @@ ${METPLUS_MET_CONFIG_OVERRIDES}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`GRID_STAT_MET_CONFIG_OVERRIDES`
-     - n/a
-
-.. _grid-stat-met-conf-climo-cdf:
+   * - :term:`GRID_STAT_FOURIER_WAVE_1D_BEG`
+     - fourier.wave_1d_beg
+   * - :term:`GRID_STAT_FOURIER_WAVE_1D_END`
+     - fourier.wave_1d_end
 
-${METPLUS_CLIMO_CDF_DICT}
-"""""""""""""""""""""""""
+${METPLUS_DISTANCE_MAP_DICT}
+""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -3502,14 +3560,16 @@ ${METPLUS_CLIMO_CDF_DICT}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`GRID_STAT_CLIMO_CDF_BINS`
-     - climo_cdf.cdf_bins
-   * - :term:`GRID_STAT_CLIMO_CDF_CENTER_BINS`
-     - climo_cdf.center_bins
-   * - :term:`GRID_STAT_CLIMO_CDF_WRITE_BINS`
-     - climo_cdf.write_bins
-   * - :term:`GRID_STAT_CLIMO_CDF_DIRECT_PROB`
-     - climo_cdf.direct_prob
+   * - :term:`GRID_STAT_DISTANCE_MAP_BADDELEY_P`
+     - distance_map.baddeley_p
+   * - :term:`GRID_STAT_DISTANCE_MAP_BADDELEY_MAX_DIST`
+     - distance_map.baddeley_max_dist
+   * - :term:`GRID_STAT_DISTANCE_MAP_FOM_ALPHA`
+     - distance_map.fom_alpha
+   * - :term:`GRID_STAT_DISTANCE_MAP_ZHU_WEIGHT`
+     - distance_map.zhu_weight
+   * - :term:`GRID_STAT_DISTANCE_MAP_BETA_VALUE_N`
+     - distance_map.beta_value(n)
 
 ${METPLUS_OUTPUT_FLAG_DICT}
 """""""""""""""""""""""""""
@@ -3599,28 +3659,8 @@ ${METPLUS_NC_PAIRS_FLAG_DICT}
    * - :term:`GRID_STAT_NC_PAIRS_FLAG_SEEPS`
      - nc_pairs_flag.seeps
 
-${METPLUS_INTERP_DICT}
-""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`GRID_STAT_INTERP_FIELD`
-     - interp.field
-   * - :term:`GRID_STAT_INTERP_VLD_THRESH`
-     - interp.vld_thresh
-   * - :term:`GRID_STAT_INTERP_SHAPE`
-     - interp.shape
-   * - :term:`GRID_STAT_INTERP_TYPE_METHOD`
-     - interp.type.method
-   * - :term:`GRID_STAT_INTERP_TYPE_WIDTH`
-     - interp.type.width
-
-${METPLUS_NC_PAIRS_VAR_NAME}
-""""""""""""""""""""""""""""
+${METPLUS_SEEPS_P1_THRESH}
+""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -3628,8 +3668,8 @@ ${METPLUS_NC_PAIRS_VAR_NAME}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`GRID_STAT_NC_PAIRS_VAR_NAME`
-     - nc_pairs_var_name
+   * - :term:`GRID_STAT_SEEPS_P1_THRESH`
+     - seeps_p1_thresh
 
 ${METPLUS_GRID_WEIGHT_FLAG}
 """""""""""""""""""""""""""
@@ -3638,85 +3678,13 @@ ${METPLUS_GRID_WEIGHT_FLAG}
    :widths: 5 5
    :header-rows: 1
 
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`GRID_STAT_GRID_WEIGHT_FLAG`
-     - grid_weight_flag
-
-${METPLUS_HSS_EC_VALUE}
-"""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`GRID_STAT_HSS_EC_VALUE`
-     - hss_ec_value
-
-${METPLUS_DISTANCE_MAP_DICT}
-""""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`GRID_STAT_DISTANCE_MAP_BADDELEY_P`
-     - distance_map.baddeley_p
-   * - :term:`GRID_STAT_DISTANCE_MAP_BADDELEY_MAX_DIST`
-     - distance_map.baddeley_max_dist
-   * - :term:`GRID_STAT_DISTANCE_MAP_FOM_ALPHA`
-     - distance_map.fom_alpha
-   * - :term:`GRID_STAT_DISTANCE_MAP_ZHU_WEIGHT`
-     - distance_map.zhu_weight
-   * - :term:`GRID_STAT_DISTANCE_MAP_BETA_VALUE_N`
-     - distance_map.beta_value(n)
-
-${METPLUS_FOURIER_DICT}
-"""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`GRID_STAT_FOURIER_WAVE_1D_BEG`
-     - fourier.wave_1d_beg
-   * - :term:`GRID_STAT_FOURIER_WAVE_1D_END`
-     - fourier.wave_1d_end
-
-${METPLUS_CENSOR_THRESH}
-""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`GRID_STAT_CENSOR_THRESH`
-     - censor_thresh
-
-${METPLUS_CENSOR_VAL}
-"""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`GRID_STAT_CENSOR_VAL`
-     - censor_val
-
-.. _grid-stat-met-conf-cat-thresh:
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`GRID_STAT_GRID_WEIGHT_FLAG`
+     - grid_weight_flag
 
-${METPLUS_CAT_THRESH}
-"""""""""""""""""""""
+${METPLUS_OUTPUT_PREFIX}
+""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -3724,11 +3692,11 @@ ${METPLUS_CAT_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`GRID_STAT_CAT_THRESH`
-     - cat_thresh
+   * - :term:`GRID_STAT_OUTPUT_PREFIX`
+     - output_prefix
 
-${METPLUS_SEEPS_P1_THRESH}
-""""""""""""""""""""""""""
+${METPLUS_MET_CONFIG_OVERRIDES}
+"""""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -3736,8 +3704,8 @@ ${METPLUS_SEEPS_P1_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`GRID_STAT_SEEPS_P1_THRESH`
-     - seeps_p1_thresh
+   * - :term:`GRID_STAT_MET_CONFIG_OVERRIDES`
+     - n/a
 
 
 .. _ioda2nc_wrapper:
@@ -3837,8 +3805,8 @@ ${METPLUS_MESSAGE_TYPE}
    * - :term:`IODA2NC_MESSAGE_TYPE`
      - message_type
 
-${METPLUS_MESSAGE_TYPE_MAP}
-"""""""""""""""""""""""""""
+${METPLUS_MESSAGE_TYPE_GROUP_MAP}
+"""""""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -3846,11 +3814,11 @@ ${METPLUS_MESSAGE_TYPE_MAP}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`IODA2NC_MESSAGE_TYPE_MAP`
-     - message_type_map
+   * - :term:`IODA2NC_MESSAGE_TYPE_GROUP_MAP`
+     - message_type_group_map
 
-${METPLUS_MESSAGE_TYPE_GROUP_MAP}
-"""""""""""""""""""""""""""""""""
+${METPLUS_MESSAGE_TYPE_MAP}
+"""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -3858,8 +3826,8 @@ ${METPLUS_MESSAGE_TYPE_GROUP_MAP}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`IODA2NC_MESSAGE_TYPE_GROUP_MAP`
-     - message_type_group_map
+   * - :term:`IODA2NC_MESSAGE_TYPE_MAP`
+     - message_type_map
 
 ${METPLUS_STATION_ID}
 """""""""""""""""""""
@@ -4550,6 +4518,31 @@ ${METPLUS_FCST_FIELD}
 
 .. note:: For more information on controlling the forecast field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
 
+${METPLUS_FCST_CENSOR_THRESH}
+"""""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`MODE_FCST_CENSOR_THRESH`
+     - fcst.censor_thresh
+
+${METPLUS_FCST_CENSOR_VAL}
+""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`MODE_FCST_CENSOR_VAL`
+     - fcst.censor_val
+
+
 ${METPLUS_FCST_CONV_RADIUS}
 """""""""""""""""""""""""""
 
@@ -4561,7 +4554,7 @@ ${METPLUS_FCST_CONV_RADIUS}
      - MET Config File
    * - :term:`MODE_FCST_CONV_RADIUS`
      - fcst.conv_radius
-
+       
 ${METPLUS_FCST_CONV_THRESH}
 """""""""""""""""""""""""""
 
@@ -4574,6 +4567,42 @@ ${METPLUS_FCST_CONV_THRESH}
    * - :term:`MODE_FCST_CONV_THRESH`
      - fcst.conv_thresh
 
+${METPLUS_FCST_VLD_THRESH}
+""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`MODE_FCST_VLD_THRESH`
+     - fcst.vld_thresh
+
+${METPLUS_FCST_FILTER_ATTR_NAME}
+""""""""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`MODE_FCST_FILTER_ATTR_NAME`
+     - fcst.filter_attr_name
+
+${METPLUS_FCST_FILTER_ATTR_THRESH}
+""""""""""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`MODE_FCST_FILTER_ATTR_THRESH`
+     - fcst.filter_attr_thresh
+
 ${METPLUS_FCST_MERGE_THRESH}
 """"""""""""""""""""""""""""
 
@@ -4655,32 +4684,8 @@ ${METPLUS_OBS_FIELD}
 
 .. note:: For more information on controlling the observation field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
 
-${METPLUS_OBS_CONV_RADIUS}
-""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`OBS_MODE_CONV_RADIUS`
-     - obs.conv_radius
-
-${METPLUS_OBS_CONV_THRESH}
-""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`OBS_MODE_CONV_THRESH`
-     - obs.conv_thresh
-
-${METPLUS_OBS_MERGE_THRESH}
-"""""""""""""""""""""""""""
+${METPLUS_OBS_CENSOR_THRESH}
+""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4688,10 +4693,10 @@ ${METPLUS_OBS_MERGE_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`OBS_MODE_MERGE_THRESH`
-     - obs.merge_thresh
+   * - :term:`MODE_OBS_CENSOR_THRESH`
+     - obs.censor_thresh
 
-${METPLUS_OBS_MERGE_FLAG}
+${METPLUS_OBS_CENSOR_VAL}
 """""""""""""""""""""""""
 
 .. list-table::
@@ -4700,35 +4705,11 @@ ${METPLUS_OBS_MERGE_FLAG}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`OBS_MODE_MERGE_FLAG`
-     - obs.merge_flag
-
-${METPLUS_OBS_FILE_TYPE}
-""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`MODE_OBS_FILE_TYPE`
-     - obs.file_type
-
-${METPLUS_OBS_MULTIVAR_NAME}
-""""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`MODE_OBS_MULTIVAR_NAME`
-     - obs.multivar_name
-
-${METPLUS_OBS_MULTIVAR_LEVEL}
-"""""""""""""""""""""""""""""
+   * - :term:`MODE_OBS_CENSOR_VAL`
+     - obs.censor_val
+	  
+${METPLUS_OBS_CONV_RADIUS}
+""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4736,11 +4717,11 @@ ${METPLUS_OBS_MULTIVAR_LEVEL}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_OBS_MULTIVAR_LEVEL`
-     - obs.multivar_level
+   * - :term:`OBS_MODE_CONV_RADIUS`
+     - obs.conv_radius
 
-${METPLUS_MASK_POLY}
-""""""""""""""""""""
+${METPLUS_OBS_CONV_THRESH}
+""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4748,11 +4729,11 @@ ${METPLUS_MASK_POLY}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_MASK_POLY`
-     - mask.poly
+   * - :term:`OBS_MODE_CONV_THRESH`
+     - obs.conv_thresh
 
-${METPLUS_OUTPUT_PREFIX}
-""""""""""""""""""""""""
+${METPLUS_OBS_VLD_THRESH}
+"""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4760,10 +4741,10 @@ ${METPLUS_OUTPUT_PREFIX}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_OUTPUT_PREFIX`
-     - output_prefix
+   * - :term:`MODE_OBS_VLD_THRESH`
+     - obs.vld_thresh
 
-${METPLUS_MET_CONFIG_OVERRIDES}
+${METPLUS_OBS_FILTER_ATTR_NAME}
 """""""""""""""""""""""""""""""
 
 .. list-table::
@@ -4772,23 +4753,11 @@ ${METPLUS_MET_CONFIG_OVERRIDES}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_MET_CONFIG_OVERRIDES`
-     - n/a
-
-${METPLUS_FCST_FILTER_ATTR_NAME}
-""""""""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`MODE_FCST_FILTER_ATTR_NAME`
-     - fcst.filter_attr_name
+   * - :term:`MODE_OBS_FILTER_ATTR_NAME`
+     - obs.filter_attr_name
 
-${METPLUS_FCST_FILTER_ATTR_THRESH}
-""""""""""""""""""""""""""""""""""
+${METPLUS_OBS_FILTER_ATTR_THRESH}
+"""""""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4796,11 +4765,11 @@ ${METPLUS_FCST_FILTER_ATTR_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_FCST_FILTER_ATTR_THRESH`
-     - fcst.filter_attr_thresh
+   * - :term:`MODE_OBS_FILTER_ATTR_THRESH`
+     - obs.filter_attr_thresh
 
-${METPLUS_FCST_CENSOR_THRESH}
-"""""""""""""""""""""""""""""
+${METPLUS_OBS_MERGE_THRESH}
+"""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4808,11 +4777,11 @@ ${METPLUS_FCST_CENSOR_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_FCST_CENSOR_THRESH`
-     - fcst.censor_thresh
+   * - :term:`OBS_MODE_MERGE_THRESH`
+     - obs.merge_thresh
 
-${METPLUS_FCST_CENSOR_VAL}
-""""""""""""""""""""""""""
+${METPLUS_OBS_MERGE_FLAG}
+"""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4820,11 +4789,11 @@ ${METPLUS_FCST_CENSOR_VAL}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_FCST_CENSOR_VAL`
-     - fcst.censor_val
+   * - :term:`OBS_MODE_MERGE_FLAG`
+     - obs.merge_flag
 
-${METPLUS_FCST_VLD_THRESH}
-""""""""""""""""""""""""""
+${METPLUS_OBS_FILE_TYPE}
+""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4832,11 +4801,11 @@ ${METPLUS_FCST_VLD_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_FCST_VLD_THRESH`
-     - fcst.vld_thresh
+   * - :term:`MODE_OBS_FILE_TYPE`
+     - obs.file_type
 
-${METPLUS_OBS_FILTER_ATTR_NAME}
-"""""""""""""""""""""""""""""""
+${METPLUS_OBS_MULTIVAR_NAME}
+""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4844,11 +4813,11 @@ ${METPLUS_OBS_FILTER_ATTR_NAME}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_OBS_FILTER_ATTR_NAME`
-     - obs.filter_attr_name
+   * - :term:`MODE_OBS_MULTIVAR_NAME`
+     - obs.multivar_name
 
-${METPLUS_OBS_FILTER_ATTR_THRESH}
-"""""""""""""""""""""""""""""""""
+${METPLUS_OBS_MULTIVAR_LEVEL}
+"""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4856,10 +4825,10 @@ ${METPLUS_OBS_FILTER_ATTR_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_OBS_FILTER_ATTR_THRESH`
-     - obs.filter_attr_thresh
+   * - :term:`MODE_OBS_MULTIVAR_LEVEL`
+     - obs.multivar_level
 
-${METPLUS_OBS_CENSOR_THRESH}
+${METPLUS_MASK_MISSING_FLAG}
 """"""""""""""""""""""""""""
 
 .. list-table::
@@ -4868,11 +4837,11 @@ ${METPLUS_OBS_CENSOR_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_OBS_CENSOR_THRESH`
-     - obs.censor_thresh
+   * - :term:`MODE_MASK_MISSING_FLAG`
+     - mask_missing_flag
 
-${METPLUS_OBS_CENSOR_VAL}
-"""""""""""""""""""""""""
+${METPLUS_MATCH_FLAG}
+"""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4880,11 +4849,11 @@ ${METPLUS_OBS_CENSOR_VAL}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_OBS_CENSOR_VAL`
-     - obs.censor_val
+   * - :term:`MODE_MATCH_FLAG`
+     - match_flag
 
-${METPLUS_OBS_VLD_THRESH}
-"""""""""""""""""""""""""
+${METPLUS_MAX_CENTROID_DIST}
+""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -4892,8 +4861,8 @@ ${METPLUS_OBS_VLD_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`MODE_OBS_VLD_THRESH`
-     - obs.vld_thresh
+   * - :term:`MODE_MAX_CENTROID_DIST`
+     - max_centroid_dist
 
 ${METPLUS_MASK_DICT}
 """"""""""""""""""""
@@ -4913,30 +4882,6 @@ ${METPLUS_MASK_DICT}
    * - :term:`MODE_MASK_POLY_FLAG`
      - mask.poly_flag
 
-${METPLUS_MASK_MISSING_FLAG}
-""""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`MODE_MASK_MISSING_FLAG`
-     - mask_missing_flag
-
-${METPLUS_MATCH_FLAG}
-"""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`MODE_MATCH_FLAG`
-     - match_flag
-
 ${METPLUS_WEIGHT_DICT}
 """"""""""""""""""""""
 
@@ -4969,39 +4914,6 @@ ${METPLUS_WEIGHT_DICT}
    * - :term:`MODE_WEIGHT_INTEN_PERC_VALUE`
      - weight.inten_perc_value
 
-${METPLUS_NC_PAIRS_FLAG_DICT}
-"""""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`MODE_NC_PAIRS_FLAG_LATLON`
-     - nc_pairs_flag.latlon
-   * - :term:`MODE_NC_PAIRS_FLAG_RAW`
-     - nc_pairs_flag.raw
-   * - :term:`MODE_NC_PAIRS_FLAG_OBJECT_RAW`
-     - nc_pairs_flag.object_raw
-   * - :term:`MODE_NC_PAIRS_FLAG_OBJECT_ID`
-     - nc_pairs_flag.object_id
-   * - :term:`MODE_NC_PAIRS_FLAG_CLUSTER_ID`
-     - nc_pairs_flag.cluster_id
-   * - :term:`MODE_NC_PAIRS_FLAG_POLYLINES`
-     - nc_pairs_flag.polylines
-
-${METPLUS_MAX_CENTROID_DIST}
-""""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`MODE_MAX_CENTROID_DIST`
-     - max_centroid_dist
 
 ${METPLUS_INTEREST_FUNCTION_CENTROID_DIST}
 """"""""""""""""""""""""""""""""""""""""""
@@ -5062,6 +4974,28 @@ ${METPLUS_PS_PLOT_FLAG}
      - MET Config File
    * - :term:`MODE_PS_PLOT_FLAG`
      - ps_plot_flag
+       
+${METPLUS_NC_PAIRS_FLAG_DICT}
+"""""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`MODE_NC_PAIRS_FLAG_LATLON`
+     - nc_pairs_flag.latlon
+   * - :term:`MODE_NC_PAIRS_FLAG_RAW`
+     - nc_pairs_flag.raw
+   * - :term:`MODE_NC_PAIRS_FLAG_OBJECT_RAW`
+     - nc_pairs_flag.object_raw
+   * - :term:`MODE_NC_PAIRS_FLAG_OBJECT_ID`
+     - nc_pairs_flag.object_id
+   * - :term:`MODE_NC_PAIRS_FLAG_CLUSTER_ID`
+     - nc_pairs_flag.cluster_id
+   * - :term:`MODE_NC_PAIRS_FLAG_POLYLINES`
+     - nc_pairs_flag.polylines
 
 ${METPLUS_CT_STATS_FLAG}
 """"""""""""""""""""""""
@@ -5075,6 +5009,29 @@ ${METPLUS_CT_STATS_FLAG}
    * - :term:`MODE_CT_STATS_FLAG`
      - ct_stats_flag
 
+${METPLUS_OUTPUT_PREFIX}
+""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`MODE_OUTPUT_PREFIX`
+     - output_prefix
+
+${METPLUS_MET_CONFIG_OVERRIDES}
+"""""""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`MODE_MET_CONFIG_OVERRIDES`
+     - n/a
 
 .. _mtd_wrapper:
 
@@ -5523,8 +5480,8 @@ ${METPLUS_MASK_DICT}
 
 .. note:: Since the default value in the MET config file for 'grid' is grid = [ "FULL" ];, setting GRID_STAT_MASK_GRID to an empty string will result in a value of grid = []; in the MET config file.
 
-${METPLUS_OBS_BUFR_VAR}
-"""""""""""""""""""""""
+${METPLUS_PB_REPORT_TYPE}
+"""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -5532,11 +5489,11 @@ ${METPLUS_OBS_BUFR_VAR}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`PB2NC_OBS_BUFR_VAR_LIST`
-     - obs_bufr_var
+   * - :term:`PB2NC_PB_REPORT_TYPE`
+     - pb_report_type
 
-${METPLUS_TIME_SUMMARY_DICT}
-""""""""""""""""""""""""""""
+${METPLUS_LEVEL_RANGE_DICT}
+"""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -5544,31 +5501,13 @@ ${METPLUS_TIME_SUMMARY_DICT}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`PB2NC_TIME_SUMMARY_FLAG`
-     - time_summary.flag
-   * - :term:`PB2NC_TIME_SUMMARY_RAW_DATA`
-     - time_summary.raw_data
-   * - :term:`PB2NC_TIME_SUMMARY_BEG`
-     - time_summary.beg
-   * - :term:`PB2NC_TIME_SUMMARY_END`
-     - time_summary.end
-   * - :term:`PB2NC_TIME_SUMMARY_STEP`
-     - time_summary.step
-   * - :term:`PB2NC_TIME_SUMMARY_WIDTH`
-     - time_summary.width
-   * - :term:`PB2NC_TIME_SUMMARY_GRIB_CODES`
-     - time_summary.grib_code
-   * - :term:`PB2NC_TIME_SUMMARY_VAR_NAMES`
-     - time_summary.obs_var
-   * - :term:`PB2NC_TIME_SUMMARY_TYPES`
-     - time_summary.type
-   * - :term:`PB2NC_TIME_SUMMARY_VALID_FREQ`
-     - time_summary.vld_freq
-   * - :term:`PB2NC_TIME_SUMMARY_VALID_THRESH`
-     - time_summary.vld_thresh
+   * - :term:`PB2NC_LEVEL_RANGE_BEG`
+     - level_range.beg
+   * - :term:`PB2NC_LEVEL_RANGE_END`
+     - level_range.end
 
-${METPLUS_MET_CONFIG_OVERRIDES}
-"""""""""""""""""""""""""""""""
+${METPLUS_LEVEL_CATEGORY}
+"""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -5576,11 +5515,11 @@ ${METPLUS_MET_CONFIG_OVERRIDES}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`PB2NC_MET_CONFIG_OVERRIDES`
-     - n/a
+   * - :term:`PB2NC_LEVEL_CATEGORY`
+     - level_category
 
-${METPLUS_PB_REPORT_TYPE}
-"""""""""""""""""""""""""
+${METPLUS_OBS_BUFR_VAR}
+"""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -5588,11 +5527,11 @@ ${METPLUS_PB_REPORT_TYPE}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`PB2NC_PB_REPORT_TYPE`
-     - pb_report_type
+   * - :term:`PB2NC_OBS_BUFR_VAR_LIST`
+     - obs_bufr_var
 
-${METPLUS_LEVEL_RANGE_DICT}
-"""""""""""""""""""""""""""
+${METPLUS_OBS_BUFR_MAP}
+"""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -5600,13 +5539,11 @@ ${METPLUS_LEVEL_RANGE_DICT}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`PB2NC_LEVEL_RANGE_BEG`
-     - level_range.beg
-   * - :term:`PB2NC_LEVEL_RANGE_END`
-     - level_range.end
+   * - :term:`PB2NC_OBS_BUFR_MAP`
+     - obs_bufr_map
 
-${METPLUS_LEVEL_CATEGORY}
-"""""""""""""""""""""""""
+${METPLUS_QUALITY_MARK_THRESH}
+""""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -5614,11 +5551,11 @@ ${METPLUS_LEVEL_CATEGORY}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`PB2NC_LEVEL_CATEGORY`
-     - level_category
+   * - :term:`PB2NC_QUALITY_MARK_THRESH`
+     - quality_mark_thresh
 
-${METPLUS_QUALITY_MARK_THRESH}
-""""""""""""""""""""""""""""""
+${METPLUS_TIME_SUMMARY_DICT}
+""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -5626,11 +5563,31 @@ ${METPLUS_QUALITY_MARK_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`PB2NC_QUALITY_MARK_THRESH`
-     - quality_mark_thresh
+   * - :term:`PB2NC_TIME_SUMMARY_FLAG`
+     - time_summary.flag
+   * - :term:`PB2NC_TIME_SUMMARY_RAW_DATA`
+     - time_summary.raw_data
+   * - :term:`PB2NC_TIME_SUMMARY_BEG`
+     - time_summary.beg
+   * - :term:`PB2NC_TIME_SUMMARY_END`
+     - time_summary.end
+   * - :term:`PB2NC_TIME_SUMMARY_STEP`
+     - time_summary.step
+   * - :term:`PB2NC_TIME_SUMMARY_WIDTH`
+     - time_summary.width
+   * - :term:`PB2NC_TIME_SUMMARY_GRIB_CODES`
+     - time_summary.grib_code
+   * - :term:`PB2NC_TIME_SUMMARY_VAR_NAMES`
+     - time_summary.obs_var
+   * - :term:`PB2NC_TIME_SUMMARY_TYPES`
+     - time_summary.type
+   * - :term:`PB2NC_TIME_SUMMARY_VALID_FREQ`
+     - time_summary.vld_freq
+   * - :term:`PB2NC_TIME_SUMMARY_VALID_THRESH`
+     - time_summary.vld_thresh
 
-${METPLUS_OBS_BUFR_MAP}
-"""""""""""""""""""""""
+${METPLUS_MET_CONFIG_OVERRIDES}
+"""""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -5638,8 +5595,8 @@ ${METPLUS_OBS_BUFR_MAP}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`PB2NC_OBS_BUFR_MAP`
-     - obs_bufr_map
+   * - :term:`PB2NC_MET_CONFIG_OVERRIDES`
+     - n/a
 
 .. _pcp_combine_wrapper:
 
@@ -6226,6 +6183,17 @@ ${METPLUS_POINT_DATA}
    * - :term:`PLOT_POINT_OBS_POINT_DATA`
      - point_data
 
+${METPLUS_MET_CONFIG_OVERRIDES}
+"""""""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`PLOT_POINT_OBS_MET_CONFIG_OVERRIDES`
+     - obs.cat_thresh
 
 .. _point2grid_wrapper:
 
@@ -6509,6 +6477,30 @@ ${METPLUS_REGRID_DICT}
    * - :term:`POINT_STAT_REGRID_CENSOR_VAL`
      - regrid.censor_val
 
+${METPLUS_HSS_EC_VALUE}
+"""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`POINT_STAT_HSS_EC_VALUE`
+     - hss_ec_value
+       
+${METPLUS_FCST_FILE_TYPE}
+"""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`POINT_STAT_FCST_FILE_TYPE`
+     - fcst.file_type
+       
 ${METPLUS_FCST_FIELD}
 """""""""""""""""""""
 
@@ -6529,8 +6521,8 @@ ${METPLUS_FCST_FIELD}
 
 .. note:: For more information on controlling the forecast field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
 
-${METPLUS_FCST_FILE_TYPE}
-"""""""""""""""""""""""""
+${METPLUS_OBS_FILE_TYPE}
+""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -6538,8 +6530,8 @@ ${METPLUS_FCST_FILE_TYPE}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`POINT_STAT_FCST_FILE_TYPE`
-     - fcst.file_type
+   * - :term:`POINT_STAT_OBS_FILE_TYPE`
+     - obs.file_type
 
 ${METPLUS_OBS_FIELD}
 """"""""""""""""""""
@@ -6561,8 +6553,8 @@ ${METPLUS_OBS_FIELD}
 
 .. note:: For more information on controlling the observation field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
 
-${METPLUS_OBS_FILE_TYPE}
-""""""""""""""""""""""""
+${METPLUS_MESSAGE_TYPE}
+"""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -6570,11 +6562,11 @@ ${METPLUS_OBS_FILE_TYPE}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`POINT_STAT_OBS_FILE_TYPE`
-     - obs.file_type
+   * - :term:`POINT_STAT_MESSAGE_TYPE`
+     - message_type
 
-${METPLUS_MESSAGE_TYPE}
-"""""""""""""""""""""""
+${METPLUS_OBS_QUALITY_INC}
+""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -6582,10 +6574,33 @@ ${METPLUS_MESSAGE_TYPE}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`POINT_STAT_MESSAGE_TYPE`
-     - message_type
+   * - :term:`POINT_STAT_OBS_QUALITY_INC`
+     - obs_quality_inc
+
+${METPLUS_OBS_QUALITY_EXC}
+""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`POINT_STAT_OBS_QUALITY_EXC`
+     - obs_quality_exc
+
+${METPLUS_MESSAGE_TYPE_GROUP_MAP}
+"""""""""""""""""""""""""""""""""
 
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
 
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`POINT_STAT_MESSAGE_TYPE_GROUP_MAP`
+     - message_type_group_map
+       
 ${METPLUS_CLIMO_MEAN_DICT}
 """"""""""""""""""""""""""
 
@@ -6646,6 +6661,23 @@ ${METPLUS_CLIMO_STDEV_DICT}
    * - :term:`POINT_STAT_CLIMO_STDEV_HOUR_INTERVAL`
      - climo_stdev.hour_interval
 
+${METPLUS_CLIMO_CDF_DICT}
+"""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`POINT_STAT_CLIMO_CDF_BINS`
+     - climo_cdf.cdf_bins
+   * - :term:`POINT_STAT_CLIMO_CDF_CENTER_BINS`
+     - climo_cdf.center_bins
+   * - :term:`POINT_STAT_CLIMO_CDF_WRITE_BINS`
+     - climo_cdf.write_bins
+   * - :term:`POINT_STAT_CLIMO_CDF_DIRECT_PROB`
+     - climo_cdf.direct_prob
 
 ${METPLUS_OBS_WINDOW_DICT}
 """"""""""""""""""""""""""
@@ -6679,50 +6711,8 @@ ${METPLUS_MASK_DICT}
    * - :term:`POINT_STAT_MASK_LLPNT`
      - mask.llpnt
 
-${METPLUS_OUTPUT_PREFIX}
-""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`POINT_STAT_OUTPUT_PREFIX`
-     - output_prefix
-
-${METPLUS_MET_CONFIG_OVERRIDES}
-"""""""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`POINT_STAT_MET_CONFIG_OVERRIDES`
-     - n/a
-
-${METPLUS_CLIMO_CDF_DICT}
-"""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`POINT_STAT_CLIMO_CDF_BINS`
-     - climo_cdf.cdf_bins
-   * - :term:`POINT_STAT_CLIMO_CDF_CENTER_BINS`
-     - climo_cdf.center_bins
-   * - :term:`POINT_STAT_CLIMO_CDF_WRITE_BINS`
-     - climo_cdf.write_bins
-   * - :term:`POINT_STAT_CLIMO_CDF_DIRECT_PROB`
-     - climo_cdf.direct_prob
-
-${METPLUS_OBS_QUALITY_INC}
-""""""""""""""""""""""""""
+${METPLUS_INTERP_DICT}
+""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -6730,11 +6720,17 @@ ${METPLUS_OBS_QUALITY_INC}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`POINT_STAT_OBS_QUALITY_INC`
-     - obs_quality_inc
+   * - :term:`POINT_STAT_INTERP_VLD_THRESH`
+     - interp.vld_thresh
+   * - :term:`POINT_STAT_INTERP_SHAPE`
+     - interp.shape
+   * - :term:`POINT_STAT_INTERP_TYPE_METHOD`
+     - interp.type.method
+   * - :term:`POINT_STAT_INTERP_TYPE_WIDTH`
+     - interp.type.width
 
-${METPLUS_OBS_QUALITY_EXC}
-""""""""""""""""""""""""""
+${METPLUS_HIRA_DICT}
+""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -6742,8 +6738,18 @@ ${METPLUS_OBS_QUALITY_EXC}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`POINT_STAT_OBS_QUALITY_EXC`
-     - obs_quality_exc
+   * - :term:`POINT_STAT_HIRA_FLAG`
+     - hira.flag
+   * - :term:`POINT_STAT_HIRA_WIDTH`
+     - hira.width
+   * - :term:`POINT_STAT_HIRA_VLD_THRESH`
+     - hira.vld_thresh
+   * - :term:`POINT_STAT_HIRA_COV_THRESH`
+     - hira.cov_thresh
+   * - :term:`POINT_STAT_HIRA_SHAPE`
+     - hira.shape
+   * - :term:`POINT_STAT_HIRA_PROB_CAT_THRESH`
+     - hira.prob_cat_thresh
 
 ${METPLUS_OUTPUT_FLAG_DICT}
 """""""""""""""""""""""""""
@@ -6799,38 +6805,8 @@ ${METPLUS_OUTPUT_FLAG_DICT}
    * - :term:`POINT_STAT_OUTPUT_FLAG_SEEPS_MPR`
      - output_flag.seeps_mpr
 
-${METPLUS_INTERP_DICT}
-""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`POINT_STAT_INTERP_VLD_THRESH`
-     - interp.vld_thresh
-   * - :term:`POINT_STAT_INTERP_SHAPE`
-     - interp.shape
-   * - :term:`POINT_STAT_INTERP_TYPE_METHOD`
-     - interp.type.method
-   * - :term:`POINT_STAT_INTERP_TYPE_WIDTH`
-     - interp.type.width
-
-${METPLUS_HSS_EC_VALUE}
-"""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`POINT_STAT_HSS_EC_VALUE`
-     - hss_ec_value
-
-${METPLUS_HIRA_DICT}
-""""""""""""""""""""
+${METPLUS_SEEPS_P1_THRESH}
+""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -6838,21 +6814,11 @@ ${METPLUS_HIRA_DICT}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`POINT_STAT_HIRA_FLAG`
-     - hira.flag
-   * - :term:`POINT_STAT_HIRA_WIDTH`
-     - hira.width
-   * - :term:`POINT_STAT_HIRA_VLD_THRESH`
-     - hira.vld_thresh
-   * - :term:`POINT_STAT_HIRA_COV_THRESH`
-     - hira.cov_thresh
-   * - :term:`POINT_STAT_HIRA_SHAPE`
-     - hira.shape
-   * - :term:`POINT_STAT_HIRA_PROB_CAT_THRESH`
-     - hira.prob_cat_thresh
-
-${METPLUS_MESSAGE_TYPE_GROUP_MAP}
-"""""""""""""""""""""""""""""""""
+   * - :term:`POINT_STAT_SEEPS_P1_THRESH`
+     - seeps_p1_thresh
+       
+${METPLUS_OUTPUT_PREFIX}
+""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -6860,11 +6826,11 @@ ${METPLUS_MESSAGE_TYPE_GROUP_MAP}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`POINT_STAT_MESSAGE_TYPE_GROUP_MAP`
-     - message_type_group_map
+   * - :term:`POINT_STAT_OUTPUT_PREFIX`
+     - output_prefix
 
-${METPLUS_SEEPS_P1_THRESH}
-""""""""""""""""""""""""""
+${METPLUS_MET_CONFIG_OVERRIDES}
+"""""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -6872,9 +6838,8 @@ ${METPLUS_SEEPS_P1_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`POINT_STAT_SEEPS_P1_THRESH`
-     - seeps_p1_thresh
-
+   * - :term:`POINT_STAT_MET_CONFIG_OVERRIDES`
+     - n/a
 
 .. _py_embed_ingest_wrapper:
 
@@ -7201,6 +7166,18 @@ ${METPLUS_FCST_FILE_TYPE}
    * - :term:`FCST_SERIES_ANALYSIS_INPUT_DATATYPE`
      - fcst.file_type
 
+${METPLUS_FCST_CAT_THRESH}
+""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`FCST_SERIES_ANALYSIS_CAT_THRESH`
+     - fcst.cat_thresh
+
 ${METPLUS_FCST_FIELD}
 """""""""""""""""""""
 
@@ -7235,6 +7212,18 @@ ${METPLUS_OBS_FILE_TYPE}
    * - :term:`OBS_SERIES_ANALYSIS_INPUT_DATATYPE`
      - obs.file_type
 
+${METPLUS_OBS_CAT_THRESH}
+"""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`OBS_SERIES_ANALYSIS_CAT_THRESH`
+     - obs.cat_thresh
+
 ${METPLUS_OBS_FIELD}
 """"""""""""""""""""
 
@@ -7370,32 +7359,8 @@ ${METPLUS_VLD_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`SERIES_ANALYSIS_VLD_THRESH`
-     - vld_thresh
-
-${METPLUS_MET_CONFIG_OVERRIDES}
-"""""""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`SERIES_ANALYSIS_MET_CONFIG_OVERRIDES`
-     - n/a
-
-${METPLUS_HSS_EC_VALUE}
-"""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`SERIES_ANALYSIS_HSS_EC_VALUE`
-     - hss_ec_value
+   * - :term:`SERIES_ANALYSIS_VLD_THRESH`
+     - vld_thresh
 
 ${METPLUS_OUTPUT_STATS_DICT}
 """"""""""""""""""""""""""""
@@ -7431,8 +7396,8 @@ ${METPLUS_OUTPUT_STATS_DICT}
    * - :term:`SERIES_ANALYSIS_OUTPUT_STATS_PRC`
      - output_stats.prc
 
-${METPLUS_FCST_CAT_THRESH}
-""""""""""""""""""""""""""
+${METPLUS_HSS_EC_VALUE}
+"""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -7440,11 +7405,11 @@ ${METPLUS_FCST_CAT_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`FCST_SERIES_ANALYSIS_CAT_THRESH`
-     - fcst.cat_thresh
+   * - :term:`SERIES_ANALYSIS_HSS_EC_VALUE`
+     - hss_ec_value
 
-${METPLUS_OBS_CAT_THRESH}
-"""""""""""""""""""""""""
+${METPLUS_MET_CONFIG_OVERRIDES}
+"""""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -7452,9 +7417,8 @@ ${METPLUS_OBS_CAT_THRESH}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`OBS_SERIES_ANALYSIS_CAT_THRESH`
-     - obs.cat_thresh
-
+   * - :term:`SERIES_ANALYSIS_MET_CONFIG_OVERRIDES`
+     - n/a 
 
 SeriesByInit
 ============
@@ -8196,11 +8160,11 @@ ${METPLUS_JOBS}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`STAT_ANALYSIS_JOB_NAME`
+   * - :term:`STAT_ANALYSIS_JOB\<n\>`
      - jobs
 
-${METPLUS_MET_CONFIG_OVERRIDES}
-"""""""""""""""""""""""""""""""
+${METPLUS_HSS_EC_VALUE}
+"""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -8208,11 +8172,11 @@ ${METPLUS_MET_CONFIG_OVERRIDES}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`STAT_ANALYSIS_MET_CONFIG_OVERRIDES`
-     - n/a
+   * - :term:`STAT_ANALYSIS_HSS_EC_VALUE`
+     - hss_ec_value
 
-${METPLUS_HSS_EC_VALUE}
-"""""""""""""""""""""""
+${METPLUS_MET_CONFIG_OVERRIDES}
+"""""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -8220,9 +8184,8 @@ ${METPLUS_HSS_EC_VALUE}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`STAT_ANALYSIS_HSS_EC_VALUE`
-     - hss_ec_value
-
+   * - :term:`STAT_ANALYSIS_MET_CONFIG_OVERRIDES`
+     - n/a
 
 .. _tc_diag_wrapper:
 
@@ -8369,8 +8332,8 @@ ${METPLUS_CYCLONE}
    * - :term:`TC_DIAG_CYCLONE`
      - cyclone
 
-${METPLUS_INIT_INCLUDE_LIST}
-""""""""""""""""""""""""""""
+${METPLUS_INIT_INCLUDE}
+"""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -8521,24 +8484,6 @@ ${METPLUS_CONVERT}
    * - :term:`TC_DIAG_CONVERT`
      - convert
 
-${METPLUS_DATA_FIELD}
-"""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`BOTH_VAR<n>_NAME`
-     - data.field.name
-   * - :term:`BOTH_VAR<n>_LEVELS`
-     - data.field.level
-   * - :term:`BOTH_VAR<n>_OPTIONS`
-     - n/a
-
-.. note:: For more information on controlling the field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
-
 ${METPLUS_DATA_FILE_TYPE}
 """""""""""""""""""""""""
 
@@ -8575,6 +8520,24 @@ ${METPLUS_DATA_LEVEL}
    * - :term:`TC_DIAG_DATA_LEVEL`
      - data.level
 
+${METPLUS_DATA_FIELD}
+"""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`BOTH_VAR<n>_NAME`
+     - data.field.name
+   * - :term:`BOTH_VAR<n>_LEVELS`
+     - data.field.level
+   * - :term:`BOTH_VAR<n>_OPTIONS`
+     - n/a
+
+.. note:: For more information on controlling the field attributes in METplus, please see the :ref:`Field_Info` section of the User's Guide.
+
 ${METPLUS_REGRID_DICT}
 """"""""""""""""""""""
 
@@ -9186,8 +9149,8 @@ ${METPLUS_DLAND_THRESH}
    * - :term:`TC_GEN_DLAND_THRESH`
      - dland_thresh
 
-${METPLUS_DEV_HIT_WINDOW_DICT}
-""""""""""""""""""""""""""""""
+${METPLUS_GENESIS_MATCH_POINT_TO_TRACK}
+"""""""""""""""""""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -9195,10 +9158,8 @@ ${METPLUS_DEV_HIT_WINDOW_DICT}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`TC_GEN_DEV_HIT_WINDOW_BEGIN`
-     - dev_hit_window.beg
-   * - :term:`TC_GEN_DEV_HIT_WINDOW_END`
-     - dev_hit_window.end
+   * - :term:`TC_GEN_GENESIS_MATCH_POINT_TO_TRACK`
+     - genesis_match_point_to_track
 
 ${METPLUS_GENESIS_MATCH_RADIUS}
 """""""""""""""""""""""""""""""
@@ -9212,18 +9173,6 @@ ${METPLUS_GENESIS_MATCH_RADIUS}
    * - :term:`TC_GEN_GENESIS_MATCH_RADIUS`
      - genesis_match_radius
 
-${METPLUS_GENESIS_MATCH_POINT_TO_TRACK}
-"""""""""""""""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`TC_GEN_GENESIS_MATCH_POINT_TO_TRACK`
-     - genesis_match_point_to_track
-
 ${METPLUS_GENESIS_MATCH_WINDOW_DICT}
 """"""""""""""""""""""""""""""""""""
 
@@ -9250,6 +9199,20 @@ ${METPLUS_DEV_HIT_RADIUS}
    * - :term:`TC_GEN_DEV_HIT_RADIUS`
      - dev_hit_radius
 
+${METPLUS_DEV_HIT_WINDOW_DICT}
+""""""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_GEN_DEV_HIT_WINDOW_BEGIN`
+     - dev_hit_window.beg
+   * - :term:`TC_GEN_DEV_HIT_WINDOW_END`
+     - dev_hit_window.end
+
 ${METPLUS_OPS_HIT_WINDOW_DICT}
 """"""""""""""""""""""""""""""
 
@@ -9689,7 +9652,7 @@ ${METPLUS_INIT_EXC}
    * - :term:`TC_PAIRS_INIT_EXCLUDE`
      - init_exc
 
-${METPLUS_VALID_INC}
+${METPLUS_VALID_BEG}
 """"""""""""""""""""
 
 .. list-table::
@@ -9698,10 +9661,10 @@ ${METPLUS_VALID_INC}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`TC_PAIRS_VALID_INCLUDE`
-     - valid_inc
+   * - :term:`TC_PAIRS_VALID_BEG`
+     - valid_beg
 
-${METPLUS_VALID_EXC}
+${METPLUS_VALID_END}
 """"""""""""""""""""
 
 .. list-table::
@@ -9710,22 +9673,10 @@ ${METPLUS_VALID_EXC}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`TC_PAIRS_VALID_EXCLUDE`
-     - valid_exc
-
-${METPLUS_WRITE_VALID}
-""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`TC_PAIRS_WRITE_VALID`
-     - write_valid
+   * - :term:`TC_PAIRS_VALID_END`
+     - valid_end
 
-${METPLUS_VALID_BEG}
+${METPLUS_VALID_INC}
 """"""""""""""""""""
 
 .. list-table::
@@ -9734,10 +9685,10 @@ ${METPLUS_VALID_BEG}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`TC_PAIRS_VALID_BEG`
-     - valid_beg
+   * - :term:`TC_PAIRS_VALID_INCLUDE`
+     - valid_inc
 
-${METPLUS_VALID_END}
+${METPLUS_VALID_EXC}
 """"""""""""""""""""
 
 .. list-table::
@@ -9746,11 +9697,11 @@ ${METPLUS_VALID_END}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`TC_PAIRS_VALID_END`
-     - valid_end
+   * - :term:`TC_PAIRS_VALID_EXCLUDE`
+     - valid_exc
 
-${METPLUS_MATCH_POINTS}
-"""""""""""""""""""""""
+${METPLUS_WRITE_VALID}
+""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -9758,11 +9709,11 @@ ${METPLUS_MATCH_POINTS}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`TC_PAIRS_MATCH_POINTS`
-     - match_points
+   * - :term:`TC_PAIRS_WRITE_VALID`
+     - write_valid
 
-${METPLUS_DLAND_FILE}
-"""""""""""""""""""""
+${METPLUS_CHECK_DUP}
+""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -9770,11 +9721,11 @@ ${METPLUS_DLAND_FILE}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`TC_PAIRS_DLAND_FILE`
-     - dland_file
+   * - :term:`TC_PAIRS_CHECK_DUP`
+     - check_dup
 
-${METPLUS_MET_CONFIG_OVERRIDES}
-"""""""""""""""""""""""""""""""
+${METPLUS_INTERP12}
+"""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -9782,8 +9733,8 @@ ${METPLUS_MET_CONFIG_OVERRIDES}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`TC_PAIRS_MET_CONFIG_OVERRIDES`
-     - n/a
+   * - :term:`TC_PAIRS_INTERP12`
+     - interp12
 
 ${METPLUS_CONSENSUS_LIST}
 """""""""""""""""""""""""
@@ -9805,9 +9756,8 @@ ${METPLUS_CONSENSUS_LIST}
    * - :term:`TC_PAIRS_CONSENSUS<n>_WRITE_MEMBERS`
      - consensus.write_members
 
-
-${METPLUS_CHECK_DUP}
-""""""""""""""""""""
+${METPLUS_MATCH_POINTS}
+"""""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -9815,11 +9765,11 @@ ${METPLUS_CHECK_DUP}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`TC_PAIRS_CHECK_DUP`
-     - check_dup
+   * - :term:`TC_PAIRS_MATCH_POINTS`
+     - match_points
 
-${METPLUS_INTERP12}
-"""""""""""""""""""
+${METPLUS_DLAND_FILE}
+"""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -9827,8 +9777,8 @@ ${METPLUS_INTERP12}
 
    * - METplus Config(s)
      - MET Config File
-   * - :term:`TC_PAIRS_INTERP12`
-     - interp12
+   * - :term:`TC_PAIRS_DLAND_FILE`
+     - dland_file
 
 ${METPLUS_DIAG_INFO_MAP_LIST}
 """""""""""""""""""""""""""""
@@ -9866,7 +9816,18 @@ ${METPLUS_DIAG_CONVERT_MAP_LIST}
    * - :term:`TC_PAIRS_DIAG_CONVERT_MAP<n>_CONVERT`
      - diag_convert_map.convert
 
+${METPLUS_MET_CONFIG_OVERRIDES}
+"""""""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
 
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_PAIRS_MET_CONFIG_OVERRIDES`
+     - n/a
+       
 .. _tcrmw_wrapper:
 
 TCRMW
@@ -10421,8 +10382,8 @@ ${METPLUS_INIT_END}
    * - :term:`TC_STAT_INIT_END`
      - init_end
 
-${METPLUS_INIT_INCLUDE}
-"""""""""""""""""""""""
+${METPLUS_INIT_INC}
+"""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -10433,8 +10394,8 @@ ${METPLUS_INIT_INCLUDE}
    * - :term:`TC_STAT_INIT_INCLUDE`
      - init_inc
 
-${METPLUS_INIT_EXCLUDE}
-"""""""""""""""""""""""
+${METPLUS_INIT_EXC}
+"""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -10469,8 +10430,8 @@ ${METPLUS_VALID_END}
    * - :term:`TC_STAT_VALID_END`
      - valid_end
 
-${METPLUS_VALID_INCLUDE}
-""""""""""""""""""""""""
+${METPLUS_VALID_INC}
+""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -10481,8 +10442,8 @@ ${METPLUS_VALID_INCLUDE}
    * - :term:`TC_STAT_VALID_INCLUDE`
      - valid_inc
 
-${METPLUS_VALID_EXCLUDE}
-""""""""""""""""""""""""
+${METPLUS_VALID_EXC}
+""""""""""""""""""""
 
 .. list-table::
    :widths: 5 5
@@ -10841,30 +10802,6 @@ ${METPLUS_MATCH_POINTS}
    * - :term:`TC_STAT_MATCH_POINTS`
      - match_points
 
-${METPLUS_JOBS}
-"""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`TC_STAT_JOBS_LIST`
-     - jobs
-
-${METPLUS_MET_CONFIG_OVERRIDES}
-"""""""""""""""""""""""""""""""
-
-.. list-table::
-   :widths: 5 5
-   :header-rows: 1
-
-   * - METplus Config(s)
-     - MET Config File
-   * - :term:`TC_STAT_MET_CONFIG_OVERRIDES`
-     - n/a
-
 ${METPLUS_EVENT_EQUAL}
 """"""""""""""""""""""
 
@@ -10912,7 +10849,30 @@ ${METPLUS_OUT_VALID_MASK}
      - MET Config File
    * - :term:`TC_STAT_OUT_VALID_MASK`
      - out_valid_mask
+       
+${METPLUS_JOBS}
+"""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
 
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_JOBS_LIST`
+     - jobs
+
+${METPLUS_MET_CONFIG_OVERRIDES}
+"""""""""""""""""""""""""""""""
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 1
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`TC_STAT_MET_CONFIG_OVERRIDES`
+     - n/a
 
 .. _user_script_wrapper:
 
diff --git a/internal/scripts/docker_env/scripts/cfgrib_env.sh b/internal/scripts/docker_env/scripts/cfgrib_env.sh
index 91e94d05d7..123d99d45d 100755
--- a/internal/scripts/docker_env/scripts/cfgrib_env.sh
+++ b/internal/scripts/docker_env/scripts/cfgrib_env.sh
@@ -7,7 +7,7 @@
 #   so it can easily be processed with MetPy
 # Python Packages:
 #   metpy==1.3.0
-#   netcdf4==1.5.8
+#   netcdf4==1.6.2
 #   cfgrib==0.9.10.1
 #   pygrib==2.1.4
 #
@@ -20,8 +20,8 @@ METPLUS_VERSION=$1
 # Conda environment to create
 ENV_NAME=cfgrib.${METPLUS_VERSION}
 
-conda create -y --name ${ENV_NAME} -c conda-forge python=3.10.4
-conda install -y --name ${ENV_NAME} -c conda-forge metpy==1.4.0
-conda install -y --name ${ENV_NAME} -c conda-forge netcdf4==1.5.8
-conda install -y --name ${ENV_NAME} -c conda-forge cfgrib==0.9.10.1
-conda install -y --name ${ENV_NAME} -c conda-forge pygrib==2.1.4
+mamba create -y --name ${ENV_NAME} -c conda-forge python=3.10.4
+mamba install -y --name ${ENV_NAME} -c conda-forge metpy==1.4.0
+mamba install -y --name ${ENV_NAME} -c conda-forge netcdf4==1.6.2
+mamba install -y --name ${ENV_NAME} -c conda-forge cfgrib==0.9.10.1
+mamba install -y --name ${ENV_NAME} -c conda-forge pygrib==2.1.4
diff --git a/internal/scripts/docker_env/scripts/cycloneplotter_env.sh b/internal/scripts/docker_env/scripts/cycloneplotter_env.sh
index 8735e8f50d..ae742ceaec 100755
--- a/internal/scripts/docker_env/scripts/cycloneplotter_env.sh
+++ b/internal/scripts/docker_env/scripts/cycloneplotter_env.sh
@@ -22,7 +22,7 @@ ENV_NAME=cycloneplotter.${METPLUS_VERSION}
 # Conda environment to use as base for new environment
 BASE_ENV=metplus_base.${METPLUS_VERSION}
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
-conda install -y --name ${ENV_NAME} -c conda-forge cartopy==0.20.3
-conda install -y --name ${ENV_NAME} -c conda-forge matplotlib==3.5.2
-conda install -y --name ${ENV_NAME} -c conda-forge pandas==1.4.3
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba install -y --name ${ENV_NAME} -c conda-forge cartopy==0.20.3
+mamba install -y --name ${ENV_NAME} -c conda-forge matplotlib==3.5.2
+mamba install -y --name ${ENV_NAME} -c conda-forge pandas==1.4.3
diff --git a/internal/scripts/docker_env/scripts/diff_env.sh b/internal/scripts/docker_env/scripts/diff_env.sh
index 54544a38e8..b5f62c4e2e 100755
--- a/internal/scripts/docker_env/scripts/diff_env.sh
+++ b/internal/scripts/docker_env/scripts/diff_env.sh
@@ -23,11 +23,11 @@ ENV_NAME=diff.${METPLUS_VERSION}
 # Conda environment to use as base for new environment
 BASE_ENV=netcdf4.${METPLUS_VERSION}
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
-conda install -y --name ${ENV_NAME} -c conda-forge pandas==2.0.2
-conda install -y --name ${ENV_NAME} -c conda-forge pillow==9.2.0
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba install -y --name ${ENV_NAME} -c conda-forge pandas==2.0.2
+mamba install -y --name ${ENV_NAME} -c conda-forge pillow==9.2.0
 
 apt-get update
 apt-get install -y poppler-utils
 
-conda install -y --name ${ENV_NAME} -c conda-forge pdf2image==1.16.0
+mamba install -y --name ${ENV_NAME} -c conda-forge pdf2image==1.16.0
diff --git a/internal/scripts/docker_env/scripts/geovista_env.sh b/internal/scripts/docker_env/scripts/geovista_env.sh
index 28bd920cdf..4c0a8a9398 100755
--- a/internal/scripts/docker_env/scripts/geovista_env.sh
+++ b/internal/scripts/docker_env/scripts/geovista_env.sh
@@ -24,7 +24,7 @@ ENV_NAME=geovista.${METPLUS_VERSION}
 apt install -y libgl1-mesa-glx
 apt install -y libegl1
 
-conda create -y --name ${ENV_NAME} -c conda-forge python=3.10.4
-conda install -y --name ${ENV_NAME} -c conda-forge geovista==0.3.0
-conda install -y --name ${ENV_NAME} -c conda-forge xarray==2023.8.0
-conda install -y --name ${ENV_NAME} -c conda-forge iris==3.7.0
+mamba create -y --name ${ENV_NAME} -c conda-forge python=3.10.4
+mamba install -y --name ${ENV_NAME} -c conda-forge geovista==0.3.0
+mamba install -y --name ${ENV_NAME} -c conda-forge xarray==2023.8.0
+mamba install -y --name ${ENV_NAME} -c conda-forge iris==3.7.0
diff --git a/internal/scripts/docker_env/scripts/h5py_env.sh b/internal/scripts/docker_env/scripts/h5py_env.sh
index 04710c619f..fa9794db6f 100755
--- a/internal/scripts/docker_env/scripts/h5py_env.sh
+++ b/internal/scripts/docker_env/scripts/h5py_env.sh
@@ -19,5 +19,5 @@ ENV_NAME=h5py.${METPLUS_VERSION}
 # Conda environment to use as base for new environment
 BASE_ENV=py_embed_base.${METPLUS_VERSION}
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
-conda install -y --name ${ENV_NAME} -c conda-forge h5py==3.6.0
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba install -y --name ${ENV_NAME} -c conda-forge h5py==3.6.0
diff --git a/internal/scripts/docker_env/scripts/icecover_env.sh b/internal/scripts/docker_env/scripts/icecover_env.sh
index 3c93019a84..fc5ea361cf 100755
--- a/internal/scripts/docker_env/scripts/icecover_env.sh
+++ b/internal/scripts/docker_env/scripts/icecover_env.sh
@@ -22,8 +22,8 @@ ENV_NAME=icecover.${METPLUS_VERSION}
 # Conda environment to use as base for new environment
 BASE_ENV=py_embed_base.${METPLUS_VERSION}
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
-conda install -y --name ${ENV_NAME} -c conda-forge xarray==2023.5.0
-conda install -y --name ${ENV_NAME} -c conda-forge pyresample==1.27.1
-conda install -y --name ${ENV_NAME} -c conda-forge scikit-learn==1.3.0
-conda install -y --name ${ENV_NAME} -c conda-forge pyproj==3.6.0
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba install -y --name ${ENV_NAME} -c conda-forge xarray==2023.5.0
+mamba install -y --name ${ENV_NAME} -c conda-forge pyresample==1.27.1
+mamba install -y --name ${ENV_NAME} -c conda-forge scikit-learn==1.3.0
+mamba install -y --name ${ENV_NAME} -c conda-forge pyproj==3.6.0
diff --git a/internal/scripts/docker_env/scripts/metdataio_env.sh b/internal/scripts/docker_env/scripts/metdataio_env.sh
index d9d3d47708..a1e2c291c8 100755
--- a/internal/scripts/docker_env/scripts/metdataio_env.sh
+++ b/internal/scripts/docker_env/scripts/metdataio_env.sh
@@ -21,8 +21,8 @@ ENV_NAME=metdataio.${METPLUS_VERSION}
 # Conda environment to use as base for new environment
 BASE_ENV=metplus_base.${METPLUS_VERSION}
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
 
-conda install -y --name ${ENV_NAME} -c conda-forge lxml==4.9.1
-conda install -y --name ${ENV_NAME} -c conda-forge pymysql==1.0.2
-conda install -y --name ${ENV_NAME} -c conda-forge pandas==1.5.1
+mamba install -y --name ${ENV_NAME} -c conda-forge lxml==4.9.1
+mamba install -y --name ${ENV_NAME} -c conda-forge pymysql==1.0.2
+mamba install -y --name ${ENV_NAME} -c conda-forge pandas==1.5.1
diff --git a/internal/scripts/docker_env/scripts/metplotpy_env.sh b/internal/scripts/docker_env/scripts/metplotpy_env.sh
index cfe4166866..c571404b65 100755
--- a/internal/scripts/docker_env/scripts/metplotpy_env.sh
+++ b/internal/scripts/docker_env/scripts/metplotpy_env.sh
@@ -9,7 +9,7 @@
 #   scipy==1.8.1
 #   plotly==5.9.0
 #   xarray==2022.3.0
-#   netcdf4==1.6.0
+#   netcdf4==1.6.2
 #   pyyaml==6.0
 #   statsmodels==0.13.2
 #   python-kaleido==0.2.1
@@ -31,19 +31,19 @@ ENV_NAME=metplotpy.${METPLUS_VERSION}
 # Conda environment to use as base for new environment
 BASE_ENV=metplus_base.${METPLUS_VERSION}
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
 
-conda install -y --name ${ENV_NAME} -c conda-forge matplotlib==3.6.3
-conda install -y --name ${ENV_NAME} -c conda-forge scipy==1.9.3
-conda install -y --name ${ENV_NAME} -c conda-forge plotly==5.13.0
-conda install -y --name ${ENV_NAME} -c conda-forge xarray==2023.1.0
-conda install -y --name ${ENV_NAME} -c conda-forge netcdf4==1.6.2
-conda install -y --name ${ENV_NAME} -c conda-forge pyyaml==6.0
-#conda install -y --name ${ENV_NAME} -c conda-forge statsmodels #==0.13.2
-conda install -y --name ${ENV_NAME} -c conda-forge python-kaleido==0.2.1
-conda install -y --name ${ENV_NAME} -c conda-forge imageio==2.25.0
-conda install -y --name ${ENV_NAME} -c conda-forge imutils==0.5.4
-conda install -y --name ${ENV_NAME} -c conda-forge scikit-image
-conda install -y --name ${ENV_NAME} -c conda-forge pint==0.20.1
-conda install -y --name ${ENV_NAME} -c conda-forge metpy
-conda install -y --name ${ENV_NAME} -c conda-forge cartopy==0.21.1
+mamba install -y --name ${ENV_NAME} -c conda-forge matplotlib==3.6.3
+mamba install -y --name ${ENV_NAME} -c conda-forge scipy==1.9.3
+mamba install -y --name ${ENV_NAME} -c conda-forge plotly==5.13.0
+mamba install -y --name ${ENV_NAME} -c conda-forge xarray==2023.1.0
+mamba install -y --name ${ENV_NAME} -c conda-forge netcdf4==1.6.2
+mamba install -y --name ${ENV_NAME} -c conda-forge pyyaml==6.0
+#mamba install -y --name ${ENV_NAME} -c conda-forge statsmodels #==0.13.2
+mamba install -y --name ${ENV_NAME} -c conda-forge python-kaleido==0.2.1
+mamba install -y --name ${ENV_NAME} -c conda-forge imageio==2.25.0
+mamba install -y --name ${ENV_NAME} -c conda-forge imutils==0.5.4
+mamba install -y --name ${ENV_NAME} -c conda-forge scikit-image
+mamba install -y --name ${ENV_NAME} -c conda-forge pint==0.20.1
+mamba install -y --name ${ENV_NAME} -c conda-forge metpy
+mamba install -y --name ${ENV_NAME} -c conda-forge cartopy==0.21.1
diff --git a/internal/scripts/docker_env/scripts/metplus_base_env.sh b/internal/scripts/docker_env/scripts/metplus_base_env.sh
index 7abb5111cd..3b100fa7ec 100755
--- a/internal/scripts/docker_env/scripts/metplus_base_env.sh
+++ b/internal/scripts/docker_env/scripts/metplus_base_env.sh
@@ -17,5 +17,5 @@ METPLUS_VERSION=$1
 # Conda environment to create
 ENV_NAME=metplus_base.${METPLUS_VERSION}
 
-conda create -y --name ${ENV_NAME} -c conda-forge python=3.10.4
-conda install -y --name ${ENV_NAME} -c conda-forge python-dateutil==2.8.2
+mamba create -y --name ${ENV_NAME} -c conda-forge python=3.10.4
+mamba install -y --name ${ENV_NAME} -c conda-forge python-dateutil==2.8.2
diff --git a/internal/scripts/docker_env/scripts/netcdf4_env.sh b/internal/scripts/docker_env/scripts/netcdf4_env.sh
index e7a1e990c8..043b25fc18 100755
--- a/internal/scripts/docker_env/scripts/netcdf4_env.sh
+++ b/internal/scripts/docker_env/scripts/netcdf4_env.sh
@@ -5,7 +5,7 @@
 # Last Updated: 2023-01-27 (mccabe@ucar.edu)
 # Notes: Adds NetCDF4 Python package
 # Python Packages:
-#   netcdf4==1.5.8
+#   netcdf4==1.6.2
 #
 # Other Content: None
 ################################################################################
@@ -19,5 +19,5 @@ ENV_NAME=netcdf4.${METPLUS_VERSION}
 # Conda environment to use as base for new environment
 BASE_ENV=metplus_base.${METPLUS_VERSION}
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
-conda install -y --name ${ENV_NAME} -c conda-forge netcdf4==1.5.8
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba install -y --name ${ENV_NAME} -c conda-forge netcdf4==1.6.2
diff --git a/internal/scripts/docker_env/scripts/pandac_env.sh b/internal/scripts/docker_env/scripts/pandac_env.sh
index a17cd2400b..05474b936e 100755
--- a/internal/scripts/docker_env/scripts/pandac_env.sh
+++ b/internal/scripts/docker_env/scripts/pandac_env.sh
@@ -23,20 +23,20 @@ ENV_NAME=pandac.${METPLUS_VERSION}
 BASE_ENV=metplotpy.${METPLUS_VERSION}
 
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
 
-#conda install -y --name ${ENV_NAME} -c conda-forge scipy==1.10.1
+#mamba install -y --name ${ENV_NAME} -c conda-forge scipy==1.10.1
 #if [ $? != 0 ]; then
 #    echo install of scipy==1.10.1 failed
 #    exit 1
 #fi
 
-conda install -y --name ${ENV_NAME} -c conda-forge pygrib==2.1.4
+mamba install -y --name ${ENV_NAME} -c conda-forge pygrib==2.1.4
 if [ $? != 0 ]; then
     echo install of pygrib==2.1.4 failed
     exit 1
 fi
-#conda install -y --name ${ENV_NAME} -c conda-forge matplotlib==3.6.3
+#mamba install -y --name ${ENV_NAME} -c conda-forge matplotlib==3.6.3
 #if [ $? != 0 ]; then
 #    echo install of matplotlib==3.6.3 failed
 #    exit 1
diff --git a/internal/scripts/docker_env/scripts/py_embed_base_env.sh b/internal/scripts/docker_env/scripts/py_embed_base_env.sh
index 8941336a99..1a59cd3b2d 100755
--- a/internal/scripts/docker_env/scripts/py_embed_base_env.sh
+++ b/internal/scripts/docker_env/scripts/py_embed_base_env.sh
@@ -7,7 +7,7 @@
 #   on a local machine to create the environment
 # Python Packages:
 #   xarray==2022.3.0
-#   netcdf4==1.5.8
+#   netcdf4==1.6.2
 #
 # Other Content: None
 ################################################################################
@@ -18,6 +18,6 @@ METPLUS_VERSION=$1
 # Conda environment to create
 ENV_NAME=py_embed_base.${METPLUS_VERSION}
 
-conda create -y --name ${ENV_NAME} -c conda-forge python=3.10.4
-conda install -y --name ${ENV_NAME} -c conda-forge xarray==2022.3.0
-conda install -y --name ${ENV_NAME} -c conda-forge netcdf4==1.5.8
+mamba create -y --name ${ENV_NAME} -c conda-forge python=3.10.4
+mamba install -y --name ${ENV_NAME} -c conda-forge xarray==2022.3.0
+mamba install -y --name ${ENV_NAME} -c conda-forge netcdf4==1.6.2
diff --git a/internal/scripts/docker_env/scripts/pygrib_env.sh b/internal/scripts/docker_env/scripts/pygrib_env.sh
index 181487b2e2..061ff2c951 100755
--- a/internal/scripts/docker_env/scripts/pygrib_env.sh
+++ b/internal/scripts/docker_env/scripts/pygrib_env.sh
@@ -21,7 +21,7 @@ ENV_NAME=pygrib.${METPLUS_VERSION}
 BASE_ENV=py_embed_base.${METPLUS_VERSION}
 
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
 
-conda install -y --name ${ENV_NAME} -c conda-forge pygrib==2.1.4
-conda install -y --name ${ENV_NAME} -c conda-forge metpy==1.3.0
+mamba install -y --name ${ENV_NAME} -c conda-forge pygrib==2.1.4
+mamba install -y --name ${ENV_NAME} -c conda-forge metpy==1.3.0
diff --git a/internal/scripts/docker_env/scripts/spacetime_env.sh b/internal/scripts/docker_env/scripts/spacetime_env.sh
index e444385944..d56c2c3221 100755
--- a/internal/scripts/docker_env/scripts/spacetime_env.sh
+++ b/internal/scripts/docker_env/scripts/spacetime_env.sh
@@ -21,11 +21,11 @@ METPLUS_VERSION=$1
 # Conda environment to create
 ENV_NAME=spacetime.${METPLUS_VERSION}
 
-conda create -y --name ${ENV_NAME} -c conda-forge python=3.10.4
+mamba create -y --name ${ENV_NAME} -c conda-forge python=3.10.4
 
-conda install -y --name ${ENV_NAME} -c conda-forge netCDF4==1.6.4
-conda install -y --name ${ENV_NAME} -c conda-forge xarray==2023.8.0
-conda install -y --name ${ENV_NAME} -c conda-forge scipy==1.11.2
-conda install -y --name ${ENV_NAME} -c conda-forge matplotlib==3.7.2
-conda install -y --name ${ENV_NAME} -c conda-forge pyngl==1.6.1
-conda install -y --name ${ENV_NAME} -c conda-forge pyyaml==6.0.1
+mamba install -y --name ${ENV_NAME} -c conda-forge netCDF4==1.6.4
+mamba install -y --name ${ENV_NAME} -c conda-forge xarray==2023.8.0
+mamba install -y --name ${ENV_NAME} -c conda-forge scipy==1.11.2
+mamba install -y --name ${ENV_NAME} -c conda-forge matplotlib==3.7.2
+mamba install -y --name ${ENV_NAME} -c conda-forge pyngl==1.6.1
+mamba install -y --name ${ENV_NAME} -c conda-forge pyyaml==6.0.1
diff --git a/internal/scripts/docker_env/scripts/swpc_metpy_env.sh b/internal/scripts/docker_env/scripts/swpc_metpy_env.sh
index 69dcbb506c..cd301e61a6 100755
--- a/internal/scripts/docker_env/scripts/swpc_metpy_env.sh
+++ b/internal/scripts/docker_env/scripts/swpc_metpy_env.sh
@@ -16,5 +16,5 @@ ENV_NAME=swpc_metpy.v5
 # Conda environment to use as base for new environment
 BASE_ENV=py_embed_base.v5
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
-conda install -y --name ${ENV_NAME} -c conda-forge metpy==1.4
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba install -y --name ${ENV_NAME} -c conda-forge metpy==1.4
diff --git a/internal/scripts/docker_env/scripts/weatherregime_env.sh b/internal/scripts/docker_env/scripts/weatherregime_env.sh
index 4ede520b2a..e00b92e411 100755
--- a/internal/scripts/docker_env/scripts/weatherregime_env.sh
+++ b/internal/scripts/docker_env/scripts/weatherregime_env.sh
@@ -24,7 +24,7 @@ ENV_NAME=weatherregime.${METPLUS_VERSION}
 BASE_ENV=metplotpy.${METPLUS_VERSION}
 
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
-conda install -y --name ${ENV_NAME} -c conda-forge scikit-learn==1.1.1
-conda install -y --name ${ENV_NAME} -c conda-forge eofs==1.4.0
-conda install -y --name ${ENV_NAME} -c conda-forge cmocean==2.0
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba install -y --name ${ENV_NAME} -c conda-forge scikit-learn==1.1.1
+mamba install -y --name ${ENV_NAME} -c conda-forge eofs==1.4.0
+mamba install -y --name ${ENV_NAME} -c conda-forge cmocean==2.0
diff --git a/internal/scripts/docker_env/scripts/xesmf_env.sh b/internal/scripts/docker_env/scripts/xesmf_env.sh
index 83e0c96a42..779e0c36ff 100755
--- a/internal/scripts/docker_env/scripts/xesmf_env.sh
+++ b/internal/scripts/docker_env/scripts/xesmf_env.sh
@@ -2,12 +2,16 @@
 
 ################################################################################
 # Environment: xesmf.v5.1
-# Last Updated: 2023-01-27 (mccabe@ucar.edu)
+# Last Updated: 2023-11-08 (mccabe@ucar.edu)
 # Notes: Adds Python package to read Tripolar grids
+#  Updated xesmf version from 0.3.0 because <0.7.1 does not work with mamba
+#  Downgrade esmf to 8.3.1 due to know bug described in this issue:
+#  https://github.com/pangeo-data/xESMF/issues/246
 # Python Packages:
-#   netcdf4==1.5.8
+#   netcdf4==1.6.2
 #   xarray==2022.3.0
-#   xesmf==0.3.0
+#   xesmf==0.8.2
+#   esmf==8.3.1
 #
 # Other Content: None
 ################################################################################
@@ -21,7 +25,9 @@ ENV_NAME=xesmf.${METPLUS_VERSION}
 # Conda environment to use as base for new environment
 BASE_ENV=metplus_base.${METPLUS_VERSION}
 
-conda create -y --clone ${BASE_ENV} --name ${ENV_NAME}
-conda install -y --name ${ENV_NAME} -c conda-forge netcdf4==1.5.8
-conda install -y --name ${ENV_NAME} -c conda-forge xarray==2022.3.0
-conda install -y --name ${ENV_NAME} -c conda-forge xesmf==0.3.0
+mamba create -y --clone ${BASE_ENV} --name ${ENV_NAME}
+mamba install -y --name ${ENV_NAME} -c conda-forge netcdf4==1.6.2
+mamba install -y --name ${ENV_NAME} -c conda-forge xarray==2022.3.0
+mamba install -y --name ${ENV_NAME} -c conda-forge xesmf==0.8.2
+mamba install -y --name ${ENV_NAME} -c conda-forge esmf==8.3.1
+
diff --git a/internal/tests/pytests/util/time_util/test_time_util.py b/internal/tests/pytests/util/time_util/test_time_util.py
index 242469c399..554391be08 100644
--- a/internal/tests/pytests/util/time_util/test_time_util.py
+++ b/internal/tests/pytests/util/time_util/test_time_util.py
@@ -213,3 +213,18 @@ def test_ti_calculate(input_dict, expected_time_info):
 @pytest.mark.util
 def test_ti_get_seconds_from_relativedelta(lead, valid_time, expected_val):
     assert time_util.ti_get_seconds_from_relativedelta(lead, valid_time) == expected_val
+
+@pytest.mark.parametrize(
+    'time_info, expected_result', [
+        ({}, False),
+        ({'init': datetime(2023, 1, 1), 'valid': datetime(2023, 1, 2), 'lead': relativedelta(days=1)}, True),
+        ({'init': '*', 'valid': datetime(2023, 1, 2), 'lead': relativedelta(days=1)}, False),
+        ({'init': datetime(2023, 1, 1), 'valid': '*', 'lead': relativedelta(days=1)}, False),
+        ({'init': datetime(2023, 1, 1), 'valid': datetime(2023, 1, 2), 'lead': '*'}, False),
+        ({'init': datetime(2023, 1, 1), 'lead': relativedelta(days=1)}, False),
+        ({'init': datetime(2023, 1, 1)}, False),
+    ]
+)
+@pytest.mark.util
+def test_is_single_run_time(time_info, expected_result):
+    assert time_util.is_single_run_time(time_info) == expected_result
diff --git a/internal/tests/pytests/wrappers/gen_vx_mask/test_gen_vx_mask.py b/internal/tests/pytests/wrappers/gen_vx_mask/test_gen_vx_mask.py
index d92a79c8ee..f4973a55b7 100644
--- a/internal/tests/pytests/wrappers/gen_vx_mask/test_gen_vx_mask.py
+++ b/internal/tests/pytests/wrappers/gen_vx_mask/test_gen_vx_mask.py
@@ -39,7 +39,7 @@ def test_run_gen_vx_mask_once(metplus_config):
 
     wrap.run_at_time_once(time_info)
 
-    expected_cmd = f"{wrap.app_path} 2018020100_ZENITH LAT {wrap.config.getdir('OUTPUT_BASE')}/GenVxMask_test/2018020100_ZENITH_LAT_MASK.nc -type lat -thresh 'ge30&&le50' -v 2"
+    expected_cmd = f"{wrap.app_path} \"2018020100_ZENITH\" LAT {wrap.config.getdir('OUTPUT_BASE')}/GenVxMask_test/2018020100_ZENITH_LAT_MASK.nc -type lat -thresh 'ge30&&le50' -v 2"
 
     for cmd, _ in wrap.all_commands:
         print(f"COMMAND:{cmd}")
@@ -64,8 +64,8 @@ def test_run_gen_vx_mask_twice(metplus_config):
 
     wrap.run_at_time_once(time_info)
 
-    expected_cmds = [f"{wrap.app_path} 2018020100_ZENITH LAT {wrap.config.getdir('OUTPUT_BASE')}/stage/gen_vx_mask/temp_0.nc {cmd_args[0]} -v 2",
-                     f"{wrap.app_path} {wrap.config.getdir('OUTPUT_BASE')}/stage/gen_vx_mask/temp_0.nc LON {wrap.config.getdir('OUTPUT_BASE')}/GenVxMask_test/2018020100_ZENITH_LAT_LON_MASK.nc {cmd_args[1]} -v 2"]
+    expected_cmds = [f"{wrap.app_path} \"2018020100_ZENITH\" LAT {wrap.config.getdir('OUTPUT_BASE')}/stage/gen_vx_mask/temp_0.nc {cmd_args[0]} -v 2",
+                     f"{wrap.app_path} \"{wrap.config.getdir('OUTPUT_BASE')}/stage/gen_vx_mask/temp_0.nc\" LON {wrap.config.getdir('OUTPUT_BASE')}/GenVxMask_test/2018020100_ZENITH_LAT_LON_MASK.nc {cmd_args[1]} -v 2"]
 
     test_passed = True
 
diff --git a/metplus/util/diff_util.py b/metplus/util/diff_util.py
index e2b0a2eddd..84e1c7cc0a 100755
--- a/metplus/util/diff_util.py
+++ b/metplus/util/diff_util.py
@@ -49,6 +49,7 @@
     'plots/fcst_elbow.png',
     'CyclonePlotter_fcstGFS_obsGFS_UserScript_ExtraTC/cyclone/20201007',
     'plots/MAKE_MAKI_timeseries',
+    'UserScript_fcstGFS_obsERA_WeatherRegime',
 ]
 
 
diff --git a/metplus/util/string_manip.py b/metplus/util/string_manip.py
index ee23b4fc9c..19342610cc 100644
--- a/metplus/util/string_manip.py
+++ b/metplus/util/string_manip.py
@@ -619,7 +619,7 @@ def log_terminal_includes_info(config):
     @returns True if log level is set to include INFO messages. False if not.
     """
     log_terminal_level = logging.getLevelName(
-        config.getstr('config', 'LOG_LEVEL_TERMINAL',
-                      config.getstr('runtime', 'LOG_LEVEL_TERMINAL'))
+        config.getstr_nocheck('config', 'LOG_LEVEL_TERMINAL',
+                              config.getstr('runtime', 'LOG_LEVEL_TERMINAL'))
     )
     return log_terminal_level <= logging.INFO
diff --git a/metplus/util/time_util.py b/metplus/util/time_util.py
index f1d8aa9abf..6dc305b4b6 100755
--- a/metplus/util/time_util.py
+++ b/metplus/util/time_util.py
@@ -531,3 +531,23 @@ def add_field_info_to_time_info(time_info, var_info):
             value = format_thresh(value)
 
         time_info[key] = value
+
+
+def is_single_run_time(time_info):
+    """!Determine if a specific run time (init or valid + lead) is being
+     processed or if a range of run times are being processed. If a wildcard
+     character is set for any of init/valid/lead or if any of them are unset,
+     then it is assumed that a range of these values are being processed.
+     This should be true if the runtime frequency is set to RUN_ONCE_FOR_EACH.
+
+     Note that even if a missing time value can be calculated, e.g. init and
+     lead can be used to compute valid, then this function will still return
+     False. Input to this function should be run through time_util.ti_calculate
+     first to compute the missing time values.
+
+    @param time_info dictionary containing time information to read
+    @returns True if init, valid, or lead has a wildcard character
+    """
+    return all(
+        [str(time_info.get(key, '*')) != '*' for key in ('init', 'valid', 'lead')]
+    )
diff --git a/metplus/wrappers/gen_vx_mask_wrapper.py b/metplus/wrappers/gen_vx_mask_wrapper.py
index 6f9018598d..8eb4a21ab3 100755
--- a/metplus/wrappers/gen_vx_mask_wrapper.py
+++ b/metplus/wrappers/gen_vx_mask_wrapper.py
@@ -14,7 +14,7 @@
 
 from ..util import getlist, get_lead_sequence, skip_time, ti_calculate, mkdir_p
 from . import LoopTimesWrapper
-from ..util import do_string_sub
+from ..util import do_string_sub, remove_quotes
 
 '''!@namespace GenVxMaskWrapper
 @brief Wraps the GenVxMask tool to reformat ascii format to NetCDF
@@ -201,7 +201,7 @@ def find_input_files(self, time_info, temp_file):
             return False
 
         # add input and mask file to input file list
-        self.infiles.append(input_path)
+        self.infiles.append(f'"{remove_quotes(input_path)}"')
         self.infiles.append(mask_file)
 
         return True
diff --git a/metplus/wrappers/series_analysis_wrapper.py b/metplus/wrappers/series_analysis_wrapper.py
index a16989416e..14c0c96df0 100755
--- a/metplus/wrappers/series_analysis_wrapper.py
+++ b/metplus/wrappers/series_analysis_wrapper.py
@@ -26,10 +26,9 @@
 from ..util import do_string_sub, parse_template, get_tags
 from ..util import get_lead_sequence, get_lead_sequence_groups
 from ..util import ti_get_hours_from_lead, ti_get_seconds_from_lead
-from ..util import ti_get_lead_string, ti_calculate
-from ..util import ti_get_seconds_from_relativedelta
+from ..util import ti_get_lead_string
 from ..util import parse_var_list
-from ..util import add_to_time_input
+from ..util import add_to_time_input, is_single_run_time
 from ..util import field_read_prob_info, add_field_info_to_time_info
 from .plot_data_plane_wrapper import PlotDataPlaneWrapper
 from . import RuntimeFreqWrapper
@@ -793,9 +792,11 @@ def build_and_run_series_request(self, time_info, fcst_path, obs_path):
             add_field_info_to_time_info(time_info, var_info)
 
             # get formatted field dictionary to pass into the MET config file
-            fcst_field, obs_field = self.get_formatted_fields(var_info,
-                                                              fcst_path,
-                                                              obs_path)
+            fcst_field, obs_field = (
+                self.get_formatted_fields(var_info, time_info, fcst_path, obs_path)
+            )
+            if fcst_field is None:
+                continue
 
             self.format_field('FCST', fcst_field)
             self.format_field('OBS', obs_field)
@@ -978,8 +979,11 @@ def get_fcst_file_info(self, fcst_path):
         num = str(len(files_of_interest))
 
         data_type = 'BOTH' if self.c_dict['USING_BOTH'] else 'FCST'
-        template = os.path.join(self.c_dict[f'{data_type}_INPUT_DIR'],
-                                self.c_dict[f'{data_type}_INPUT_TEMPLATE'])
+
+        # handle multiple templates
+        templates = []
+        for template in self.c_dict[f'{data_type}_INPUT_TEMPLATE'].split(','):
+            templates.append(os.path.join(self.c_dict[f'{data_type}_INPUT_DIR'], template.strip()))
 
         smallest_fcst = 99999999
         largest_fcst = -99999999
@@ -987,11 +991,16 @@ def get_fcst_file_info(self, fcst_path):
         end = None
         for filepath in files_of_interest:
             filepath = filepath.strip()
-            file_time_info = parse_template(template,
-                                            filepath,
-                                            self.logger)
-            if not file_time_info:
+            found = False
+            for template in templates:
+                file_time_info = parse_template(template, filepath, self.logger)
+                if file_time_info:
+                    found = True
+                    break
+
+            if not found:
                 continue
+
             lead = ti_get_seconds_from_lead(file_time_info.get('lead'),
                                             file_time_info.get('valid'))
             if lead < smallest_fcst:
@@ -1024,18 +1033,26 @@ def _get_netcdf_min_max(filepath, variable_name):
         except (FileNotFoundError, KeyError):
             return None, None
 
-    def get_formatted_fields(self, var_info, fcst_path, obs_path):
+    def get_formatted_fields(self, var_info, time_info, fcst_path, obs_path):
         """! Get forecast and observation field information for var_info and
             format it so it can be passed into the MET config file
 
             @param var_info dictionary containing info to format
+            @param time_info dictionary containing time information
+            @param fcst_path path to file list file for forecast data
+            @param obs_path path to file list file for observation data
             @returns tuple containing strings of the formatted forecast and
-            observation information or None, None if something went wrong
+            observation information or (None, None) if something went wrong
         """
-        fcst_field_list = self._get_field_list('fcst', var_info, obs_path)
-        obs_field_list = self._get_field_list('obs', var_info, fcst_path)
+        fcst_field_list = (
+            self._get_field_list('fcst', var_info, time_info, obs_path)
+        )
+        obs_field_list = (
+            self._get_field_list('obs', var_info, time_info, fcst_path)
+        )
 
         if not fcst_field_list or not obs_field_list:
+            self.log_error('Could not build formatted fcst and obs field lists')
             return None, None
 
         fcst_fields = ','.join(fcst_field_list)
@@ -1043,52 +1060,97 @@ def get_formatted_fields(self, var_info, fcst_path, obs_path):
 
         return fcst_fields, obs_fields
 
-    def _get_field_list(self, data_type, var_info, file_list_path):
+    def _get_field_list(self, data_type, var_info, time_info, file_list_path):
+        """!Get formatted field information in a list.
+        If no time (init/valid/lead) filename template tags were found in the
+        level value or if the time info contains all init/valid/lead values
+        (none are wildcards), then return a single formatted field item.
+        Otherwise, loop through the file list files and use the input template
+        to extract time information to use for each field entry.
+        The latter is done when processing one data type that has individual
+        files for each time and one data type has a single file with all times.
+
+        @param data_type type of data to process, e.g. fcst or obs
+        @param var_info dictionary containing info to format
+        @param time_info dictionary containing time information
+        @param file_list_path path to file list file to parse
+        @returns list containing formatted field info to pass to MET config
+        """
         other = 'OBS' if data_type == 'fcst' else 'FCST'
-        # check if time filename template tags are used in field level
-        if not self._has_time_tag(var_info[f'{data_type}_level']):
-            # get field info for a single field to pass to the MET config file
-            return self.get_field_info(
-                v_level=var_info[f'{data_type}_level'],
-                v_thresh=var_info[f'{data_type}_thresh'],
-                v_name=var_info[f'{data_type}_name'],
-                v_extra=var_info[f'{data_type}_extra'],
-                d_type=data_type.upper()
-            )
+        # if there are no time tags (init/valid/lead) in the field level
+        # or if init, valid, and lead have values in time_info,
+        # get field info for a single field to pass to the MET config file
+        if (not self._has_time_tag(var_info[f'{data_type}_level']) or
+                is_single_run_time(time_info)):
+            return self._get_field_sub_level(data_type, var_info, time_info)
 
         field_list = []
-        # loop through fcst and obs files to extract time info
-        template = os.path.join(self.c_dict[f'{other}_INPUT_DIR'],
-                                self.c_dict[f'{other}_INPUT_TEMPLATE'])
+
+        # handle multiple templates
+        templates = []
+        for template in self.c_dict[f'{other}_INPUT_TEMPLATE'].split(','):
+            templates.append(os.path.join(self.c_dict[f'{other}_INPUT_DIR'], template.strip()))
+
+        # loop through fcst/obs files to extract time info
         # for each file apply time info to field info and add to list
         for file_time_info in self._get_times_from_file_list(file_list_path,
-                                                             template):
-            level = do_string_sub(var_info[f'{data_type}_level'],
-                                  **file_time_info)
-            field = self.get_field_info(
-                v_level=level,
-                v_thresh=var_info[f'{data_type}_thresh'],
-                v_name=var_info[f'{data_type}_name'],
-                v_extra=var_info[f'{data_type}_extra'],
-                d_type=data_type.upper()
-            )
+                                                             templates):
+            field = self._get_field_sub_level(data_type, var_info, file_time_info)
             if field:
                 field_list.extend(field)
 
         return field_list
 
     @staticmethod
-    def _has_time_tag(level):
+    def _has_time_tag(string_to_parse):
+        """!Get all filename template tags from raw string and check if any of
+        the time info tags (init/valid/lead) were found.
+
+        @param string_to_parse string to search for filename template tags
+        @returns True if init, valid, or lead tags, e.g. {lead?fmt=%H},
+         were found in string. False if none of them were found.
+        """
         return any(item in ['init', 'valid', 'lead']
-                   for item in get_tags(level))
+                   for item in get_tags(string_to_parse))
+
+    def _get_field_sub_level(self, data_type, var_info, time_dict):
+        """!Get formatted field information for data type, substituting time
+        information into level value.
+
+        @param data_type type of data to find, e.g. fcst or obs
+        @param var_info dictionary containing info to format
+        @param time_dict dictionary containing time information
+        @returns string with formatted field info or None
+        """
+        level = do_string_sub(var_info[f'{data_type}_level'], **time_dict)
+        return self.get_field_info(
+            v_level=level,
+            v_thresh=var_info[f'{data_type}_thresh'],
+            v_name=var_info[f'{data_type}_name'],
+            v_extra=var_info[f'{data_type}_extra'],
+            d_type=data_type.upper()
+        )
 
     @staticmethod
-    def _get_times_from_file_list(file_path, template):
+    def _get_times_from_file_list(file_path, templates):
+        """!Generator that yields time info dictionaries.
+        Loops through file paths found in text file and use list of filename
+        templates to parse time information from each file.
+
+        @param file_path path to file list file to parse
+        @param templates list of filename templates to use to parse time info
+        out of file paths found in file_path file
+        """
         with open(file_path, 'r') as file_handle:
             file_list = file_handle.read().splitlines()[1:]
 
         for file_name in file_list:
-            file_time_info = parse_template(template, file_name)
-            if not file_time_info:
+            found = False
+            for template in templates:
+                file_time_info = parse_template(template, file_name)
+                if file_time_info:
+                    found = True
+                    break
+            if not found:
                 continue
             yield file_time_info
diff --git a/parm/met_config/EnsembleStatConfig_wrapped b/parm/met_config/EnsembleStatConfig_wrapped
index b0cbe84f33..cbbbce57dd 100644
--- a/parm/met_config/EnsembleStatConfig_wrapped
+++ b/parm/met_config/EnsembleStatConfig_wrapped
@@ -1,4 +1,4 @@
-////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 //
 // Ensemble-Stat configuration file.
 //
@@ -86,9 +86,10 @@ obs = {
 // May be set separately in each "obs.field" entry
 //
 
+//message_type =
 ${METPLUS_MESSAGE_TYPE}
 sid_exc        = [];
-//obs_thresh     = [ NA ];
+//obs_thresh     =
 ${METPLUS_OBS_THRESH}
 
 //obs_quality_inc =
@@ -97,9 +98,11 @@ ${METPLUS_OBS_QUALITY_INC}
 //obs_quality_exc =
 ${METPLUS_OBS_QUALITY_EXC}
 
+//duplicate_flag =
 ${METPLUS_DUPLICATE_FLAG}
 obs_summary    = NONE;
 obs_perc_value = 50;
+//skip_const =
 ${METPLUS_SKIP_CONST}
 
 //
@@ -108,6 +111,7 @@ ${METPLUS_SKIP_CONST}
 // May be set separately in each "obs.field" entry
 //
 obs_error = {
+   //flag =
    ${METPLUS_OBS_ERROR_FLAG}
    dist_type        = NONE;
    dist_parm        = [];
@@ -131,7 +135,9 @@ message_type_group_map = [
 // Ensemble bin sizes
 // May be set separately in each "obs.field" entry
 //
+//ens_ssvar_bin_size =
 ${METPLUS_ENS_SSVAR_BIN_SIZE}
+//ens_phist_bin_size =
 ${METPLUS_ENS_PHIST_BIN_SIZE}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -151,6 +157,7 @@ ${METPLUS_CLIMO_STDEV_DICT}
 //
 // May be set separately in each "obs.field" entry
 //
+//climo_cdf = {
 ${METPLUS_CLIMO_CDF_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -158,6 +165,7 @@ ${METPLUS_CLIMO_CDF_DICT}
 //
 // Point observation time window
 //
+//obs_window = {
 ${METPLUS_OBS_WINDOW_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -166,7 +174,9 @@ ${METPLUS_OBS_WINDOW_DICT}
 // Verification masking regions
 //
 mask = {
+   //grid =
    ${METPLUS_MASK_GRID}
+   //poly =
    ${METPLUS_MASK_POLY}
    sid   = [];
    llpnt = [];
@@ -177,6 +187,7 @@ mask = {
 //
 // Confidence interval settings
 //
+//ci_alpha =
 ${METPLUS_CI_ALPHA}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -184,6 +195,7 @@ ${METPLUS_CI_ALPHA}
 //
 // Interpolation methods
 //
+//interp = {
 ${METPLUS_INTERP_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -191,6 +203,7 @@ ${METPLUS_INTERP_DICT}
 //
 // Statistical output types
 //
+//output_flag = {
 ${METPLUS_OUTPUT_FLAG_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -199,6 +212,7 @@ ${METPLUS_OUTPUT_FLAG_DICT}
 // Gridded verification output types
 // May be set separately in each "obs.field" entry
 //
+//nc_orank_flag = {
 ${METPLUS_NC_ORANK_FLAG_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -215,7 +229,7 @@ rng = {
 
 //grid_weight_flag =
 ${METPLUS_GRID_WEIGHT_FLAG}
-
+//output_prefix =
 ${METPLUS_OUTPUT_PREFIX}
 //version          = "V9.0";
 
diff --git a/parm/met_config/GridDiagConfig_wrapped b/parm/met_config/GridDiagConfig_wrapped
index 06b95662bf..691338acf2 100644
--- a/parm/met_config/GridDiagConfig_wrapped
+++ b/parm/met_config/GridDiagConfig_wrapped
@@ -9,6 +9,7 @@
 //
 // Description
 //
+//desc =
 ${METPLUS_DESC}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -16,6 +17,7 @@ ${METPLUS_DESC}
 //
 // Output grid
 //
+//regrid = {
 ${METPLUS_REGRID_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -23,14 +25,18 @@ ${METPLUS_REGRID_DICT}
 //
 // May be set separately in each "field" entry
 //
+//censor_thresh =
 ${METPLUS_CENSOR_THRESH}
+//censor_val =
 ${METPLUS_CENSOR_VAL}
 
 //
 // Data fields
 //
+//data = {
 ${METPLUS_DATA_DICT}
 
+//mask = {
 ${METPLUS_MASK_DICT}
 
 tmp_dir = "${MET_TMP_DIR}";
diff --git a/parm/met_config/MODEConfig_wrapped b/parm/met_config/MODEConfig_wrapped
index 536cebc320..ff1ac480f9 100644
--- a/parm/met_config/MODEConfig_wrapped
+++ b/parm/met_config/MODEConfig_wrapped
@@ -61,34 +61,56 @@ ${METPLUS_MULTIVAR_INTENSITY_FLAG}
 // Forecast and observation fields to be verified
 //
 fcst = {
+   //field = {
    ${METPLUS_FCST_FIELD}
 
+   //censor_thresh      = [
    ${METPLUS_FCST_CENSOR_THRESH}
+   //censor_val         = [
    ${METPLUS_FCST_CENSOR_VAL}
+   //conv_radius        =
    ${METPLUS_FCST_CONV_RADIUS}
+   //conv_thresh        =
    ${METPLUS_FCST_CONV_THRESH}
+   //vld_thresh         =
    ${METPLUS_FCST_VLD_THRESH}
+   //filter_attr_name   = [
    ${METPLUS_FCST_FILTER_ATTR_NAME}
+   //filter_attr_thresh = [
    ${METPLUS_FCST_FILTER_ATTR_THRESH}
+   //merge_thresh       =
    ${METPLUS_FCST_MERGE_THRESH}
+   //merge_flag         =
    ${METPLUS_FCST_MERGE_FLAG}
+
    ${METPLUS_FCST_FILE_TYPE}
    ${METPLUS_FCST_MULTIVAR_NAME}
    ${METPLUS_FCST_MULTIVAR_LEVEL}
 }
 
 obs = {
+   //field = {
    ${METPLUS_OBS_FIELD}
 
+   //censor_thresh      = [
    ${METPLUS_OBS_CENSOR_THRESH}
+   //censor_val         = [
    ${METPLUS_OBS_CENSOR_VAL}
+   //conv_radius        =
    ${METPLUS_OBS_CONV_RADIUS}
+   //conv_thresh        =
    ${METPLUS_OBS_CONV_THRESH}
+   //vld_thresh         =
    ${METPLUS_OBS_VLD_THRESH}
+   //filter_attr_name   = [
    ${METPLUS_OBS_FILTER_ATTR_NAME}
+   //filter_attr_thresh = [
    ${METPLUS_OBS_FILTER_ATTR_THRESH}
+   //merge_thresh       =
    ${METPLUS_OBS_MERGE_THRESH}
+   //merge_flag         =
    ${METPLUS_OBS_MERGE_FLAG}
+
    ${METPLUS_OBS_FILE_TYPE}
    ${METPLUS_OBS_MULTIVAR_NAME}
    ${METPLUS_OBS_MULTIVAR_LEVEL}
@@ -137,10 +159,13 @@ ${METPLUS_WEIGHT_DICT}
 //
 interest_function = {
 
+   //centroid_dist = (
    ${METPLUS_INTEREST_FUNCTION_CENTROID_DIST}
 
+   //boundary_dist = (
    ${METPLUS_INTEREST_FUNCTION_BOUNDARY_DIST}
 
+   //convex_hull_dist = (
    ${METPLUS_INTEREST_FUNCTION_CONVEX_HULL_DIST}
 
    angle_diff = (
diff --git a/parm/met_config/MTDConfig_wrapped b/parm/met_config/MTDConfig_wrapped
index f8310334a2..d521670eac 100644
--- a/parm/met_config/MTDConfig_wrapped
+++ b/parm/met_config/MTDConfig_wrapped
@@ -10,18 +10,21 @@
    // Output model name to be written
    //
 
+//model =
 ${METPLUS_MODEL}
 
    //
    // Output description to be written
    //
 
+//desc =
 ${METPLUS_DESC}
 
    //
    // Output observation type to be written
    //
 
+//obtype =
 ${METPLUS_OBTYPE}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -30,6 +33,8 @@ ${METPLUS_OBTYPE}
    //  Verification grid
    //  May be set separately in each "field" entry
    //
+
+//regrid = {
 ${METPLUS_REGRID_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -50,12 +55,15 @@ fcst = {
 
    ${METPLUS_FCST_FILE_TYPE}
 
+   //field = {
    ${METPLUS_FCST_FIELD}
 
    censor_thresh     = [];
    censor_val        = [];
    conv_time_window  = { beg = -1; end = 1; };
+   //conv_radius       =
    ${METPLUS_FCST_CONV_RADIUS}
+   //conv_thresh       =
    ${METPLUS_FCST_CONV_THRESH}
 
 }
@@ -64,12 +72,15 @@ obs = {
 
    ${METPLUS_OBS_FILE_TYPE}
 
+   //field = {
    ${METPLUS_OBS_FIELD}
 
    censor_thresh     = [];
    censor_val        = [];
    conv_time_window  = { beg = -1; end = 1; };
+   //conv_radius       =
    ${METPLUS_OBS_CONV_RADIUS}
+   //conv_thresh       =
    ${METPLUS_OBS_CONV_THRESH}
 }
 
@@ -86,6 +97,8 @@ inten_perc_value = 99;
    //
    //  Throw away 3D objects with volumes smaller than this
    //
+
+//min_volume =
 ${METPLUS_MIN_VOLUME}
 
 
@@ -236,6 +249,7 @@ txt_output = {
 
 ////////////////////////////////////////////////////////////////////////////////
 
+//output_prefix =
 ${METPLUS_OUTPUT_PREFIX}
 //version        = "V9.0";
 
diff --git a/parm/met_config/PB2NCConfig_wrapped b/parm/met_config/PB2NCConfig_wrapped
index 853cb069ad..8b9057923b 100644
--- a/parm/met_config/PB2NCConfig_wrapped
+++ b/parm/met_config/PB2NCConfig_wrapped
@@ -9,6 +9,7 @@
 //
 // PrepBufr message type
 //
+//message_type = [
 ${METPLUS_MESSAGE_TYPE}
 
 //
@@ -30,6 +31,7 @@ message_type_map = [];
 //
 // PrepBufr station ID
 //
+//station_id = [
 ${METPLUS_STATION_ID}
 
 
@@ -38,6 +40,7 @@ ${METPLUS_STATION_ID}
 //
 // Observation time window
 //
+//obs_window = {
 ${METPLUS_OBS_WINDOW_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -45,6 +48,7 @@ ${METPLUS_OBS_WINDOW_DICT}
 //
 // Observation retention regions
 //
+//mask = {
 ${METPLUS_MASK_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -86,6 +90,7 @@ ${METPLUS_LEVEL_CATEGORY}
 // BUFR variable names to retain or derive.
 // If emtpy, process all available variables.
 //
+//obs_bufr_var = [
 ${METPLUS_OBS_BUFR_VAR}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -113,6 +118,7 @@ event_stack_flag    = TOP;
 //
 // Time periods for the summarization
 //
+//time_summary = {
 ${METPLUS_TIME_SUMMARY_DICT}
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/parm/met_config/PointStatConfig_wrapped b/parm/met_config/PointStatConfig_wrapped
index fb9fe5e906..fdba7135f6 100644
--- a/parm/met_config/PointStatConfig_wrapped
+++ b/parm/met_config/PointStatConfig_wrapped
@@ -49,11 +49,13 @@ rank_corr_flag = FALSE;
 //
 fcst = {
   ${METPLUS_FCST_FILE_TYPE}
+  //field = [
   ${METPLUS_FCST_FIELD}
 }
 
 obs = {
   ${METPLUS_OBS_FILE_TYPE}
+  //field = [
   ${METPLUS_OBS_FIELD}
 }
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/parm/met_config/STATAnalysisConfig_wrapped b/parm/met_config/STATAnalysisConfig_wrapped
index f317e2aa99..d38c8def2d 100644
--- a/parm/met_config/STATAnalysisConfig_wrapped
+++ b/parm/met_config/STATAnalysisConfig_wrapped
@@ -9,51 +9,108 @@
 //
 // Filtering input STAT lines by the contents of each column
 //
+//model = [
 ${METPLUS_MODEL}
+
+//desc  = [
 ${METPLUS_DESC}
 
+//fcst_lead = [
 ${METPLUS_FCST_LEAD}
+
+//obs_lead  = [
 ${METPLUS_OBS_LEAD}
 
+//fcst_valid_beg  =
 ${METPLUS_FCST_VALID_BEG}
+
+//fcst_valid_end  =
 ${METPLUS_FCST_VALID_END}
+
+fcst_valid_inc  = [];
+fcst_valid_exc  = [];
+
+//fcst_valid_hour = [
 ${METPLUS_FCST_VALID_HOUR}
 
+
+//obs_valid_beg   =
 ${METPLUS_OBS_VALID_BEG}
+
+//obs_valid_end   =
 ${METPLUS_OBS_VALID_END}
+
+obs_valid_inc   = [];
+obs_valid_exc   = [];
+
+//obs_valid_hour  = [
 ${METPLUS_OBS_VALID_HOUR}
 
+
+//fcst_init_beg   =
 ${METPLUS_FCST_INIT_BEG}
+
+//fcst_init_end   =
 ${METPLUS_FCST_INIT_END}
+
+fcst_init_inc   = [];
+fcst_init_exc   = [];
+
+//fcst_init_hour  = [
 ${METPLUS_FCST_INIT_HOUR}
 
+
+//obs_init_beg    =
 ${METPLUS_OBS_INIT_BEG}
+
+//obs_init_end    =
 ${METPLUS_OBS_INIT_END}
+
+obs_init_inc    = [];
+obs_init_exc    = [];
+
+//obs_init_hour   = [
 ${METPLUS_OBS_INIT_HOUR}
 
+
+//fcst_var = [
 ${METPLUS_FCST_VAR}
+//obs_var  = [
 ${METPLUS_OBS_VAR}
 
+//fcst_units = [
 ${METPLUS_FCST_UNITS}
+//obs_units  = [
 ${METPLUS_OBS_UNITS}
 
+//fcst_lev = [
 ${METPLUS_FCST_LEVEL}
+//obs_lev  = [
 ${METPLUS_OBS_LEVEL}
 
+//obtype = [
 ${METPLUS_OBTYPE}
 
+//vx_mask = [
 ${METPLUS_VX_MASK}
 
+//interp_mthd = [
 ${METPLUS_INTERP_MTHD}
 
+//interp_pnts = [
 ${METPLUS_INTERP_PNTS}
 
+//fcst_thresh = [
 ${METPLUS_FCST_THRESH}
+//obs_thresh = [
 ${METPLUS_OBS_THRESH}
+//cov_thresh = [
 ${METPLUS_COV_THRESH}
 
+//alpha = [
 ${METPLUS_ALPHA}
 
+//line_type = [
 ${METPLUS_LINE_TYPE}
 
 column = [];
@@ -65,6 +122,7 @@ weight = [];
 //
 // Array of STAT-Analysis jobs to be performed on the filtered data
 //
+//jobs = [
 ${METPLUS_JOBS}
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/parm/met_config/SeriesAnalysisConfig_wrapped b/parm/met_config/SeriesAnalysisConfig_wrapped
index c0c1175d24..a7ccba88b0 100644
--- a/parm/met_config/SeriesAnalysisConfig_wrapped
+++ b/parm/met_config/SeriesAnalysisConfig_wrapped
@@ -48,11 +48,13 @@ cnt_logic     = UNION;
 fcst = {
    ${METPLUS_FCST_FILE_TYPE}
    ${METPLUS_FCST_CAT_THRESH}
+   //field = [
    ${METPLUS_FCST_FIELD}
 }
 obs = {
    ${METPLUS_OBS_FILE_TYPE}
    ${METPLUS_OBS_CAT_THRESH}
+   //field = [
    ${METPLUS_OBS_FIELD}
 }
 
diff --git a/parm/met_config/TCPairsConfig_wrapped b/parm/met_config/TCPairsConfig_wrapped
index 0a538a2007..93947c0c18 100644
--- a/parm/met_config/TCPairsConfig_wrapped
+++ b/parm/met_config/TCPairsConfig_wrapped
@@ -12,57 +12,66 @@
 //
 // Models
 //
+//model = [
 ${METPLUS_MODEL}
 
 //
 // Description
 //
+//desc =
 ${METPLUS_DESC}
 
 //
 // Storm identifiers
 //
+//storm_id = [
 ${METPLUS_STORM_ID}
 
 //
 // Basins
 //
+//basin = [
 ${METPLUS_BASIN}
 
 //
 // Cyclone numbers
 //
+//cyclone = [
 ${METPLUS_CYCLONE}
 
 //
 // Storm names
 //
+//storm_name = [
 ${METPLUS_STORM_NAME}
 
 //
 // Model initialization time windows to include or exclude
 //
+//init_beg =
 ${METPLUS_INIT_BEG}
+//init_end =
 ${METPLUS_INIT_END}
-// init_inc =
+// init_inc = [
 ${METPLUS_INIT_INC}
-// init_exc =
+// init_exc = [
 ${METPLUS_INIT_EXC}
 
-// valid_inc =
+//
+// Valid model time windows to include or exclude
+//
+//valid_beg =
+${METPLUS_VALID_BEG}
+//valid_end =
+${METPLUS_VALID_END}
+// valid_inc = [
 ${METPLUS_VALID_INC}
-// valid_exc =
+// valid_exc = [
 ${METPLUS_VALID_EXC}
 
 // write_valid =
 ${METPLUS_WRITE_VALID}
 
-//
-// Valid model time window
-//
-${METPLUS_VALID_BEG}
-${METPLUS_VALID_END}
-
 //
 // Model initialization hours
 //
@@ -131,6 +140,7 @@ ${METPLUS_MATCH_POINTS}
 // Specify the NetCDF output of the gen_dland tool containing a gridded
 // representation of the minimum distance to land.
 //
+//dland_file =
 ${METPLUS_DLAND_FILE}
 
 //
diff --git a/parm/met_config/TCRMWConfig_wrapped b/parm/met_config/TCRMWConfig_wrapped
index 66dbc2cdf8..49a8b0bdab 100644
--- a/parm/met_config/TCRMWConfig_wrapped
+++ b/parm/met_config/TCRMWConfig_wrapped
@@ -11,19 +11,33 @@
 // and empty string, which will cause MET to use the value defined in the
 // default configuration file.
 
+//model =
 ${METPLUS_MODEL}
 
+//storm_id =
 ${METPLUS_STORM_ID}
+
+//basin =
 ${METPLUS_BASIN}
+
+//cyclone =
 ${METPLUS_CYCLONE}
+
+//init_inc =
 ${METPLUS_INIT_INCLUDE}
 
+//valid_beg =
 ${METPLUS_VALID_BEG}
+//valid_end =
 ${METPLUS_VALID_END}
+//valid_inc = [
 ${METPLUS_VALID_INCLUDE_LIST}
+//valid_exc = [
 ${METPLUS_VALID_EXCLUDE_LIST}
 
+//valid_hour = [
 ${METPLUS_VALID_HOUR_LIST}
+//lead = [
 ${METPLUS_LEAD_LIST}
 
 //
@@ -38,6 +52,7 @@ censor_val    = [];
 data = {
    ${METPLUS_DATA_FILE_TYPE}
 
+   //field = [
    ${METPLUS_DATA_FIELD}
 }
 
@@ -46,6 +61,7 @@ data = {
 //
 // Regridding options
 //
+//regrid = {
 ${METPLUS_REGRID_DICT}
 
 //
@@ -56,10 +72,15 @@ ${METPLUS_REGRID_DICT}
 // and empty string, which will cause MET to use the value defined in the
 // default configuration file.
 
+//n_range        =
 ${METPLUS_N_RANGE}
+//n_azimuth      =
 ${METPLUS_N_AZIMUTH}
+//max_range_km   =
 ${METPLUS_MAX_RANGE_KM}
+//delta_range_km =
 ${METPLUS_DELTA_RANGE_KM}
+//rmw_scale      =
 ${METPLUS_RMW_SCALE}
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/parm/met_config/TCStatConfig_wrapped b/parm/met_config/TCStatConfig_wrapped
index 916a15fed8..dc4d5ec780 100644
--- a/parm/met_config/TCStatConfig_wrapped
+++ b/parm/met_config/TCStatConfig_wrapped
@@ -18,35 +18,42 @@
 //
 // Stratify by the AMODEL or BMODEL columns.
 //
+//amodel = [
 ${METPLUS_AMODEL}
+//bmodel = [
 ${METPLUS_BMODEL}
 
 //
 // Stratify by the DESC column.
 //
+//desc = [
 ${METPLUS_DESC}
 
 //
 // Stratify by the STORM_ID column.
 //
+//storm_id = [
 ${METPLUS_STORM_ID}
 
 //
 // Stratify by the BASIN column.
 // May add using the "-basin" job command option.
 //
+//basin = [
 ${METPLUS_BASIN}
 
 //
 // Stratify by the CYCLONE column.
 // May add using the "-cyclone" job command option.
 //
+//cyclone = [
 ${METPLUS_CYCLONE}
 
 //
 // Stratify by the STORM_NAME column.
 // May add using the "-storm_name" job command option.
 //
+//storm_name = [
 ${METPLUS_STORM_NAME}
 
 //
@@ -55,35 +62,49 @@ ${METPLUS_STORM_NAME}
 // May modify using the "-init_beg", "-init_end", "-init_inc",
 // and "-init_exc" job command options.
 //
+//init_beg =
 ${METPLUS_INIT_BEG}
+//init_end =
 ${METPLUS_INIT_END}
+//init_inc = [
 ${METPLUS_INIT_INC}
+//init_exc = [
 ${METPLUS_INIT_EXC}
 
 //
 // Stratify by the VALID times.
 //
+//valid_beg =
 ${METPLUS_VALID_BEG}
+//valid_end =
 ${METPLUS_VALID_END}
+//valid_inc = [
 ${METPLUS_VALID_INC}
+//valid_exc = [
 ${METPLUS_VALID_EXC}
 
 //
 // Stratify by the initialization and valid hours and lead time.
 //
+//init_hour = [
 ${METPLUS_INIT_HOUR}
+//valid_hour = [
 ${METPLUS_VALID_HOUR}
+//lead = [
 ${METPLUS_LEAD}
 
 //
 // Select tracks which contain all required lead times.
 //
+//lead_req = [
 ${METPLUS_LEAD_REQ}
 
 //
 // Stratify by the INIT_MASK and VALID_MASK columns.
 //
+//init_mask = [
 ${METPLUS_INIT_MASK}
+//valid_mask = [
 ${METPLUS_VALID_MASK}
 
 
@@ -99,18 +120,23 @@ ${METPLUS_LINE_TYPE}
 // common to both the ADECK and BDECK tracks.  If the watch/warning status
 // of any of the track points appears in the list, retain the entire track.
 //
+//track_watch_warn = [
 ${METPLUS_TRACK_WATCH_WARN}
 
 //
 // Stratify by applying thresholds to numeric data columns.
 //
+//column_thresh_name = [
 ${METPLUS_COLUMN_THRESH_NAME}
+//column_thresh_val = [
 ${METPLUS_COLUMN_THRESH_VAL}
 
 //
 // Stratify by performing string matching on non-numeric data columns.
 //
+//column_str_name = [
 ${METPLUS_COLUMN_STR_NAME}
+//column_str_val = [
 ${METPLUS_COLUMN_STR_VAL}
 
 //
@@ -125,13 +151,17 @@ ${METPLUS_COLUMN_STR_EXC_VAL}
 //
 // Similar to the column_thresh options above
 //
+//init_thresh_name = [
 ${METPLUS_INIT_THRESH_NAME}
+//init_thresh_val = [
 ${METPLUS_INIT_THRESH_VAL}
 
 //
 // Similar to the column_str options above
 //
+//init_str_name = [
 ${METPLUS_INIT_STR_NAME}
+//init_str_val = [
 ${METPLUS_INIT_STR_VAL}
 
 //
@@ -159,6 +189,7 @@ ${METPLUS_INIT_DIAG_THRESH_VAL}
 //
 // Stratify by the ADECK and BDECK distances to land.
 //
+//water_only =
 ${METPLUS_WATER_ONLY}
 
 //
@@ -166,8 +197,11 @@ ${METPLUS_WATER_ONLY}
 // retained, and define the landfall retention window in HH[MMSS] format
 // around the landfall time.
 //
+//landfall =
 ${METPLUS_LANDFALL}
+//landfall_beg =
 ${METPLUS_LANDFALL_BEG}
+//landfall_end =
 ${METPLUS_LANDFALL_END}
 
 //
@@ -175,6 +209,7 @@ ${METPLUS_LANDFALL_END}
 // tracks should be retained.  May modify using the "-match_points" job command
 // option.
 //
+//match_points =
 ${METPLUS_MATCH_POINTS}
 
 //event_equal =
@@ -193,6 +228,7 @@ ${METPLUS_OUT_VALID_MASK}
 //
 // Array of TCStat analysis jobs to be performed on the filtered data
 //
+//jobs = [
 ${METPLUS_JOBS}
 
 tmp_dir = "${MET_TMP_DIR}";