diff --git a/Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp b/Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp
index d05845830..e2ed1351a 100644
--- a/Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp
+++ b/Cantera/src/thermo/IonsFromNeutralVPSSTP.cpp
@@ -33,6 +33,7 @@
 using namespace std;
 
 #ifndef MIN
+//! standard MIN function
 # define MIN(x,y) (( (x) < (y) ) ? (x) : (y))
 #endif
 
@@ -1212,6 +1213,16 @@ namespace Cantera {
     dlnActCoeffdlnN_diag_NeutralMolecule_.resize(numNeutralMoleculeSpecies_);
   }
   //====================================================================================================================
+  //!  Return the factor overlap
+  /*!
+   *     @param elnamesVN
+   *     @param elemVectorN
+   *     @param nElementsN
+   *     @param elnamesVI
+   *     @param elemVectorI
+   *     @param nElementsI
+   *
+   */
   static double factorOverlap(const std::vector<std::string>&  elnamesVN ,
 			      const std::vector<double>& elemVectorN,
 			      const int  nElementsN,
diff --git a/Cantera/src/thermo/SpeciesThermoFactory.cpp b/Cantera/src/thermo/SpeciesThermoFactory.cpp
index 2cf31dcc8..d8e901afc 100644
--- a/Cantera/src/thermo/SpeciesThermoFactory.cpp
+++ b/Cantera/src/thermo/SpeciesThermoFactory.cpp
@@ -522,6 +522,7 @@ namespace Cantera {
    * This is called by method installThermoForSpecies if a MinEQ3node block is found in the XML input.
    *
    *  @param speciesName        String name of the species
+   *  @param th_ptr             Pointer to the %ThermoPhase object
    *  @param sp                 SpeciesThermo object that will receive the nasa polynomial object
    *  @param k                  Species index within the phase
    *  @param MinEQ3node         Ptr to the first XML_Node for the first MinEQ3 parameterization
diff --git a/Cantera/src/thermo/WaterProps.cpp b/Cantera/src/thermo/WaterProps.cpp
index 91f4ca20a..f9e5a236a 100644
--- a/Cantera/src/thermo/WaterProps.cpp
+++ b/Cantera/src/thermo/WaterProps.cpp
@@ -496,7 +496,7 @@ namespace Cantera {
 
   // Parameters for the viscosityWater() function
 
-  //@{
+  // \cond
   const doublereal H[4] = {1.,
 		       0.978197,
 		       0.579829,
@@ -515,7 +515,7 @@ namespace Cantera {
   const doublereal rhoStar = 317.763;    // kg / m3
   const doublereal presStar = 22.115E6;  // Pa
   const doublereal muStar = 55.071E-6;   //Pa s
-  //@}
+  // \endcond
 
   // Returns the viscosity of water at the current conditions
   // (kg/m/s)
diff --git a/Cantera/src/thermo/WaterPropsIAPWSphi.cpp b/Cantera/src/thermo/WaterPropsIAPWSphi.cpp
index 5f8a382de..51d623e22 100644
--- a/Cantera/src/thermo/WaterPropsIAPWSphi.cpp
+++ b/Cantera/src/thermo/WaterPropsIAPWSphi.cpp
@@ -29,10 +29,12 @@ using std::fabs;
  * routine, except for internal checks. All calculations here are done
  * in dimensionless units.
  */
+// \cond
 static const doublereal  T_c = 647.096;  // Kelvin
 static const doublereal  P_c = 22.064E6; // Pascals
 static const doublereal  Rho_c = 322.;    // kg m-3
 static const doublereal  M_water = 18.015268; // kg kmol-1
+//  \endcond
 
 /*
  * The added constants were calculated so that u = s = 0
@@ -42,6 +44,7 @@ static const doublereal  M_water = 18.015268; // kg kmol-1
  * H didn't turn out to be .611872 J/kg, but .611782 J/kg.
  * There may be a slight error here somehow.
  */
+//  \cond
 static const doublereal  ni0[9] = {
   0.0,
   -8.32044648201 - 0.000000001739715,
@@ -240,7 +243,6 @@ static const int tiR[55] = {
   1,
   4   // 54
 };
-
 static const doublereal  ni[57] = {
   +0.0,
   +0.12533547935523E-1, //  1
@@ -360,8 +362,9 @@ static const doublereal  Bbetai[2] = {
   +0.3,
   +0.3
 };
+// \endcond
 
-/**
+/*
  * Constructor for the object. 
  */
 WaterPropsIAPWSphi::WaterPropsIAPWSphi() :
@@ -1106,7 +1109,7 @@ doublereal  WaterPropsIAPWSphi::phiR_dt() const {
   return val;
 }
 
-/**
+/*
  * This program computes the reduced density, given the reduced pressure
  * and the reduced temperature, tau. It takes an initial guess, deltaGuess.
  * DeltaGuess is important as this is a multivalued function below the