diff --git a/crhmcode/src/modules/ClassCRHMCanopy.cpp b/crhmcode/src/modules/ClassCRHMCanopy.cpp
index 15fca1742..f596ddc1c 100644
--- a/crhmcode/src/modules/ClassCRHMCanopy.cpp
+++ b/crhmcode/src/modules/ClassCRHMCanopy.cpp
@@ -581,14 +581,14 @@ double ClassCRHMCanopy::delta(double t) // Slope of sat vap p vs t, kPa/DEGREE_C
     return(3549.0*exp( 21.88 * t/(t+265.5)) / sqr(t+265.5));
 }
 
-double ClassCRHMCanopy::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELCIUS))
+double ClassCRHMCanopy::lambda(double t) // Latent heat of vaporization (MJ/kg)
 {
    return( 2.501 - 0.002361 * t );
 }
 
 double ClassCRHMCanopy::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELCIUS)
 {
-   return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELCIUS))
+   return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
 }
 
 double ClassCRHMCanopy::RHOa(double t, double ea, double Pa) // atmospheric density (kg/m^3)
diff --git a/crhmcode/src/modules/ClassCRHMCanopyClearing.cpp b/crhmcode/src/modules/ClassCRHMCanopyClearing.cpp
index 44eea6869..10a52e1ca 100644
--- a/crhmcode/src/modules/ClassCRHMCanopyClearing.cpp
+++ b/crhmcode/src/modules/ClassCRHMCanopyClearing.cpp
@@ -604,14 +604,14 @@ double ClassCRHMCanopyClearing::delta(double t) // Slope of sat vap p vs t, kPa/
     return(3549.0*exp( 21.88 * t/(t+265.5)) / sqr(t+265.5));
 }
 
-double ClassCRHMCanopyClearing::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELCIUS))
+double ClassCRHMCanopyClearing::lambda(double t) // Latent heat of vaporization (MJ/kg)
 {
    return( 2.501 - 0.002361 * t );
 }
 
 double ClassCRHMCanopyClearing::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELCIUS)
 {
-   return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELCIUS))
+   return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
 }
 
 double ClassCRHMCanopyClearing::RHOa(double t, double ea, double Pa) // atmospheric density (kg/m^3)
diff --git a/crhmcode/src/modules/ClassCRHMCanopyClearingGap.cpp b/crhmcode/src/modules/ClassCRHMCanopyClearingGap.cpp
index dce12ae5b..076c31882 100644
--- a/crhmcode/src/modules/ClassCRHMCanopyClearingGap.cpp
+++ b/crhmcode/src/modules/ClassCRHMCanopyClearingGap.cpp
@@ -683,14 +683,14 @@ double ClassCRHMCanopyClearingGap::delta(double t) // Slope of sat vap p vs t, k
     return(3549.0*exp( 21.88 * t/(t+265.5)) / sqr(t+265.5));
 }
 
-double ClassCRHMCanopyClearingGap::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELSIUS))
+double ClassCRHMCanopyClearingGap::lambda(double t) // Latent heat of vaporization (MJ/kg)
 {
    return( 2.501 - 0.002361 * t );
 }
 
 double ClassCRHMCanopyClearingGap::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELSIUS)
 {
-   return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELSIUS))
+   return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
 }
 
 double ClassCRHMCanopyClearingGap::RHOa(double t, double ea, double Pa) // atmospheric density (kg/m^3)
diff --git a/crhmcode/src/modules/ClassGreenAmpt.cpp b/crhmcode/src/modules/ClassGreenAmpt.cpp
index 246c8dbe5..15e713111 100644
--- a/crhmcode/src/modules/ClassGreenAmpt.cpp
+++ b/crhmcode/src/modules/ClassGreenAmpt.cpp
@@ -80,7 +80,7 @@ void ClassGreenAmpt::decl(void) {
   declparam("hru_area", TDim::NHRU, "[1]", "1e-6", "1e+09", "hru area", "(km^2)", &hru_area);
 
   declparam("soil_type", TDim::NHRU, "[4]", "0", "12",
-        "water/sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
+        "water/sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
         " 0 - 12", "()", &soil_type);
 
   declparam("soil_moist_max", TDim::NHRU, "[375.0]", "0.0", "5000.0",
diff --git a/crhmcode/src/modules/ClassGreencrack.cpp b/crhmcode/src/modules/ClassGreencrack.cpp
index cd6bc060a..3fd23ca7b 100644
--- a/crhmcode/src/modules/ClassGreencrack.cpp
+++ b/crhmcode/src/modules/ClassGreencrack.cpp
@@ -94,7 +94,7 @@ void ClassGreencrack::decl(void) {
   decldiagparam("Major", TDim::NHRU, "[5]", "1", "100", "threshold for major melt", "(mm/d)", &Major);
 
   declparam("soil_type", TDim::NHRU, "[4]", "0", "12",
-        "water/sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
+        "water/sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
         " 0 - 12", "()", &soil_type);
 
   declparam("soil_moist_max", TDim::NHRU, "[375.0]", "0.0", "5000.0",
diff --git a/crhmcode/src/modules/ClassSetSoil.cpp b/crhmcode/src/modules/ClassSetSoil.cpp
index bf3fe06fd..316e03766 100644
--- a/crhmcode/src/modules/ClassSetSoil.cpp
+++ b/crhmcode/src/modules/ClassSetSoil.cpp
@@ -82,11 +82,11 @@ void ClassSetSoil::decl(void) {
     declparam("Vol_h2o_content", TDim::NHRU, "[0.5]", "0.01", "0.7", "initial volumetric water content", "()", &Vol_h2o_content);
 
     declparam("soil_type_rechr", TDim::NHRU, "[4]", "0", "12",
-        "water/sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
+        "water/sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
         " 0 - 12", "()", &soiltype_rechr);
 
     declparam("soil_type", TDim::NHRU, "[4]", "0", "12",
-        "water/sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
+        "water/sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
         " 0 - 12", "()", &soil_type);
 
     declparam("soil_rechr_max", TDim::NHRU, "[60.0]", "0.0", "350.0",
diff --git a/crhmcode/src/modules/ClassVolumetric.cpp b/crhmcode/src/modules/ClassVolumetric.cpp
index f96d987e8..297dd6a78 100644
--- a/crhmcode/src/modules/ClassVolumetric.cpp
+++ b/crhmcode/src/modules/ClassVolumetric.cpp
@@ -50,7 +50,7 @@ void ClassVolumetric::decl(void) {
     declvar("Si_V", TDim::NHRU, "Si_V copy of parameter Si", "()", &Si_V);
 
     declparam("soil_type", TDim::NHRU, "[4]", "0", "12",
-        "water/sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
+        "water/sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
         " 0 - 12", "()", &soil_type);
 
     declparam("soil_moist_max", TDim::NHRU, "[375.0]", "0.0", "5000.0",
diff --git a/crhmcode/src/modules/Classevap.cpp b/crhmcode/src/modules/Classevap.cpp
index 82796985a..5ebcadf27 100644
--- a/crhmcode/src/modules/Classevap.cpp
+++ b/crhmcode/src/modules/Classevap.cpp
@@ -83,9 +83,9 @@ void Classevap::decl(void) {
 
   declparam("Zwind", TDim::NHRU, "[10]", "0.01", "100.0", "wind measurement height (Penman-Monteith)", "(m)", &Zwind);
 
-  declgetvar("*", "Rn", "(mm/m^2*int)", &Rn);
-  declgetvar("*", "RnD", "(mm/m^2*d)", &RnD);
-  declgetvar("*", "RnD_POS", "(mm/m^2*d)", &RnD_POS);
+  declgetvar("*", "Rn", "(mm/int)", &Rn);
+  declgetvar("*", "RnD", "(mm/d)", &RnD);
+  declgetvar("*", "RnD_POS", "(mm/d)", &RnD_POS);
 
   declgetvar("*",  "hru_t", "(" + string(DEGREE_CELSIUS) + ")", &hru_t);
   declgetvar("*",  "hru_u", "(m/s)", &hru_u);
@@ -226,10 +226,10 @@ void Classevap::finish(bool good) {
 
 double Classevap::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELSIUS
 {
-   return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELSIUS))
+   return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
 }
 
-double Classevap::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELSIUS))
+double Classevap::lambda(double t) // Latent heat of vaporization (MJ/kg)
 {
    return( 2.501 - 0.002361 * t );
 }
diff --git a/crhmcode/src/modules/ClassevapD.cpp b/crhmcode/src/modules/ClassevapD.cpp
index 632d005bd..db3f650bf 100644
--- a/crhmcode/src/modules/ClassevapD.cpp
+++ b/crhmcode/src/modules/ClassevapD.cpp
@@ -72,7 +72,7 @@ void ClassevapD::decl(void) {
 
   decldiagparam("F_Qg", TDim::NHRU, "[0.1]", "0.0", "1.0", "fraction to ground flux, Qg = F_Qg*Rn", "()", &F_Qg);
 
-  declgetvar("*", "RnD", "(mm/m^2*d)", &RnD);
+  declgetvar("*", "RnD", "(mm/d)", &RnD);
 
   declgetvar("*",  "hru_tmean", "(" + string(DEGREE_CELSIUS) + ")", &hru_tmean);
   declgetvar("*",  "hru_umean", "(m/s)", &hru_umean);
@@ -165,11 +165,11 @@ void ClassevapD::finish(bool good) {
 
 double ClassevapD::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELSIUS)
 {
-   return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELSIUS))
+   return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
 }
 
 
-double ClassevapD::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELSIUS))
+double ClassevapD::lambda(double t) // Latent heat of vaporization (MJ/kg)
 {
    return( 2.501 - 0.002361 * t );
 }
diff --git a/crhmcode/src/modules/ClassevapD_Resist.cpp b/crhmcode/src/modules/ClassevapD_Resist.cpp
index b9817ab90..7057fba1c 100644
--- a/crhmcode/src/modules/ClassevapD_Resist.cpp
+++ b/crhmcode/src/modules/ClassevapD_Resist.cpp
@@ -84,11 +84,11 @@ void ClassevapD_Resist::decl(void) {
     declparam("PM_method", TDim::NHRU, "[0]", "0", "2", "Penman-Monteith method, 0 = RC min, 1 = LAI, 2 = bulk", "()", &PM_method);
 
     declparam("soil_type", TDim::NHRU, "[2]", " 1", "12",
-        "HRU soil type (1->11): sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay", "()", &soil_type);
+        "HRU soil type (1->11): sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay", "()", &soil_type);
 
     declparam("soil_Depth", TDim::NHRU, "[1.0]", "0.0", "10.0", "depth of soil column", "(m)", &soil_Depth);
 
-    declgetvar("*", "RnD", "(mm/m^2*d)", &RnD);
+    declgetvar("*", "RnD", "(mm/d)", &RnD);
     declgetvar("*", "hru_tmean", "(" + string(DEGREE_CELSIUS) + ")", &hru_tmean);
     declgetvar("*", "hru_umean", "(m/s)", &hru_umean);
     declgetvar("*", "hru_eamean", "(kPa)", &hru_eamean);
@@ -251,11 +251,11 @@ void ClassevapD_Resist::finish(bool good) {
 
 double ClassevapD_Resist::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELSIUS)
 {
-    return(0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELSIUS))
+    return(0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
 }
 
 
-double ClassevapD_Resist::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELSIUS))
+double ClassevapD_Resist::lambda(double t) // Latent heat of vaporization (MJ/kg)
 {
     return(2.501 - 0.002361 * t);
 }
diff --git a/crhmcode/src/modules/ClassevapX.cpp b/crhmcode/src/modules/ClassevapX.cpp
index 04b5dac5e..d364268f4 100644
--- a/crhmcode/src/modules/ClassevapX.cpp
+++ b/crhmcode/src/modules/ClassevapX.cpp
@@ -89,15 +89,15 @@ void ClassevapX::decl(void) {
   declparam("PM_method", TDim::NHRU, "[0]", "0", "2", "Penman-Monteith method (used by Penman-Monteith), 0 = RC min, 1 = LAI, 2 = bulk.", "()", &PM_method);
 
   declparam("soil_type", TDim::NHRU, "[2]", " 1", "12",
-    "HRU soil type (used by Penman-Monteith) [1->11]: sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay.", "()", &soil_type);
+    "HRU soil type (used by Penman-Monteith) [1->11]: sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay.", "()", &soil_type);
 
   declparam("soil_Depth", TDim::NHRU, "[1.0]", "0.0", "10.0", "depth of soil column (used by Penman-Monteith).", "(m)", &soil_Depth);
 
   declgetvar("*",  "soil_moist", "(mm)", &soil_moist);
 
-  declgetvar("*", "Rn", "(mm/m^2*int)", &Rn);
-  declgetvar("*", "RnD", "(mm/m^2*d)", &RnD);
-  declgetvar("*", "RnD_POS", "(mm/m^2*d)", &RnD_POS);
+  declgetvar("*", "Rn", "(mm/int)", &Rn);
+  declgetvar("*", "RnD", "(mm/d)", &RnD);
+  declgetvar("*", "RnD_POS", "(mm/d)", &RnD_POS);
 
   declgetvar("*",  "hru_t", "(" + string(DEGREE_CELSIUS) + ")", &hru_t);
   declgetvar("*",  "hru_u", "(m/s)", &hru_u);
@@ -278,10 +278,10 @@ void ClassevapX::finish(bool good) {
 
 double ClassevapX::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELSIUS)
 {
-   return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELSIUS))
+   return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
 }
 
-double ClassevapX::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELSIUS))
+double ClassevapX::lambda(double t) // Latent heat of vaporization (MJ/kg)
 {
    return( 2.501 - 0.002361 * t );
 }
diff --git a/crhmcode/src/modules/Classevap_Resist.cpp b/crhmcode/src/modules/Classevap_Resist.cpp
index 52d273963..f5677cf44 100644
--- a/crhmcode/src/modules/Classevap_Resist.cpp
+++ b/crhmcode/src/modules/Classevap_Resist.cpp
@@ -91,14 +91,14 @@ void Classevap_Resist::decl(void) {
     declparam("PMmethod", TDim::NHRU, "[0]", "0", "1", "Penman-Monteith method, 0 = RC min, 1 = LAI", "()", &PM_method);
 
     declparam("soil_type", TDim::NHRU, "[2]", "1", "12",
-        "HRU soil type (1->11): sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay",
+        "HRU soil type (1->11): sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay",
         "()", &soil_type);
 
     declparam("soil_Depth", TDim::NHRU, "[1.0]", "0.0", "10.0", "depth of soil column", "(m)", &soil_Depth);
 
-    declgetvar("*", "Rn", "(mm/m^2*int)", &Rn);
-    declgetvar("*", "RnD", "(mm/m^2*d)", &RnD);
-    declgetvar("*", "RnD_POS", "(mm/m^2*d)", &RnD_POS);
+    declgetvar("*", "Rn", "(mm/int)", &Rn);
+    declgetvar("*", "RnD", "(mm/d)", &RnD);
+    declgetvar("*", "RnD_POS", "(mm/d)", &RnD_POS);
 
     declgetvar("*", "hru_t", "(" + string(DEGREE_CELSIUS) + ")", &hru_t);
     declgetvar("*", "hru_u", "(m/s)", &hru_u);
@@ -320,10 +320,10 @@ void Classevap_Resist::finish(bool good) {
 
 double Classevap_Resist::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELCIUS)
 {
-    return(0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELCIUS))
+    return(0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
 }
 
-double Classevap_Resist::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELCIUS))
+double Classevap_Resist::lambda(double t) // Latent heat of vaporization (MJ/kg)
 {
     return(2.501 - 0.002361 * t);
 }
diff --git a/crhmcode/src/modules/Classnetall.cpp b/crhmcode/src/modules/Classnetall.cpp
index bbc58d013..44279c762 100644
--- a/crhmcode/src/modules/Classnetall.cpp
+++ b/crhmcode/src/modules/Classnetall.cpp
@@ -44,13 +44,13 @@ void Classnetall::decl(void) {
 
   declvar("net", TDim::NHRU, "net all-wave radiation over time step", "(MJ/m^2*int)", &net);
 
-  decldiag("Rn", TDim::NHRU, "net all-wave radiation over time step", "(mm/m^2*int)", &Rn);
+  decldiag("Rn", TDim::NHRU, "net all-wave radiation over time step", "(mm/int)", &Rn);
 
   declvar("netD", TDim::NHRU, "net all-wave radiation per day", "(MJ/m^2*d)", &netD);
 
-  declvar("RnD", TDim::NHRU, "net all-wave radiation per day", "(mm/m^2*d)", &RnD);
+  declvar("RnD", TDim::NHRU, "net all-wave radiation per day", "(mm/d)", &RnD);
 
-  decldiag("RnD_POS", TDim::NHRU, "Sum of positive net all-wave radiation per day", "(mm/m^2*d)", &RnD_POS);
+  decldiag("RnD_POS", TDim::NHRU, "Sum of positive net all-wave radiation per day", "(mm/d)", &RnD_POS);
 
   declstatdiag("cum_net", TDim::NHRU, "cumulative net all-wave radiation", "(MJ/m^2)", &cum_net);
 
@@ -108,7 +108,7 @@ void Classnetall::run(void) {
         double Net = (shortw*(1.0f-Albedo[hh]) + netlong/Global::Freq); // MJ/interval
         netD[hh] +=  Net;
 
-        Net = Net/(2.501f-0.002361f*tday_intvls[ff][hh]); // MJ/m^2 to mm/m^2
+        Net = Net/(2.501f-0.002361f*tday_intvls[ff][hh]); // MJ/interval to mm/interval
 
         RnD[hh] += Net;
         if(Net > 0.0) RnD_POS[hh] += Net;