diff --git a/Cantera/src/thermo/HMWSoln.h b/Cantera/src/thermo/HMWSoln.h
index 7c55e8ab4..7b146f554 100644
--- a/Cantera/src/thermo/HMWSoln.h
+++ b/Cantera/src/thermo/HMWSoln.h
@@ -104,7 +104,7 @@ namespace Cantera {
    * water (IAPWS 1995 formulation) is used as its standard state.
    * All standard state properties for the solvent are based on
    * this real model for water, and involve function calls
-   * to the object that handles the real water model, #WaterPropsIAPWS.
+   * to the object that handles the real water model, #Cantera::WaterPropsIAPWS.
    *
    * The standard states for solutes are on the unit molality basis. 
    * Therefore, in the documentation below, the normal \f$ o \f$ 
@@ -507,7 +507,7 @@ namespace Cantera {
    *   \f]
    *
    *
-   *  <H3> Activity of the Water Solvent </H3>
+   *  <H3> Activity of the Water Solvent </H3> 
    *
    *  The activity for the solvent water,\f$ a_o \f$, is not independent and must be 
    *  determined either from the Gibbs-Duhem relation or from taking the appropriate derivative
diff --git a/Cantera/src/thermo/PDSS_SSVol.h b/Cantera/src/thermo/PDSS_SSVol.h
index 422c28ed6..16dba893b 100644
--- a/Cantera/src/thermo/PDSS_SSVol.h
+++ b/Cantera/src/thermo/PDSS_SSVol.h
@@ -1,12 +1,12 @@
 /**
  *  @file PDSS_SSVol.h
  *    Declarations for the class PDSS_SSVol (pressure dependent standard state)
- *    which handles calculations for a single species with an expression for the molar volume in a phase
+ *    which handles calculations for a single species with an expression for the standard state molar volume in a phase
  *    given by an enumerated data type
  *    (see class \ref pdssthermo and \link Cantera::PDSS_SSVol PDSS_SSVol\endlink).
  */
 /*
- * Copywrite (2006) Sandia Corporation. Under the terms of
+ * Copywrite (2009) Sandia Corporation. Under the terms of
  * Contract DE-AC04-94AL85000 with Sandia Corporation, the
  * U.S. Government retains certain rights in this software.
  */
@@ -23,9 +23,10 @@ namespace Cantera {
   class XML_Node;
   class VPStandardStateTP;
 
-  //! Class for pressure dependent standard states that use a constant volume model
+  //! Class for pressure dependent standard states that uses a standard state volume 
+  //! model of some sort.
   /*!
-   * Class for pressure dependent standard states that use a constant volume model.
+   *
    *
    *
    * @ingroup pdssthermo
diff --git a/Cantera/src/thermo/WaterProps.cpp b/Cantera/src/thermo/WaterProps.cpp
index 662fed741..64ed23fa1 100644
--- a/Cantera/src/thermo/WaterProps.cpp
+++ b/Cantera/src/thermo/WaterProps.cpp
@@ -495,7 +495,7 @@ namespace Cantera {
 
 
   // Parameters for the viscosityWater() function
-
+  //@{
   const double H[4] = {1.,
 		       0.978197,
 		       0.579829,
@@ -514,7 +514,7 @@ namespace Cantera {
   const double rhoStar = 317.763;    // kg / m3
   const double presStar = 22.115E6;  // Pa
   const double muStar = 55.071E-6;   //Pa s
-
+  //@}
 
   // Returns the viscosity of water at the current conditions
   // (kg/m/s)
diff --git a/Cantera/src/thermo/WaterPropsIAPWS.cpp b/Cantera/src/thermo/WaterPropsIAPWS.cpp
index 652bbda7a..60f2a5fee 100644
--- a/Cantera/src/thermo/WaterPropsIAPWS.cpp
+++ b/Cantera/src/thermo/WaterPropsIAPWS.cpp
@@ -2,7 +2,7 @@
  * @file WaterPropsIAPWS.cpp
  * Definitions for a class for calculating the equation of state of water
  * from the IAPWS 1995 Formulation based on the steam tables thermodynamic
- * basis (See class \link WaterPropsIAPWS WaterPropsIAPWS\endlink).
+ * basis (See class \link Cantera::WaterPropsIAPWS WaterPropsIAPWS\endlink).
  */
 /*
  * Copywrite (2006) Sandia Corporation. Under the terms of
diff --git a/Cantera/src/thermo/WaterPropsIAPWS.h b/Cantera/src/thermo/WaterPropsIAPWS.h
index 003441167..023d076a9 100644
--- a/Cantera/src/thermo/WaterPropsIAPWS.h
+++ b/Cantera/src/thermo/WaterPropsIAPWS.h
@@ -2,7 +2,7 @@
  * @file WaterPropsIAPWS.h
  * Headers for a class for calculating the equation of state of water
  * from the IAPWS 1995 Formulation based on the steam tables thermodynamic
- * basis (See class \link WaterPropsIAPWS WaterPropsIAPWS\endlink).
+ * basis (See class \link Cantera::WaterPropsIAPWS WaterPropsIAPWS\endlink).
  */
 /*
  * Copywrite (2005) Sandia Corporation. Under the terms of
diff --git a/Cantera/src/thermo/WaterPropsIAPWSphi.cpp b/Cantera/src/thermo/WaterPropsIAPWSphi.cpp
index c8ee6dcfc..4299b97cd 100644
--- a/Cantera/src/thermo/WaterPropsIAPWSphi.cpp
+++ b/Cantera/src/thermo/WaterPropsIAPWSphi.cpp
@@ -1,7 +1,7 @@
 /**
  * @file WaterPropsIAPWSphi.cpp
  *  Definitions for Lowest level of the classes which support a real water model
- *  (see class #WaterPropsIAPWS and class  #WaterPropsIAPWSphi).
+ *  (see class \link Cantera::WaterPropsIAPWS WaterPropsIAPWS\endlink and class  #WaterPropsIAPWSphi).
  */
 /*
  * Copywrite (2006) Sandia Corporation. Under the terms of
diff --git a/Cantera/src/thermo/WaterPropsIAPWSphi.h b/Cantera/src/thermo/WaterPropsIAPWSphi.h
index 7bdf45ca2..6a5b0ca87 100644
--- a/Cantera/src/thermo/WaterPropsIAPWSphi.h
+++ b/Cantera/src/thermo/WaterPropsIAPWSphi.h
@@ -1,7 +1,7 @@
 /**
  * @file WaterPropsIAPWSphi.h
  *  Header for Lowest level of the classes which support a real water model
- *  (see class #WaterPropsIAPWS and class  #WaterPropsIAPWSphi).
+ *  (see class \link Cantera::WaterPropsIAPWS WaterPropsIAPWS\endlink and  class \link WaterPropsIAPWSphi WaterPropsIAPWSphi\endlink).
  *
  *   This class calculates dimensionless quantitites.
  */