diff --git a/dumux/implicit/2p2cni/2p2cnivolumevariables.hh b/dumux/implicit/2p2cni/2p2cnivolumevariables.hh
index 6ddf552ea243b6b3a794a8f950dd33ca82806b75..4627c2632483a1797e0c2c780134fb0271192255 100644
--- a/dumux/implicit/2p2cni/2p2cnivolumevariables.hh
+++ b/dumux/implicit/2p2cni/2p2cnivolumevariables.hh
@@ -41,7 +41,7 @@ namespace Dumux
 template <class TypeTag>
 class TwoPTwoCNIVolumeVariables : public TwoPTwoCVolumeVariables<TypeTag>
 {
-    //! \cond 0
+    //! \cond false
     typedef TwoPTwoCVolumeVariables<TypeTag> ParentType;
     typedef typename ParentType::FluidState FluidState;
 
diff --git a/dumux/implicit/co2ni/co2nivolumevariables.hh b/dumux/implicit/co2ni/co2nivolumevariables.hh
index 4644d0b62a7d215d05a682b7f885322f3032fbfe..95a2209a5a89f2a6ab6a99773a6c9d67441b5116 100644
--- a/dumux/implicit/co2ni/co2nivolumevariables.hh
+++ b/dumux/implicit/co2ni/co2nivolumevariables.hh
@@ -44,7 +44,7 @@ namespace Dumux
 template <class TypeTag>
 class CO2NIVolumeVariables : public CO2VolumeVariables<TypeTag>
 {
-    //! \cond 0
+    //! \cond false
     typedef CO2VolumeVariables<TypeTag> ParentType;
     typedef typename ParentType::FluidState FluidState;
 
diff --git a/dumux/implicit/mpnc/diffusion/diffusion.hh b/dumux/implicit/mpnc/diffusion/diffusion.hh
index 14919067c839ba9586dad1c549c35e2ce0c80db3..f61e8108d55ff5ad802ba149df63a1b74bc9f7c5 100644
--- a/dumux/implicit/mpnc/diffusion/diffusion.hh
+++ b/dumux/implicit/mpnc/diffusion/diffusion.hh
@@ -20,7 +20,7 @@
  * \file
  *
  * \brief This file contains parts to calculate the diffusive flux in
- *        the fully coupled two-phase N-component model
+ *        the fully coupled MpNc model
  */
 #ifndef DUMUX_MPNC_DIFFUSION_HH
 #define DUMUX_MPNC_DIFFUSION_HH
@@ -31,7 +31,9 @@
 #include <dumux/implicit/mpnc/mpncproperties.hh>
 
 namespace Dumux {
-
+/*!
+ * \brief Calculates the diffusive flux in the fully coupled MpNc model.
+ */
 template <class TypeTag, bool enableDiffusion>
 class MPNCDiffusion
 {
diff --git a/dumux/implicit/mpnc/diffusion/fluxvariables.hh b/dumux/implicit/mpnc/diffusion/fluxvariables.hh
index 342d065ff1505b529ebb566444ee9ca6ebdbea1a..f7335f8607e315354d4f46afbf3b05a5b5f81435 100644
--- a/dumux/implicit/mpnc/diffusion/fluxvariables.hh
+++ b/dumux/implicit/mpnc/diffusion/fluxvariables.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  * \brief This file contains the diffusion module for the flux data of
- *        the fully coupled two-phase N-component model
+ *        the fully coupled MpNc model
  */
 #ifndef DUMUX_MPNC_DIFFUSION_FLUX_VARIABLES_HH
 #define DUMUX_MPNC_DIFFUSION_FLUX_VARIABLES_HH
diff --git a/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh b/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh
index c487787fa1bf8f73bda9828bcd0deeeac94e7dc7..d212d60bf3a594d07d01953ec28e8b1dab25e23a 100644
--- a/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh
+++ b/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh
@@ -16,6 +16,10 @@
  *   You should have received a copy of the GNU General Public License       *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
+/*!
+ * \file
+ * \brief The mass conservation part of the MpNc model.
+ */
 #ifndef DUMUX_MPNC_LOCAL_RESIDUAL_MASS_HH
 #define DUMUX_MPNC_LOCAL_RESIDUAL_MASS_HH
 
@@ -32,11 +36,8 @@
 namespace Dumux
 {
 /*!
- * \file
- * \brief The mass conservation part of the MpNc model.
- *
- * This is the class represents methods which are shared amongst all
- * mass conservation modules.
+ * \brief This class represents methods which are shared amongst all
+ *        mass conservation modules.
  */
 template<class TypeTag>
 class MPNCLocalResidualMassCommon
diff --git a/dumux/implicit/mpnc/mpncnewtoncontroller.hh b/dumux/implicit/mpnc/mpncnewtoncontroller.hh
index 005def2ce29dd0d960017a49f2e8122bb2cd70c8..92e8edd6b6861de248ed5eac3b638c35ed5ceeb4 100644
--- a/dumux/implicit/mpnc/mpncnewtoncontroller.hh
+++ b/dumux/implicit/mpnc/mpncnewtoncontroller.hh
@@ -18,7 +18,8 @@
  *****************************************************************************/
 /*!
  * \file
- * \brief A MpNc specific controller for the newton solver.
+ * \brief A MpNc specific controller for the newton solver, which knows
+ *       'physically meaningful' solution.
  *
  * This controller 'knows' what a 'physically meaningful' solution is
  * which allows the newton method to abort quicker if the solution is
@@ -34,6 +35,10 @@
 
 namespace Dumux {
 
+/*!
+ * \brief A MpNc specific controller for the newton solver, which knows
+ *       'physically meaningful' solution.
+ */
 template <class TypeTag, bool enableKinetic /* = false */>
 class MpNcNewtonChop
 {