diff --git a/config_src/mct_driver/mom_surface_forcing_mct.F90 b/config_src/mct_driver/mom_surface_forcing_mct.F90
index d43f9f064b..2bed34580e 100644
--- a/config_src/mct_driver/mom_surface_forcing_mct.F90
+++ b/config_src/mct_driver/mom_surface_forcing_mct.F90
@@ -145,8 +145,8 @@ module MOM_surface_forcing_mct
 !> Structure corresponding to forcing, but with the elements, units, and conventions
 !! that exactly conform to the use for MOM-based coupled models.
 type, public :: ice_ocean_boundary_type
-  real, pointer, dimension(:,:) :: rofl_flux         =>NULL() !< liquid runoff [W/m2]
-  real, pointer, dimension(:,:) :: rofi_flux         =>NULL() !< ice runoff [W/m2]
+  real, pointer, dimension(:,:) :: rofl_flux         =>NULL() !< liquid runoff [kg/m2/s]
+  real, pointer, dimension(:,:) :: rofi_flux         =>NULL() !< ice runoff [kg/m2/s]
   real, pointer, dimension(:,:) :: u_flux            =>NULL() !< i-direction wind stress [Pa]
   real, pointer, dimension(:,:) :: v_flux            =>NULL() !< j-direction wind stress [Pa]
   real, pointer, dimension(:,:) :: t_flux            =>NULL() !< sensible heat flux [W/m2]
diff --git a/config_src/nuopc_driver/mom_cap.F90 b/config_src/nuopc_driver/mom_cap.F90
index e99a1a0a22..cbbefd6afd 100644
--- a/config_src/nuopc_driver/mom_cap.F90
+++ b/config_src/nuopc_driver/mom_cap.F90
@@ -2325,13 +2325,12 @@ end subroutine shr_file_getLogUnit
 #endif
 
 !>
-!! @subpage MOM NUOPC Cap
+!! @page nuopc_cap NUOPC Cap
 !! @author Fei Liu (fei.liu@gmail.com)
 !! @date 5/10/13 Original documentation
 !! @author Rocky Dunlap (rocky.dunlap@noaa.gov)
 !! @date 1/12/17 Moved to doxygen
 !! @date 2/28/19 Rewrote for unified cap
-!!
 !! @tableofcontents
 !!
 !! @section Overview Overview
@@ -2384,17 +2383,30 @@ end subroutine shr_file_getLogUnit
 !! MOM cap.  The "Phase" column says whether the subroutine is called during the
 !! initialization, run, or finalize part of the coupled system run.
 !!
-!! Phase    | MOM Cap Subroutine                                                 |  Description
-!! ---------|--------------------------------------------------------------------|--------------------------------------
-!! Init     | [InitializeP0] (@ref MOM_cap_mod::initializep0)                    | Sets the Initialize Phase Definition
-!!                                                                               |  (IPD) version to use
-!! Init     | [InitializeAdvertise] (@ref MOM_cap_mod::initializeadvertise)      | Advertises standard names of import
-!!                                                                               |  and export fields
-!! Init     | [InitializeRealize] (@ref MOM_cap_mod::initializerealize)          | Creates an ESMF_Grid or ESMF_Mesh
-!!                                                                               |  as well as ESMF_Fields for import
-!!                                                                               |  and export fields
-!! Run      | [ModelAdvance] (@ref MOM_cap_mod::modeladvance)                    | Advances the model by a timestep
-!! Final    | [Finalize] (@ref MOM_cap_mod::ocean_model_finalize)                | Cleans up
+!!<table>
+!!<tr><th> Phase  <th> MOM Cap Subroutine  <th> Description
+!!<tr>
+!!  <td> Init
+!!  <td> [InitializeP0] (@ref MOM_cap_mod::initializep0)
+!!  <td> Sets the Initialize Phase Definition (IPD) version to use
+!!<tr>
+!!  <td> Init
+!!  <td> [InitializeAdvertise] (@ref MOM_cap_mod::initializeadvertise)
+!!  <td> Advertises standard names of import and export fields
+!!<tr>
+!!  <td> Init
+!!  <td> [InitializeRealize] (@ref MOM_cap_mod::initializerealize)
+!!  <td> Creates an ESMF_Grid or ESMF_Mesh as well as ESMF_Fields for import and export fields
+!!<tr>
+!!  <td> Run
+!!  <td> [ModelAdvance] (@ref MOM_cap_mod::modeladvance)
+!!  <td> Advances the model by a timestep
+!!<tr>
+!!  <td> Final
+!!  <td> [Finalize] (@ref MOM_cap_mod::ocean_model_finalize)
+!!  <td> Cleans up
+!!</table>
+!!
 !!
 !! @section UnderlyingModelInterfaces Underlying Model Interfaces
 !!
@@ -2527,152 +2539,152 @@ end subroutine shr_file_getLogUnit
 !! @subsection ImportFields Import Fields
 !!
 !! <table>
-!!     <thead>
-!!         <tr>
-!!             <th>Standard Name</th>
-!!             <th>Units</th>
-!!             <th>Model Variable</th>
-!!             <th>Description</th>
-!!             <th>Notes</th>
-!!         </tr>
-!!     </thead>
-!!     <tbody>
-!!         <tr>
-!!             <td>inst_pres_height_surface</td>
-!!             <td>Pa</td>
-!!             <td>p</td>
-!!             <td>pressure of overlying sea ice and atmosphere</td>
-!!         </tr>
-!!         <tr>
-!!             <td>mass_of_overlying_sea_ice</td>
-!!             <td>kg</td>
-!!             <td>mi</td>
-!!             <td>mass of overlying sea ice</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>seaice_melt_heat</td>
-!!             <td>W m-2</td>
-!!             <td>seaice_melt_heat</td>
-!!             <td>sea ice and snow melt heat flux</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>seaice_melt</td>
-!!             <td>kg m-2 s-1</td>
-!!             <td>seaice_melt</td>
-!!             <td>water flux due to sea ice and snow melting</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_calving_heat_flx</td>
-!!             <td>W m-2</td>
-!!             <td>calving_hflx</td>
-!!             <td>heat flux, relative to 0C, of frozen land water into ocean</td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_calving_rate</td>
-!!             <td>kg m-2 s-1</td>
-!!             <td>calving</td>
-!!             <td>mass flux of frozen runoff</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_evap_rate</td>
-!!             <td>kg m-2 s-1</td>
-!!             <td>q_flux</td>
-!!             <td>specific humidity flux</td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_fprec_rate</td>
-!!             <td>kg m-2 s-1</td>
-!!             <td>fprec</td>
-!!             <td>mass flux of frozen precip</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_merid_moment_flx</td>
-!!             <td>Pa</td>
-!!             <td>v_flux</td>
-!!             <td>j-directed wind stress into ocean</td>
-!!             <td>[vector rotation] (@ref VectorRotations) applied - lat-lon to tripolar</td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_net_lw_flx</td>
-!!             <td>W m-2</td>
-!!             <td>lw_flux</td>
-!!             <td>long wave radiation</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_net_sw_ir_dif_flx</td>
-!!             <td>W m-2</td>
-!!             <td>sw_flux_nir_dif</td>
-!!             <td>diffuse near IR shortwave radiation</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_net_sw_ir_dir_flx</td>
-!!             <td>W m-2</td>
-!!             <td>sw_flux_nir_dir</td>
-!!             <td>direct near IR shortwave radiation</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_net_sw_vis_dif_flx</td>
-!!             <td>W m-2</td>
-!!             <td>sw_flux_vis_dif</td>
-!!             <td>diffuse visible shortware radiation</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_net_sw_vis_dir_flx</td>
-!!             <td>W m-2</td>
-!!             <td>sw_flux_vis_dir</td>
-!!             <td>direct visible shortware radiation</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_prec_rate</td>
-!!             <td>kg m-2 s-1</td>
-!!             <td>lprec</td>
-!!             <td>mass flux of liquid precip</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_runoff_heat_flx</td>
-!!             <td>W m-2</td>
-!!             <td>runoff_hflx</td>
-!!             <td>heat flux, relative to 0C, of liquid land water into ocean</td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_runoff_rate</td>
-!!             <td>kg m-2 s-1</td>
-!!             <td>runoff</td>
-!!             <td>mass flux of liquid runoff</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_salt_rate</td>
-!!             <td>kg m-2 s-1</td>
-!!             <td>salt_flux</td>
-!!             <td>salt flux</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_sensi_heat_flx</td>
-!!             <td>W m-2</td>
-!!             <td>t_flux</td>
-!!             <td>sensible heat flux into ocean</td>
-!!         </tr>
-!!         <tr>
-!!             <td>mean_zonal_moment_flx</td>
-!!             <td>Pa</td>
-!!             <td>u_flux</td>
-!!             <td>i-directed wind stress into ocean</td>
-!!             <td>[vector rotation] (@ref VectorRotations) applied - lat-lon to tripolar</td>
-!!         </tr>
-!!     </tbody>
+!! <tr>
+!!     <th>Standard Name</td>
+!!     <th>Units</td>
+!!     <th>Model Variable</td>
+!!     <th>Description</td>
+!!     <th>Notes</td>
+!! <tr>
+!!     <td>inst_pres_height_surface</td>
+!!     <td>Pa</td>
+!!     <td>p</td>
+!!     <td>pressure of overlying sea ice and atmosphere</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mass_of_overlying_sea_ice</td>
+!!     <td>kg</td>
+!!     <td>mi</td>
+!!     <td>mass of overlying sea ice</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>seaice_melt_heat</td>
+!!     <td>W m-2</td>
+!!     <td>seaice_melt_heat</td>
+!!     <td>sea ice and snow melt heat flux</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>seaice_melt</td>
+!!     <td>kg m-2 s-1</td>
+!!     <td>seaice_melt</td>
+!!     <td>water flux due to sea ice and snow melting</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_calving_heat_flx</td>
+!!     <td>W m-2</td>
+!!     <td>calving_hflx</td>
+!!     <td>heat flux, relative to 0C, of frozen land water into ocean</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_calving_rate</td>
+!!     <td>kg m-2 s-1</td>
+!!     <td>calving</td>
+!!     <td>mass flux of frozen runoff</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_evap_rate</td>
+!!     <td>kg m-2 s-1</td>
+!!     <td>q_flux</td>
+!!     <td>specific humidity flux</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_fprec_rate</td>
+!!     <td>kg m-2 s-1</td>
+!!     <td>fprec</td>
+!!     <td>mass flux of frozen precip</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_merid_moment_flx</td>
+!!     <td>Pa</td>
+!!     <td>v_flux</td>
+!!     <td>j-directed wind stress into ocean</td>
+!!     <td>[vector rotation] (@ref VectorRotations) applied - lat-lon to tripolar</td>
+!! </tr>
+!! <tr>
+!!     <td>mean_net_lw_flx</td>
+!!     <td>W m-2</td>
+!!     <td>lw_flux</td>
+!!     <td>long wave radiation</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_net_sw_ir_dif_flx</td>
+!!     <td>W m-2</td>
+!!     <td>sw_flux_nir_dif</td>
+!!     <td>diffuse near IR shortwave radiation</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_net_sw_ir_dir_flx</td>
+!!     <td>W m-2</td>
+!!     <td>sw_flux_nir_dir</td>
+!!     <td>direct near IR shortwave radiation</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_net_sw_vis_dif_flx</td>
+!!     <td>W m-2</td>
+!!     <td>sw_flux_vis_dif</td>
+!!     <td>diffuse visible shortware radiation</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_net_sw_vis_dir_flx</td>
+!!     <td>W m-2</td>
+!!     <td>sw_flux_vis_dir</td>
+!!     <td>direct visible shortware radiation</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_prec_rate</td>
+!!     <td>kg m-2 s-1</td>
+!!     <td>lprec</td>
+!!     <td>mass flux of liquid precip</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_runoff_heat_flx</td>
+!!     <td>W m-2</td>
+!!     <td>runoff_hflx</td>
+!!     <td>heat flux, relative to 0C, of liquid land water into ocean</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_runoff_rate</td>
+!!     <td>kg m-2 s-1</td>
+!!     <td>runoff</td>
+!!     <td>mass flux of liquid runoff</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_salt_rate</td>
+!!     <td>kg m-2 s-1</td>
+!!     <td>salt_flux</td>
+!!     <td>salt flux</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_sensi_heat_flx</td>
+!!     <td>W m-2</td>
+!!     <td>t_flux</td>
+!!     <td>sensible heat flux into ocean</td>
+!!     <td></td>
+!! </tr>
+!! <tr>
+!!     <td>mean_zonal_moment_flx</td>
+!!     <td>Pa</td>
+!!     <td>u_flux</td>
+!!     <td>i-directed wind stress into ocean</td>
+!!     <td>[vector rotation] (@ref VectorRotations) applied - lat-lon to tripolar</td>
+!! </tr>
 !! </table>
 !!
 !! @subsection ExportField Export Fields
@@ -2681,79 +2693,76 @@ end subroutine shr_file_getLogUnit
 !! after the call to `update_ocean_model()`.
 !!
 !! <table>
-!!     <thead>
-!!         <tr>
-!!             <th>Standard Name</th>
-!!             <th>Units</th>
-!!             <th>Model Variable</th>
-!!             <th>Description</th>
-!!             <th>Notes</th>
-!!         </tr>
-!!     </thead>
-!!     <tbody>
-!!         <tr>
-!!             <td>freezing_melting_potential</td>
-!!             <td>W m-2</td>
-!!             <td>combination of frazil and melt_potential</td>
-!!             <td>cap converts model units (J m-2) to (W m-2) for export</td>
-!!         </tr>
-!!         <tr>
-!!             <td>ocean_mask</td>
-!!             <td></td>
-!!             <td></td>
-!!             <td>ocean mask</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>ocn_current_merid</td>
-!!             <td>m s-1</td>
-!!             <td>v_surf</td>
-!!             <td>j-directed surface velocity on u-cell</td>
-!!             <td>[vector rotation] (@ref VectorRotations) applied - tripolar to lat-lon</td>
-!!         </tr>
-!!         <tr>
-!!             <td>ocn_current_zonal</td>
-!!             <td>m s-1</td>
-!!             <td>u_surf</td>
-!!             <td>i-directed surface velocity on u-cell</td>
-!!             <td>[vector rotation] (@ref VectorRotations) applied - tripolar to lat-lon</td>
-!!         </tr>
-!!         <tr>
-!!             <td>s_surf</td>
-!!             <td>psu</td>
-!!             <td>s_surf</td>
-!!             <td>sea surface salinity on t-cell</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>sea_surface_temperature</td>
-!!             <td>K</td>
-!!             <td>t_surf</td>
-!!             <td>sea surface temperature on t-cell</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>sea_surface_slope_zonal</td>
-!!             <td>unitless</td>
-!!             <td>created from ssh</td>
-!!             <td>sea surface zonal slope</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>sea_surface_slope_merid</td>
-!!             <td>unitless</td>
-!!             <td>created from ssh</td>
-!!             <td>sea surface meridional slope</td>
-!!             <td></td>
-!!         </tr>
-!!         <tr>
-!!             <td>so_bldepth</td>
-!!             <td>m</td>
-!!             <td>obld</td>
-!!             <td>ocean surface boundary layer depth</td>
-!!             <td></td>
-!!         </tr>
-!!     </tbody>
+!!   <tr>
+!!       <th>Standard Name</th>
+!!       <th>Units</th>
+!!       <th>Model Variable</th>
+!!       <th>Description</th>
+!!       <th>Notes</th>
+!!   </tr>
+!!   <tr>
+!!       <td>freezing_melting_potential</td>
+!!       <td>W m-2</td>
+!!       <td>combination of frazil and melt_potential</td>
+!!       <td>cap converts model units (J m-2) to (W m-2) for export</td>
+!!       <td></td>
+!!   </tr>
+!!   <tr>
+!!       <td>ocean_mask</td>
+!!       <td></td>
+!!       <td></td>
+!!       <td>ocean mask</td>
+!!       <td></td>
+!!   </tr>
+!!   <tr>
+!!       <td>ocn_current_merid</td>
+!!       <td>m s-1</td>
+!!       <td>v_surf</td>
+!!       <td>j-directed surface velocity on u-cell</td>
+!!       <td>[vector rotation] (@ref VectorRotations) applied - tripolar to lat-lon</td>
+!!   </tr>
+!!   <tr>
+!!       <td>ocn_current_zonal</td>
+!!       <td>m s-1</td>
+!!       <td>u_surf</td>
+!!       <td>i-directed surface velocity on u-cell</td>
+!!       <td>[vector rotation] (@ref VectorRotations) applied - tripolar to lat-lon</td>
+!!   </tr>
+!!   <tr>
+!!       <td>s_surf</td>
+!!       <td>psu</td>
+!!       <td>s_surf</td>
+!!       <td>sea surface salinity on t-cell</td>
+!!       <td></td>
+!!   </tr>
+!!   <tr>
+!!       <td>sea_surface_temperature</td>
+!!       <td>K</td>
+!!       <td>t_surf</td>
+!!       <td>sea surface temperature on t-cell</td>
+!!       <td></td>
+!!   </tr>
+!!   <tr>
+!!       <td>sea_surface_slope_zonal</td>
+!!       <td>unitless</td>
+!!       <td>created from ssh</td>
+!!       <td>sea surface zonal slope</td>
+!!       <td></td>
+!!   </tr>
+!!   <tr>
+!!       <td>sea_surface_slope_merid</td>
+!!       <td>unitless</td>
+!!       <td>created from ssh</td>
+!!       <td>sea surface meridional slope</td>
+!!       <td></td>
+!!   </tr>
+!!   <tr>
+!!       <td>so_bldepth</td>
+!!       <td>m</td>
+!!       <td>obld</td>
+!!       <td>ocean surface boundary layer depth</td>
+!!       <td></td>
+!!   </tr>
 !! </table>
 !!
 !! @subsection MemoryManagement Memory Management
diff --git a/config_src/nuopc_driver/mom_surface_forcing_nuopc.F90 b/config_src/nuopc_driver/mom_surface_forcing_nuopc.F90
index cdd93a8772..ba6760ffa4 100644
--- a/config_src/nuopc_driver/mom_surface_forcing_nuopc.F90
+++ b/config_src/nuopc_driver/mom_surface_forcing_nuopc.F90
@@ -152,8 +152,8 @@ module MOM_surface_forcing_nuopc
 !> Structure corresponding to forcing, but with the elements, units, and conventions
 !! that exactly conform to the use for MOM-based coupled models.
 type, public :: ice_ocean_boundary_type
-  real, pointer, dimension(:,:) :: rofl_flux         =>NULL() !< liquid runoff [W/m2]
-  real, pointer, dimension(:,:) :: rofi_flux         =>NULL() !< ice runoff [W/m2]
+  real, pointer, dimension(:,:) :: rofl_flux         =>NULL() !< liquid runoff [kg/m2/s]
+  real, pointer, dimension(:,:) :: rofi_flux         =>NULL() !< ice runoff [kg/m2/s]
   real, pointer, dimension(:,:) :: u_flux            =>NULL() !< i-direction wind stress [Pa]
   real, pointer, dimension(:,:) :: v_flux            =>NULL() !< j-direction wind stress [Pa]
   real, pointer, dimension(:,:) :: t_flux            =>NULL() !< sensible heat flux [W/m2]