diff --git a/dumux/implicit/model.hh b/dumux/implicit/model.hh
index 40b2d0cec6d2da4667bc65d77c0171a0e4789c3e..6d2558ea3559b8e8e42602ae49cd5e3506311d2b 100644
--- a/dumux/implicit/model.hh
+++ b/dumux/implicit/model.hh
@@ -865,7 +865,7 @@ protected:
     { return problem_().gridView(); }
 
     /*!
-     * \brief Reference to the local residal object
+     * \brief Reference to the local residual object
      */
     LocalResidual &localResidual_()
     { return localJacobian_.localResidual(); }
@@ -996,7 +996,7 @@ protected:
     mutable std::vector<VolumeVariables> prevHints_;
 
     // the problem we want to solve. defines the constitutive
-    // relations, matxerial laws, etc.
+    // relations, material laws, etc.
     Problem *problemPtr_;
 
     // calculates the local jacobian matrix for a given element
diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index efdd1bdb80d48cfb4128447178aff78efd74fd3b..49eb242469aff9c5b1f97a1a18a438dbab75bd0d 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -444,7 +444,7 @@ public:
 } // end namespace FluidSystems
 
 #ifdef DUMUX_PROPERTIES_HH
-// forward defintions of the property tags
+// forward definitions of the property tags
 namespace Properties {
 NEW_PROP_TAG(Scalar);
 NEW_PROP_TAG(WettingPhase);
diff --git a/dumux/material/fluidsystems/2pliquidvapor.hh b/dumux/material/fluidsystems/2pliquidvapor.hh
index 9fa41e1a75c856d959854df78dc16dd09c4dc34f..eccfc792e6797565d5c57d6277f251397cfbeff4 100644
--- a/dumux/material/fluidsystems/2pliquidvapor.hh
+++ b/dumux/material/fluidsystems/2pliquidvapor.hh
@@ -110,7 +110,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are indepent on the fluid composition. This assumtion is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
@@ -120,7 +120,7 @@ public:
     static bool isIdealMixture(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        // we assume Henry's and Rault's laws for the water phase and
+        // we assume Henry's and Raoult's laws for the water phase and
         // and no interaction between gas molecules of different
         // components, so all phases are ideal mixtures!
         return true;
@@ -555,7 +555,7 @@ public:
 } // end namespace FluidSystems
 
 #ifdef DUMUX_PROPERTIES_HH
-// forward defintions of the property tags
+// forward definitions of the property tags
 namespace Properties {
 NEW_PROP_TAG(Scalar);
 NEW_PROP_TAG(Components);
diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index 0a4f35a380880de4ed28786804758738c5385629..d3292a2d049e659efc0d382ea205d7b0654a2fa2 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -156,7 +156,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are independent on the fluid composition. This assumption is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
@@ -166,7 +166,7 @@ public:
     static bool isIdealMixture(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        // we assume Henry's and Rault's laws for the water phase and
+        // we assume Henry's and Raoult's laws for the water phase and
         // and no interaction between gas molecules of different
         // components, so all phases are ideal mixtures!
 
diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh
index 0dfa1eca70bdcfc03808c79f0432a61055fb97c4..9ccc5362acb8b266eafa265f7eefe88da72482f9 100644
--- a/dumux/material/fluidsystems/brineco2.hh
+++ b/dumux/material/fluidsystems/brineco2.hh
@@ -125,7 +125,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are independent on the fluid composition. This assumption is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
@@ -689,7 +689,7 @@ private:
 
 
 #ifdef DUMUX_PROPERTIES_HH
-// forward defintions of the property tags
+// forward definitions of the property tags
 namespace Properties
 {
 NEW_PROP_TAG(Scalar);
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index 6c596a0ee6098dcf76a0d01dcd73c312e987c554..daeb4d0f4e7baaef11dcb4a1a1adff511fd61fe2 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -157,7 +157,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are independent on the fluid composition. This assumption is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
@@ -167,7 +167,7 @@ public:
     static bool isIdealMixture(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        // we assume Henry's and Rault's laws for the water phase and
+        // we assume Henry's and Raoult's laws for the water phase and
         // and no interaction between gas molecules of different
         // components, so all phases are ideal mixtures!
         return true;
@@ -637,7 +637,7 @@ public:
      * Chapter 2.1.13 Innere Energie, Wäremekapazität, Enthalpie \cite A3:class:2001 <BR>
      *
      * Formula (2.42):
-     * the specifiv enthalpy of a gasphase result from the sum of (enthalpies*mass fraction) of the components
+     * the specific enthalpy of a gasphase result from the sum of (enthalpies*mass fraction) of the components
      *
      *  \todo This system neglects the contribution of gas-molecules in the liquid phase.
      *        This contribution is probably not big. Somebody would have to find out the enthalpy of solution for this system. ...
@@ -772,7 +772,7 @@ public:
 } // end namespace FluidSystems
 
 #ifdef DUMUX_PROPERTIES_HH
-// forward defintions of the property tags
+// forward definitions of the property tags
 namespace Properties {
 NEW_PROP_TAG(Scalar);
 NEW_PROP_TAG(Components);
diff --git a/dumux/material/fluidsystems/h2oairmesitylene.hh b/dumux/material/fluidsystems/h2oairmesitylene.hh
index 3f0e014c9a011a40b4398049430c2aff9d522229..83082a156d97a7dc37da5c261e930deac6607c05 100644
--- a/dumux/material/fluidsystems/h2oairmesitylene.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylene.hh
@@ -145,7 +145,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are independent on the fluid composition. This assumption is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
@@ -155,7 +155,7 @@ public:
     static bool isIdealMixture(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        // we assume Henry's and Rault's laws for the water phase and
+        // we assume Henry's and Raoult's laws for the water phase and
         // and no interaction between gas molecules of different
         // components, so all phases are ideal mixtures!
         return true;
@@ -456,7 +456,7 @@ public:
         // for the NAPL phase, we assume currently that nothing is
         // dissolved. this means that the affinity of the NAPL
         // component to the NAPL phase is much higher than for the
-        // other components, i.e. the fugacity cofficient is much
+        // other components, i.e. the fugacity coefficient is much
         // smaller.
         if (phaseIdx == nPhaseIdx) {
             Scalar phiNapl = NAPL::vaporPressure(T)/p;
@@ -579,7 +579,7 @@ private:
 } // end namespace FluidSystems
 
 #ifdef DUMUX_PROPERTIES_HH
-// forward defintions of the property tags
+// forward definitions of the property tags
 namespace Properties {
     NEW_PROP_TAG(Scalar);
     NEW_PROP_TAG(Components);
diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh
index 99c97e49ca24fdd45b2df20fe452f122c443991c..bfa947c48d78e9804d8d901e1f9606076bd295cf 100644
--- a/dumux/material/fluidsystems/h2oairxylene.hh
+++ b/dumux/material/fluidsystems/h2oairxylene.hh
@@ -141,7 +141,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are independent on the fluid composition. This assumption is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
@@ -151,7 +151,7 @@ public:
     static bool isIdealMixture(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        // we assume Henry's and Rault's laws for the water phase and
+        // we assume Henry's and Raoult's laws for the water phase and
         // and no interaction between gas molecules of different
         // components, so all phases are ideal mixtures!
         return true;
@@ -455,7 +455,7 @@ public:
         // for the NAPL phase, we assume currently that nothing is
         // dissolved. this means that the affinity of the NAPL
         // component to the NAPL phase is much higher than for the
-        // other components, i.e. the fugacity cofficient is much
+        // other components, i.e. the fugacity coefficient is much
         // smaller.
         if (phaseIdx == nPhaseIdx) {
             Scalar phiNapl = NAPL::vaporPressure(T)/p;
@@ -578,7 +578,7 @@ private:
 } // end namespace FluidSystems
 
 #ifdef DUMUX_PROPERTIES_HH
-// forward defintions of the property tags
+// forward definitions of the property tags
 namespace Properties {
     NEW_PROP_TAG(Scalar);
     NEW_PROP_TAG(Components);
diff --git a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
index d6c4aa67de92fbae406c6a4dcc06ed442e14ced4..701b72e3985729daa3c24238d8aa80d8729c73e8 100644
--- a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh
@@ -137,7 +137,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are indepent on the fluid composition. This assumtion is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
@@ -147,7 +147,7 @@ public:
     static bool isIdealMixture(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        // we assume Henry's and Rault's laws for the water phase and
+        // we assume Henry's and Raoult's laws for the water phase and
         // and no interaction between gas molecules of different
         // components, so all phases are ideal mixtures!
         return true;
@@ -444,7 +444,7 @@ private:
 } // end namespace FluidSystems
 
 #ifdef DUMUX_PROPERTIES_HH
-// forward defintions of the property tags
+// forward definitions of the property tags
 namespace Properties {
     NEW_PROP_TAG(Scalar);
     NEW_PROP_TAG(Components);
diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh
index 5c5c8ba7c41dd117ea33ddab484a473b8a2b3aaa..50976ea8f953d134eb6acedb878ab81773547c98 100644
--- a/dumux/material/fluidsystems/h2on2.hh
+++ b/dumux/material/fluidsystems/h2on2.hh
@@ -125,7 +125,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are independent on the fluid composition. This assumption is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
@@ -135,7 +135,7 @@ public:
     static bool isIdealMixture(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        // we assume Henry's and Rault's laws for the water phase and
+        // we assume Henry's and Raoult's laws for the water phase and
         // and no interaction between gas molecules of different
         // components, so all phases are ideal mixtures!
         return true;
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index 4f3ad35b543231ec8b8abe57134ce8eeef7f22a6..08fdd13d8093fb5c17efcadce5230c1267e5d54c 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -137,7 +137,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are independent on the fluid composition. This assumption is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
@@ -147,7 +147,7 @@ public:
     static bool isIdealMixture(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        // we assume Henry's and Rault's laws for the water phase and
+        // we assume Henry's and Raoult's laws for the water phase and
         // and no interaction between gas molecules of different
         // components, so all phases are ideal mixtures!
         return true;
diff --git a/dumux/material/fluidsystems/purewatersimple.hh b/dumux/material/fluidsystems/purewatersimple.hh
index 09366f67244f7b42a2fee1a2c0b1246f9908bcc6..fef356f2d2531b1beaf4fa3d631e65f0cfb17853 100644
--- a/dumux/material/fluidsystems/purewatersimple.hh
+++ b/dumux/material/fluidsystems/purewatersimple.hh
@@ -126,7 +126,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are independent on the fluid composition. This assumption is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
@@ -136,7 +136,7 @@ public:
     static bool isIdealMixture(int phaseIdx)
     {
         assert(0 <= phaseIdx && phaseIdx < numPhases);
-        // we assume Henry's and Rault's laws for the water phase and
+        // we assume Henry's and Raoult's laws for the water phase and
         // and no interaction between gas molecules of different
         // components, so all phases are ideal mixtures!
         return true;
diff --git a/dumux/material/fluidsystems/spe5.hh b/dumux/material/fluidsystems/spe5.hh
index e793ea5acf8c7d48dc613ddc0e290e73ac7071c1..496d49727a1f22f03cef6d3ed2fc254459fa679f 100644
--- a/dumux/material/fluidsystems/spe5.hh
+++ b/dumux/material/fluidsystems/spe5.hh
@@ -125,7 +125,7 @@ public:
      * We define an ideal mixture as a fluid phase where the fugacity
      * coefficients of all components times the pressure of the phase
      * are independent on the fluid composition. This assumption is true
-     * if Henry's law and Rault's law apply. If you are unsure what
+     * if Henry's law and Raoult's law apply. If you are unsure what
      * this function should return, it is safe to return false. The
      * only damage done will be (slightly) increased computation times
      * in some cases.
diff --git a/dumux/porousmediumflow/2p/implicit/model.hh b/dumux/porousmediumflow/2p/implicit/model.hh
index 5ea13e75476ec0f22cba24a769cf7ff2e334f09d..a24b30ddaf4d77beb730cad6f01c469052cf21d5 100644
--- a/dumux/porousmediumflow/2p/implicit/model.hh
+++ b/dumux/porousmediumflow/2p/implicit/model.hh
@@ -65,7 +65,7 @@ namespace Dumux
  * choosing either \f$p_w\f$ and \f$S_n\f$ or \f$p_n\f$ and \f$S_w\f$
  * as primary variables. The formulation which ought to be used can be
  * specified by setting the <tt>Formulation</tt> property to either
- * <tt>TwoPCommonIndices::pWsN</tt> or <tt>TwoPCommonIndices::pNsW</tt>. By
+ * <tt>TwoPFormulation::pwsn</tt> or <tt>TwoPFormulation::pnsw</tt>. By
  * default, the model uses \f$p_w\f$ and \f$S_n\f$.
  */
 template<class TypeTag >
diff --git a/dumux/porousmediumflow/2p2c/implicit/model.hh b/dumux/porousmediumflow/2p2c/implicit/model.hh
index 3a1701f3e0376ec89bef52aeb384694cda981de2..3a01803085d6ee1f8fa6906db5692bd9103c5bab 100644
--- a/dumux/porousmediumflow/2p2c/implicit/model.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/model.hh
@@ -71,7 +71,7 @@ namespace Dumux
  * The used primary variables are, like in the two-phase model, either \f$p_w\f$ and \f$S_n\f$
  * or \f$p_n\f$ and \f$S_w\f$. The formulation which ought to be used can be
  * specified by setting the <tt>Formulation</tt> property to either
- * TwoPTwoCIndices::pWsN or TwoPTwoCIndices::pNsW. By
+ * <tt>TwoPTwoCFormulation::pwsn</tt> or <tt>TwoPTwoCFormulation::pnsw</tt>. By
  * default, the model uses \f$p_w\f$ and \f$S_n\f$.
  * Moreover, the second primary variable depends on the phase state, since a
  * primary variable switch is included. The phase state is stored for all nodes
diff --git a/dumux/porousmediumflow/2pdfm/implicit/model.hh b/dumux/porousmediumflow/2pdfm/implicit/model.hh
index d9117b879a1cc8c3c6935a25fa35703bfad1b88c..5c2e1cc0ed9d6f167755c066a90db4658f0e0001 100644
--- a/dumux/porousmediumflow/2pdfm/implicit/model.hh
+++ b/dumux/porousmediumflow/2pdfm/implicit/model.hh
@@ -64,7 +64,7 @@ namespace Dumux
  * choosing either \f$p_w\f$ and \f$S_n\f$ or \f$p_n\f$ and \f$S_w\f$
  * as primary variables. The formulation which ought to be used can be
  * specified by setting the <tt>Formulation</tt> property to either
- * <tt>TwoPCommonIndices::pWsN</tt> or <tt>TwoPCommonIndices::pNsW</tt>. By
+ * <tt>TwoPFormulation::pwsn</tt> or <tt>TwoPFormulation::pnsw</tt>. By
  * default, the model uses \f$p_w\f$ and \f$S_n\f$.
  */
 template<class TypeTag >
diff --git a/dumux/porousmediumflow/2pnc/implicit/indices.hh b/dumux/porousmediumflow/2pnc/implicit/indices.hh
index 97422f15130b2676d4d80f142071e96a4986dfdb..d46e2e14520082acc6e14520f9888eed2cd4f28b 100644
--- a/dumux/porousmediumflow/2pnc/implicit/indices.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/indices.hh
@@ -31,7 +31,6 @@ namespace Dumux
  * \ingroup TwoPNCModel
  * \ingroup ImplicitIndices
  * \brief Enumerates the formulations which the two-phase n-component model accepts.
- *
  */
 struct TwoPNCFormulation
 {
diff --git a/dumux/porousmediumflow/2pnc/implicit/model.hh b/dumux/porousmediumflow/2pnc/implicit/model.hh
index be59030ed2067c46d65be5b952e0c7ee79b5e6a3..e891340643cc0a0e6aecb572e261da6d996ba828 100644
--- a/dumux/porousmediumflow/2pnc/implicit/model.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/model.hh
@@ -79,7 +79,7 @@ namespace Dumux
  * The used primary variables are, like in the two-phase model, either \f$p_w\f$ and \f$S_n\f$
  * or \f$p_n\f$ and \f$S_w\f$. The formulation which ought to be used can be
  * specified by setting the <tt>Formulation</tt> property to either
- * TwoPTwoCIndices::pWsN or TwoPTwoCIndices::pNsW. By
+ * TwoPTwoCIndices::pwsn or TwoPTwoCIndices::pnsw. By
  * default, the model uses \f$p_w\f$ and \f$S_n\f$.
  *
  * Moreover, the second primary variable depends on the phase state, since a