diff --git a/doc/doxygen/modules.txt b/doc/doxygen/modules.txt
index 1c4253c2a966a11436f80772a4ee70d3dfb4aa46..b5f2466fa9be4594713414765a64d91126aa8594 100644
--- a/doc/doxygen/modules.txt
+++ b/doc/doxygen/modules.txt
@@ -2,7 +2,7 @@
  * \file
  *
  * \brief This file contains all module definitions for the doxygen documentation.
- * 
+ *
  */
 
 /* ***************** Porousmediaflow ******************/
@@ -22,8 +22,8 @@
         /*!
          * \ingroup OnePModels
          * \defgroup OnePhase Sequential
-         *         
-	 * \copydetails Dumux::FVPressure1P
+         *
+         * \copydetails Dumux::FVPressure1P
          */
     /*!
      * \ingroup Porousmediaflow
@@ -41,33 +41,38 @@
          *
          * \copydetails Dumux::TwoPModel
          */
-	/*!
+    /*!
          * \ingroup TwoPModels
          * \defgroup IMPES Sequential
-	 * 
-	 * \copydetails Dumux::FVPressure2P
-	 * <br><br><br>
-	 * \copydetails Dumux::FVVelocity2P
-	 * <br>
-	 * \copydetails Dumux::FVSaturation2P
+     *
+     * # Pressure
+     * \copydetails Dumux::FVPressure2P
+     * <br>
+     * # Velocity
+     * \copydetails Dumux::FVVelocity2P
+     * <br>
+     * # Saturation
+     * \copydetails Dumux::FVSaturation2P
          */
     /*!
      * \ingroup Porousmediaflow
      * \defgroup TwoPTwoCModels 2p2c (two-phase, two-component Darcy flow)
-     */ 
+     */
         /*!
          * \ingroup TwoPTwoCModels
          * \defgroup TwoPTwoCModel Implicit
          *
          * \copydetails Dumux::TwoPTwoCModel
          */
-	/*!
+    /*!
          * \ingroup TwoPTwoCModels
          * \defgroup IMPEC Sequential
-	 * 
-	 * \copydetails Dumux::FVPressure2P2C
-	 * <br><br><br>
-	 * \copydetails Dumux::FVTransport2PC
+     *
+     * # Pressure
+     * \copydetails Dumux::FVPressure2P2C
+     * <br>
+     * # Transport
+     * \copydetails Dumux::FVTransport2P2C
          */
     /*!
      * \ingroup Porousmediaflow
@@ -129,7 +134,7 @@
      *
      * \copydetails Dumux::RichardsModel
      */
-    
+
 /* ***************** Geomechanics ******************/
 /*!
  * \defgroup Geomechanics Geomechanics (fully implicit)
@@ -152,7 +157,7 @@
      *
      * \copydetails Dumux::ElasticModel
      */
-    
+
 /* ***************** Freeflow ******************/
 /*!
  * \defgroup Freeflow Freeflow (fully implicit)
@@ -193,7 +198,7 @@
      *
      * \copydetails Dumux::ZeroEqncniModel
      */
-    
+
 /* ***************** Multidomain ******************/
 /*!
  * \defgroup Multidomain Multidomain (fully implicit)
@@ -206,43 +211,61 @@
      * \ingroup Multidomain
      * \defgroup TwoPTwoCStokesTwoCModel 2cstokes2p2c (Stokes2c flow, coupled to two-phase, two-component Darcy flow)
      *
+     * # Coupling Conditions
      * \copydetails Dumux::TwoCStokesTwoPTwoCLocalOperator
-     * <br><br><br>
+     * <br>
+     * # Darcy 2p2c
      * \copydetails Dumux::TwoPTwoCModel
      * <br>
+     * # Stokes nc
      * \copydetails Dumux::StokesncModel
      */
     /*!
      * \ingroup Multidomain
      * \defgroup TwoPTwoCNIStokesTwoCNIModel 2cnistokes2p2cni (Stokes2c flow, coupled to two-phase, two-component Darcy flow, non-isothermal)
      *
+     * # Coupling Conditions
      * \copydetails Dumux::TwoCNIStokesTwoPTwoCNILocalOperator
-     * <br><br><br>
-     * \copydetails Dumux::TwoPTwoCNIModel
      * <br>
+     * # Darcy 2p2c
+     * \copydetails Dumux::TwoPTwoCModel
+     * <br>
+     * # Darcy non-isothermal extension
+     * \copydetails Dumux::NIModel
+     * <br>
+     * # Stokes nc
      * \copydetails Dumux::StokesncniModel
      */
     /*!
      * \ingroup Multidomain
      * \defgroup TwoPTwoCZeroEqTwoCModel 2czeroeq2p2c (Stokes2c flow with zero-eq turbulence model, coupled to two-phase, two-component Darcy flow)
      *
+     * # Coupling Conditions
      * \copydetails Dumux::TwoCStokesTwoPTwoCLocalOperator
-     * <br><br><br>
+     * <br>
+     * # Darcy 2p2c
      * \copydetails Dumux::TwoPTwoCModel
      * <br>
+     * # Stokes nc
      * \copydetails Dumux::ZeroEqncModel
      */
     /*!
      * \ingroup Multidomain
      * \defgroup TwoPTwoCNIZeroEqTwoCNIModel 2cnizeroeq2p2cni (Stokes2c flow with zero-eq turbulence model, coupled to two-phase, two-component Darcy flow, non-isothermal)
      *
+     * # Coupling Conditions
      * \copydetails Dumux::TwoCNIStokesTwoPTwoCNILocalOperator
-     * <br><br><br>
-     * \copydetails Dumux::TwoPTwoCNIModel
      * <br>
+     * # Darcy 2p2c
+     * \copydetails Dumux::TwoPTwoCModel
+     * <br>
+     * # Darcy non-isothermal extension
+     * \copydetails Dumux::NIModel
+     * <br>
+     * # Stokes nc
      * \copydetails Dumux::ZeroEqncniModel
      */
-    
+
 /* ***************** Fully Implicit ******************/
 /*!
  * \defgroup ImplicitModel Fully Implicit Scheme
@@ -306,34 +329,34 @@
      */
 
 /* ***************** Material ******************/
-/*!   
+/*!
  * \defgroup Material Material and Fluid Framework
  * Short description of the most important concepts of the material and fluid framework:
  *
  *  - __Binary coefficient:__  @copydoc Binarycoefficients
- * 
- * 
+ *
+ *
  *  - __Component:__ @copydoc Components
- * 
- * 
+ *
+ *
  *  - __Constraint solver:__ @copydoc ConstraintSolver
- * 
- * 
+ *
+ *
  *  - __Equation of state:__ @copydoc EOS
- * 
- * 
+ *
+ *
  *  - __Fluid state:__ @copydoc FluidStates
- * 
- * 
+ *
+ *
  *  - __Fluid system:__ @copydoc Fluidsystems
- * 
- *   
+ *
+ *
  *  - __Fluid-Matrix Interactions:__ @copydoc fluidmatrixinteractions
- * 
- * 
+ *
+ *
  *  - __Parameter cache:__ @copydoc ParameterCache
- * 
- * 
+ *
+ *
  *  - __Spatial Parameters:__ @copydoc SpatialParameters
  */
     /*!
@@ -354,12 +377,12 @@
      *  is to provide a convenient way to access these quantities from
      *  full-fledged fluid systems. Components are not supposed to be used
      *  by models directly.
-     */ 
+     */
          /*!
          * \ingroup Components
          * \defgroup IAPWS IAPWS
          */
-     /*! 
+     /*!
      * \ingroup Material
      * \defgroup ConstraintSolver Constraint Solver
      * Constraint solvers are auxiliary tools to
@@ -372,17 +395,17 @@
      * states. Using them is not mandatory for models, but given the fact
      * that some thermodynamic constraints can be quite complex to solve,
      * sharing this code between models makes sense.
-     */   
+     */
     /*!
      * \ingroup Material
      * \defgroup EOS Equation of State
-     * 
+     *
      * Equations of state (EOS) are auxiliary
      * classes which provide relations between a fluid phase's temperature,
      * pressure, composition and density. Since these classes are only used
      * internally in fluid systems, their programming interface is
      * currently ad-hoc.
-     * 
+     *
      * \ingroup Material
      * \defgroup FluidStates Fluid States
      * Fluid states are responsible for representing the
@@ -420,7 +443,7 @@
          /*!
          * \ingroup fluidmatrixinteractions
          *  \defgroup fluidmatrixinteractionsparams Parameters for Fluid-Matrix Interactions
-         */  
+         */
     /*!
      * \ingroup Material
      * \defgroup ParameterCache Parameter Cache
@@ -458,7 +481,7 @@
      * All parameters which depend on the matrix and
      * therefore on the position within the model domain are defined as spatial
      * parameters. For example permeability, porosity etc.
-     * 
+     *
      */
 
 /* ***************** Common ******************/
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistry.hh b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
index c67e8b5559681f2d9bfebaa9e5e9388b28f8cf9a..0c9da48a0eda312dddb65d321e49166d63b6f12b 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistry.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
@@ -109,7 +109,7 @@ public:
     * \brief Calculates reaction sources with an electrochemical model approach.
     *
     * \param values The primary variable vector
-    * \param volVars The volume variables
+    * \param currentDensity The current density
     *
     * For this method, the \a values parameter stores source values
     */
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
index f332cdf98f954f062a5f7a03f5c8a8be15f85de0..8f4c29b4337e608e0d159d44881ffbf168ff3548 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
@@ -84,7 +84,7 @@ public:
     * \brief Calculates reaction sources with an electrochemical model approach.
     *
     * \param values The primary variable vector
-    * \param volVars The volume variables
+    * \param currentDensity The current density
     *
     * For this method, the \a values parameter stores source values
     */
diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh
index c75eaf0172f1c8455115a7b66ee1dbdffadc17ba..6dbb4b1ebbe43a044c5c2eed2f8c30cd0ba46291 100644
--- a/dumux/material/components/brine.hh
+++ b/dumux/material/components/brine.hh
@@ -181,6 +181,7 @@ public:
      *
      * \param temperature temperature of component in \f$\mathrm{[K]}\f$
      * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
+     * \param salinity salinity in\f$\mathrm{[kg/kg]}\f$
      *
      * See:
      *
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
index 3d170470e9d5e05f4e3acf5b1ac5121af02f1a5a..35c9bd6c007001bd43b13627fae3bdbca52770ac 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
@@ -79,7 +79,7 @@ public:
      *
      * For the non-regularized part:
      *
-     * \copydetails BrooksCorey::pc()
+     * \copydetails Dumux::BrooksCorey::pc()
      */
     static Scalar pc(const Params &params, Scalar swe)
     {
@@ -119,7 +119,7 @@ public:
      *
      * For the non-regularized part:
      *
-     * \copydetails BrooksCorey::sw()
+     * \copydetails Dumux::BrooksCorey::sw()
      */
     static Scalar sw(const Params &params, Scalar pc)
     {
@@ -163,7 +163,7 @@ public:
      *
      * For the non-regularized part:
      *
-     * \copydetails BrooksCorey::dpc_dsw()
+     * \copydetails Dumux::BrooksCorey::dpc_dsw()
      */
     DUNE_DEPRECATED_MSG("dpc_dsw(const Params &params, Scalar swe) is deprecated. Use dpc_dswe(const Params &params, Scalar swe) instead.")
     static Scalar dpc_dsw(const Params &params, Scalar swe)
@@ -183,7 +183,7 @@ public:
      *
      * For the non-regularized part:
      *
-     * \copydetails BrooksCorey::dpc_dswe()
+     * \copydetails Dumux::BrooksCorey::dpc_dswe()
      */
     static Scalar dpc_dswe(const Params &params, Scalar swe)
     {
@@ -216,7 +216,7 @@ public:
      *
      * For the non-regularized part:
      *
-     * \copydetails BrooksCorey::dsw_dpc()
+     * \copydetails Dumux::BrooksCorey::dsw_dpc()
      */
     DUNE_DEPRECATED_MSG("dsw_dpc(const Params &params, Scalar pc) is deprecated. Use dswe_dpc(const Params &params, Scalar pc) instead.")
     static Scalar dsw_dpc(const Params &params, Scalar pc)
@@ -236,7 +236,7 @@ public:
      *
      * For the non-regularized part:
      *
-     * \copydetails BrooksCorey::dswe_dpc()
+     * \copydetails Dumux::BrooksCorey::dswe_dpc()
      */
     static Scalar dswe_dpc(const Params &params, Scalar pc)
     {
@@ -283,7 +283,7 @@ public:
      *    - between \f$\mathrm{ 0.95 \leq \overline{S}_w \leq 1}\f$:  use a spline as interpolation
      *
      *  For not-regularized part:
-        \copydetails BrooksCorey::krw()
+        \copydetails Dumux::BrooksCorey::krw()
      */
     static Scalar krw(const Params &params, Scalar swe)
     {
@@ -306,7 +306,7 @@ public:
      *    - above \f$\mathrm{\overline{S}_w =1}\f$:                  set relative permeability to one
      *    - for \f$\mathrm{0 \leq \overline{S}_w \leq 0.05}\f$:     use a spline as interpolation
      *
-         \copydetails BrooksCorey::krn()
+         \copydetails Dumux::BrooksCorey::krn()
      *
      */
     static Scalar krn(const Params &params, Scalar swe)
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
index bf9133a399e611447a78ee1aa3ad259b75a6cb9a..e13a04068ab492f390bc6a43a668fb56b4db6bf3 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
@@ -88,7 +88,7 @@ public:
      *
      *  For not-regularized part:
      *
-         \copydetails VanGenuchten::pc()
+         \copydetails Dumux::VanGenuchten::pc()
      */
     static Scalar pc(const Params &params, Scalar swe)
     {
@@ -141,7 +141,7 @@ public:
      *
      *  For not-regularized part:
      *
-         \copydetails VanGenuchten::sw()
+         \copydetails Dumux::VanGenuchten::sw()
      *
      */
     static Scalar sw(const Params &params, Scalar pc)
@@ -199,7 +199,7 @@ public:
     *
     *        For not-regularized part:
     *
-      \copydetails VanGenuchten::dpc_dsw()
+      \copydetails Dumux::VanGenuchten::dpc_dsw()
     *
     */
     DUNE_DEPRECATED_MSG("dpc_dsw(const Params &params, Scalar swe) is deprecated. Use dpc_dswe(const Params &params, Scalar swe) instead.")
@@ -220,7 +220,7 @@ public:
     *
     *        For not-regularized part:
     *
-      \copydetails VanGenuchten::dpc_dswe()
+      \copydetails Dumux::VanGenuchten::dpc_dswe()
     *
     */
     static Scalar dpc_dswe(const Params &params, Scalar swe)
@@ -249,7 +249,7 @@ public:
      *                       by a straight line and use that slope (yes, there is a kink :-( ).
      *
      *        For not-regularized part:
-        \copydetails VanGenuchten::dsw_dpc()
+        \copydetails Dumux::VanGenuchten::dsw_dpc()
      */
     DUNE_DEPRECATED_MSG("dsw_dpc(const Params &params, Scalar pc) is deprecated. Use dswe_dpc(const Params &params, Scalar pc) instead.")
     static Scalar dsw_dpc(const Params &params, Scalar pc)
@@ -268,7 +268,7 @@ public:
      *                       by a straight line and use that slope (yes, there is a kink :-( ).
      *
      *        For not-regularized part:
-        \copydetails VanGenuchten::dswe_dpc()
+        \copydetails Dumux::VanGenuchten::dswe_dpc()
      */
     static Scalar dswe_dpc(const Params &params, Scalar pc)
     {
@@ -306,7 +306,7 @@ public:
      *    - between \f$\mathrm{0.95 \leq \overline{S}_w \leq 1}\f$:  use a spline as interpolation
      *
      *  For not-regularized part:
-        \copydetails VanGenuchten::krw()
+        \copydetails Dumux::VanGenuchten::krw()
      */
     static Scalar krw(const Params &params, Scalar swe)
     {
@@ -341,7 +341,7 @@ public:
      *    - above \f$\mathrm{\overline{S}_w =1}\f$:                  set relative permeability to one
      *    - for \f$\mathrm{0 \leq \overline{S}_w \leq 0.05}\f$:     use a spline as interpolation
      *
-         \copydetails VanGenuchten::krn()
+         \copydetails Dumux::VanGenuchten::krn()
      *
      */
     static Scalar krn(const Params &params, Scalar swe)
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh b/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
index 8d9cf902c3a90de8915c74843e75c389b3bc7994..7dbd5d31441ca1567574611b3c086ef8435379b3 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
@@ -144,7 +144,7 @@ public:
      * \brief Returns the partial derivative of the capillary
      *        pressure to the effective saturation.
      * \param params Array of parameters
-     * \param sw Wetting liquid saturation
+     * \param swe Effective wetting liquid saturation
     */
     DUNE_DEPRECATED_MSG("dpc_dsw(const Params &params, const Scalar swe) is deprecated. Use dpc_dswe(const Params &params, const Scalar swe) instead.")
     static Scalar dpc_dsw(const Params &params, const Scalar swe)
@@ -156,7 +156,7 @@ public:
      * \brief Returns the partial derivative of the capillary
      *        pressure to the effective saturation.
      * \param params Array of parameters
-     * \param sw Wetting liquid saturation
+     * \param swe Effective wetting liquid saturation
     */
     static Scalar dpc_dswe(const Params &params, const Scalar swe)
     {
diff --git a/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh b/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh
index cab93c2b263d762898eb5a38b9801dbe0a1bf378..9f7394a81ebbd3b168e2ba86609c21d2d497c4e5 100644
--- a/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh
@@ -274,7 +274,7 @@ public:
      * \brief Returns the partial derivative of the capillary
      *        pressure to the effective saturation.
      * \param params Array of parameters
-     * \param sw Wetting liquid saturation
+     * \param swe Wetting liquid saturation
     */
     DUNE_DEPRECATED_MSG("dpc_dsw(const Params &params, Scalar swe) is deprecated. Use dpc_dswe(const Params &params, Scalar swe) instead.")
     static Scalar dpc_dsw(const Params &params, Scalar swe)
@@ -286,7 +286,7 @@ public:
      * \brief Returns the partial derivative of the capillary
      *        pressure to the effective saturation.
      * \param params Array of parameters
-     * \param sw Wetting liquid saturation
+     * \param swe Effective wetting liquid saturation
     */
     static Scalar dpc_dswe(const Params &params, Scalar swe)
     {
diff --git a/dumux/material/fluidstates/nonequilibrium.hh b/dumux/material/fluidstates/nonequilibrium.hh
index 5289869f803b1c2eb7becc6add081937e2da59eb..c5ff0033ea46c06c24e625b74c98013a3866d958 100644
--- a/dumux/material/fluidstates/nonequilibrium.hh
+++ b/dumux/material/fluidstates/nonequilibrium.hh
@@ -68,20 +68,20 @@ public:
      * on thermodynamic equilibrium required)
      *****************************************************/
     /*!
-     * @copydoc CompositionalFluidState::saturation()
+     * @copydoc Dumux::CompositionalFluidState::saturation()
      */
     Scalar saturation(int phaseIdx) const
     { return saturation_[phaseIdx]; }
 
     /*!
-     * @copydoc CompositionalFluidState::moleFraction()
+     * @copydoc Dumux::CompositionalFluidState::moleFraction()
      */
     Scalar moleFraction(int phaseIdx, int compIdx) const
     { return moleFraction_[phaseIdx][compIdx]; }
 
 
     /*!
-     * @copydoc CompositionalFluidState::massFraction()
+     * @copydoc Dumux::CompositionalFluidState::massFraction()
      */
     Scalar massFraction(int phaseIdx, int compIdx) const
     {
@@ -93,67 +93,67 @@ public:
     }
 
     /*!
-     * @copydoc CompositionalFluidState::averageMolarMass()
+     * @copydoc Dumux::CompositionalFluidState::averageMolarMass()
      */
     Scalar averageMolarMass(int phaseIdx) const
     { return averageMolarMass_[phaseIdx]; }
 
     /*!
-     * @copydoc CompositionalFluidState::molarity()
+     * @copydoc Dumux::CompositionalFluidState::molarity()
      */
     Scalar molarity(int phaseIdx, int compIdx) const
     { return molarDensity(phaseIdx)*moleFraction(phaseIdx, compIdx); }
 
     /*!
-     * @copydoc CompositionalFluidState::fugacityCoefficient()
+     * @copydoc Dumux::CompositionalFluidState::fugacityCoefficient()
      */
     Scalar fugacityCoefficient(int phaseIdx, int compIdx) const
     { return fugacityCoefficient_[phaseIdx][compIdx]; }
 
     /*!
-     * @copydoc CompositionalFluidState::fugacity()
+     * @copydoc Dumux::CompositionalFluidState::fugacity()
      */
     Scalar fugacity(int phaseIdx, int compIdx) const
     { return pressure_[phaseIdx]*fugacityCoefficient_[phaseIdx][compIdx]*moleFraction_[phaseIdx][compIdx]; }
 
     /*!
-     * @copydoc CompositionalFluidState::molarVolume()
+     * @copydoc Dumux::CompositionalFluidState::molarVolume()
      */
     Scalar molarVolume(int phaseIdx) const
     { return 1/molarDensity(phaseIdx); }
 
     /*!
-     * @copydoc CompositionalFluidState::density()
+     * @copydoc Dumux::CompositionalFluidState::density()
      */
     Scalar density(int phaseIdx) const
     { return density_[phaseIdx]; }
 
     /*!
-     * @copydoc CompositionalFluidState::molarDensity()
+     * @copydoc Dumux::CompositionalFluidState::molarDensity()
      */
     Scalar molarDensity(int phaseIdx) const
     { return density_[phaseIdx]/averageMolarMass(phaseIdx); }
 
 
     /*!
-     * @copydoc CompositionalFluidState::temperature()
+     * @copydoc Dumux::CompositionalFluidState::temperature()
      */
     Scalar temperature(int phaseIdx) const
     { return temperature_[phaseIdx]; }
 
     /*!
-     * @copydoc CompositionalFluidState::pressure()
+     * @copydoc Dumux::CompositionalFluidState::pressure()
      */
     Scalar pressure(int phaseIdx) const
     { return pressure_[phaseIdx]; }
     /*!
-     * @copydoc CompositionalFluidState::enthalpy()
+     * @copydoc Dumux::CompositionalFluidState::enthalpy()
      */
     Scalar enthalpy(int phaseIdx) const
     { return enthalpy_[phaseIdx]; }
 
     /*!
-     * @copydoc CompositionalFluidState::internalEnergy()
+     * @copydoc Dumux::CompositionalFluidState::internalEnergy()
      */
     Scalar internalEnergy(int phaseIdx) const
     {
@@ -162,7 +162,7 @@ public:
     }
 
     /*!
-     * @copydoc CompositionalFluidState::viscosity()
+     * @copydoc Dumux::CompositionalFluidState::viscosity()
      */
     Scalar viscosity(int phaseIdx) const
     { return viscosity_[phaseIdx]; }
diff --git a/dumux/multidomain/2cnistokes2p2cni/problem.hh b/dumux/multidomain/2cnistokes2p2cni/problem.hh
index 05e2420fc5a0bb18304f67060b06dfbbe48b77ca..0b87fbfb5de52081b338c92d665348e0b488857c 100644
--- a/dumux/multidomain/2cnistokes2p2cni/problem.hh
+++ b/dumux/multidomain/2cnistokes2p2cni/problem.hh
@@ -61,7 +61,7 @@ public:
      * \brief Returns the temperature gradient through the boundary layer
      *
      * \param cParams a parameter container
-     * \param scvIdx1 The local index of the sub-control volume of the Stokes domain
+     * \param scvIdx The local index of the sub-control volume of the Stokes domain
      */
     template<typename CParams>
     Scalar evalBoundaryLayerTemperatureGradient(CParams cParams, const int scvIdx) const
diff --git a/dumux/multidomain/2cstokes2p2c/problem.hh b/dumux/multidomain/2cstokes2p2c/problem.hh
index f6739e16df48cc0acfd166b4213e2e395f093c5b..47673ccacf5e7d1217620bea5496c015bb34bce6 100644
--- a/dumux/multidomain/2cstokes2p2c/problem.hh
+++ b/dumux/multidomain/2cstokes2p2c/problem.hh
@@ -135,7 +135,7 @@ public:
      *
      * \param cParams a parameter container
      * \param scvIdx1 The local index of the sub-control volume of the Stokes domain
-     * \param scvIdx1 The local index of the sub-control volume of the Darcy domain
+     * \param scvIdx2 The local index of the sub-control volume of the Darcy domain
      */
     template<typename CParams>
     Scalar evalMassTransferCoefficient(CParams cParams, const int scvIdx1, const int scvIdx2) const
diff --git a/dumux/porousmediumflow/2pdfm/implicit/volumevariables.hh b/dumux/porousmediumflow/2pdfm/implicit/volumevariables.hh
index aba771f9d09ed08ba135a4a90828ed0b612da72a..ce4678a94aa1e5774c89e95f857c7e5ddc04e5a6 100644
--- a/dumux/porousmediumflow/2pdfm/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2pdfm/implicit/volumevariables.hh
@@ -179,7 +179,9 @@ public:
     /*!
      * \brief Extended capillary pressure saturation interface condition
      *
-     * \param materialParamsMatrix the material law o calculate the sw as inverse of capillary pressure function
+     * \param priVars Primary variables
+     * \param materialParamsMatrix the material law to calculate the sw as inverse of capillary pressure function
+     * \param materialParamsFracture the material law to calculate the sw as inverse of capillary pressure function
      *
      * This method is called by updateFracture
      */