diff --git a/dumux/material/binarycoefficients/h2o_heavyoil.hh b/dumux/material/binarycoefficients/h2o_heavyoil.hh
index 86d494be7cf184d283c8091f2713f2cd53a7c729..63a8ea80cb656604c6680f1021725f00dab812df 100644
--- a/dumux/material/binarycoefficients/h2o_heavyoil.hh
+++ b/dumux/material/binarycoefficients/h2o_heavyoil.hh
@@ -42,6 +42,8 @@ public:
     /*!
      * \brief Henry coefficient \f$[N/m^2]\f$  for heavy oil in liquid water.
      * \param temperature the temperature \f$\mathrm{[K]}\f$
+     *
+     * \todo values copied from TCE, please improve it
      */
     template <class Scalar>
     static Scalar henryOilInWater(Scalar temperature)
@@ -55,6 +57,8 @@ public:
     /*!
      * \brief Henry coefficient \f$[N/m^2]\f$  for water in liquid heavy oil.
      * \param temperature the temperature \f$\mathrm{[K]}\f$
+     *
+     * \todo arbitrary value, please improve it
      */
     template <class Scalar>
     static Scalar henryWaterInOil(Scalar temperature)
@@ -68,17 +72,21 @@ public:
      * \brief Binary diffusion coefficient [m^2/s] for molecular water and heavy oil.
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pressure the phase pressure \f$\mathrm{[Pa]}\f$
+     *
+     * \todo value is just an order of magnitude, please improve it
      */
     template <class Scalar>
     static Scalar gasDiffCoeff(Scalar temperature, Scalar pressure)
     {
-        return 1e-6; // [m^2/s] This is just an order of magnitude. Please improve it!
+        return 1e-6; // [m^2/s] TODO: This is just an order of magnitude. Please improve it!
     }
 
     /*!
      * \brief Diffusion coefficient [m^2/s] for heavy oil in liquid water.
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pressure the phase pressure \f$\mathrm{[Pa]}\f$
+     *
+     * \todo value is just an order of magnitude, please improve it
      */
     template <class Scalar>
     static Scalar liquidDiffCoeff(Scalar temperature, Scalar pressure)
diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh
index b2e9d512e4be2b5c6eca6c3391c26443942e9c91..577b8f3ec75263930a2687b31c43a00ddeb8de66 100644
--- a/dumux/material/fluidsystems/2pimmiscible.hh
+++ b/dumux/material/fluidsystems/2pimmiscible.hh
@@ -287,17 +287,20 @@ public:
 
     using Base::fugacityCoefficient;
     /*!
-     * \brief Calculate the fugacity coefficient \f$\mathrm{[Pa]}\f$ of an individual
+     * \brief Calculate the fugacity coefficient \f$\mathrm{[-]}\f$ of an individual
      *        component in a fluid phase
+     *
+     * The fugacity coefficient \f$\mathrm{\phi_\kappa_\alpha}\f$ is connected to the
+     * fugacity \f$\mathrm{f^\kappa_\alpha}\f$ and the component's mole
+     * fraction \f$\mathrm{x^\kappa_\alpha}\f$ by means of the relation
+     *
+     * \f[
+     f^\kappa_\alpha = \phi^\kappa_\alpha\;x^\kappa_\alpha\;p_\alpha
+     * \f]
+     *
      * \param fluidState The fluid state of the two-phase model
      * \param phaseIdx Index of the fluid phase
      * \param compIdx index of the component
-     *
-     * The fugacity coefficient \f$\mathrm{\phi_\kappa}\f$ is connected to the
-     * fugacity \f$\mathrm{f_\kappa}\f$ and the component's molarity
-     * \f$\mathrm{x_\kappa}\f$ by means of the relation
-     *
-     * \f[ f_\kappa = \phi_\kappa * x_{\kappa} \f]
      */
     template <class FluidState>
     static Scalar fugacityCoefficient(const FluidState &fluidState,
diff --git a/dumux/material/fluidsystems/2pliquidvapor.hh b/dumux/material/fluidsystems/2pliquidvapor.hh
index 30679b129a39a54b86a900b7e77061b3648ba9ed..d386fc542ff1faf579654be5a04dff099a6e8a6c 100644
--- a/dumux/material/fluidsystems/2pliquidvapor.hh
+++ b/dumux/material/fluidsystems/2pliquidvapor.hh
@@ -362,7 +362,7 @@ public:
     }
 
     /*!
-     * \brief Calculate the fugacity coefficient [Pa] of an individual
+     * \brief Calculate the fugacity coefficient [-] of an individual
      *        component in a fluid phase
      *
      * The fugacity coefficient \f$\phi^\kappa_\alpha\f$ of
diff --git a/dumux/material/fluidsystems/base.hh b/dumux/material/fluidsystems/base.hh
index 2336754b8e96a47d9a0fdc5404d40dd8a7864d91..1be0448426f9ea447f499f617e6397e8ad540b1e 100644
--- a/dumux/material/fluidsystems/base.hh
+++ b/dumux/material/fluidsystems/base.hh
@@ -121,18 +121,21 @@ public:
     }
 
     /*!
-     * \brief Calculate the fugacity coefficient \f$\mathrm{[Pa]}\f$ of an individual
+     * \brief Calculate the fugacity coefficient \f$\mathrm{[-]}\f$ of an individual
      *        component in a fluid phase
+     *
+     * The fugacity coefficient \f$\mathrm{\phi_\kappa_\alpha}\f$ is connected to the
+     * fugacity \f$\mathrm{f^\kappa_\alpha}\f$ and the component's mole
+     * fraction \f$\mathrm{x^\kappa_\alpha}\f$ by means of the relation
+     *
+     * \f[
+     f^\kappa_\alpha = \phi^\kappa_\alpha\;x^\kappa_\alpha\;p_\alpha
+     * \f]
+     *
      * \param fluidState The fluid state
      * \param paramCache mutable parameters
      * \param phaseIdx Index of the fluid phase
      * \param compIdx Index of the component
-     *
-     * The fugacity coefficient \f$\mathrm{\phi_\kappa}\f$ is connected to the
-     * fugacity \f$\mathrm{f_\kappa}\f$ and the component's molarity
-     * \f$\mathrm{x_\kappa}\f$ by means of the relation
-     *
-     * \f[ f_\kappa = \phi_\kappa * x_{\kappa} \f]
      */
     template <class FluidState>
     static Scalar fugacityCoefficient(const FluidState &fluidState,
diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh
index 93ea82635655019f71c4465c9700ff4ffe5dbde2..5ae166ce3293da12719baccad73500ca92bb38f1 100644
--- a/dumux/material/fluidsystems/brineair.hh
+++ b/dumux/material/fluidsystems/brineair.hh
@@ -403,7 +403,7 @@ public:
      * where \f$\mathrm{p_\alpha}\f$ is the pressure of the fluid phase.
      *
      * For liquids with very low miscibility this boils down to the
-     * inverse Henry constant for the solutes and the saturated vapor pressure
+     * Henry constant for the solutes and the saturated vapor pressure
      * both divided by phase pressure.
      */
     template <class FluidState>
diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh
index 87f764c7256d809d03bb87e6421eb2a2be1faa4f..20da042645a9abe7abe6b3bcb694c142691ceb13 100644
--- a/dumux/material/fluidsystems/h2oair.hh
+++ b/dumux/material/fluidsystems/h2oair.hh
@@ -510,7 +510,7 @@ public:
      * where \f$p_\alpha\f$ is the pressure of the fluid phase.
      *
      * For liquids with very low miscibility this boils down to the
-     * inverse Henry constant for the solutes and the saturated vapor pressure
+     * Henry constant for the solutes and the saturated vapor pressure
      * both divided by phase pressure.
      */
     template <class FluidState>
diff --git a/dumux/material/fluidsystems/h2oairmesitylene.hh b/dumux/material/fluidsystems/h2oairmesitylene.hh
index 786c114c7b097865c20313c7fbe2051ab41d1208..fcc61e6913bc4120debdf844c8a1c398237706a0 100644
--- a/dumux/material/fluidsystems/h2oairmesitylene.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylene.hh
@@ -433,9 +433,9 @@ public:
      *
      * In this case, things are actually pretty simple. We have an ideal
      * solution. Thus, the fugacity coefficient is 1 in the gas phase
-     * (fugacity equals the partial pressure of the component in the gas phase
-     * respectively in the liquid phases it is the inverse of the
-     * Henry coefficients scaled by pressure
+     * (fugacity equals the partial pressure of the component in the gas phase)
+     * respectively in the liquid phases it is the Henry coefficients divided
+     * by pressure.
      * \param fluidState The fluid state
      * \param phaseIdx The index of the phase
      * \param compIdx The index of the component
diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh
index db69d570c91e7fe71f9ed23af64e2705bda07100..62e12f5a9b696dcddbf547cb4cf00c3180486f0f 100644
--- a/dumux/material/fluidsystems/h2oairxylene.hh
+++ b/dumux/material/fluidsystems/h2oairxylene.hh
@@ -430,9 +430,9 @@ public:
      *
      * In this case, things are actually pretty simple. We have an ideal
      * solution. Thus, the fugacity coefficient is 1 in the gas phase
-     * (fugacity equals the partial pressure of the component in the gas phase
-     * respectively in the liquid phases it is the inverse of the
-     * Henry coefficients scaled by pressure
+     * (fugacity equals the partial pressure of the component in the gas phase)
+     * respectively in the liquid phases it is the Henry coefficients
+     * divided by pressure.
      */
     template <class FluidState>
     static Scalar fugacityCoefficient(const FluidState &fluidState,
diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh
index 09c6b96d1bf4e254b0502a5a2c6466d444a0ec73..4c5552b0d19bf7e86dde970017a4993ac5186f7b 100644
--- a/dumux/material/fluidsystems/h2on2o2.hh
+++ b/dumux/material/fluidsystems/h2on2o2.hh
@@ -539,7 +539,7 @@ public:
      * where \f$p_\alpha\f$ is the pressure of the fluid phase.
      *
      * For liquids with very low miscibility this boils down to the
-     * inverse Henry constant for the solutes and the saturated vapor pressure
+     * Henry constant for the solutes and the saturated vapor pressure
      * both divided by phase pressure.
      */
     template <class FluidState>
diff --git a/dumux/material/fluidsystems/purewatersimple.hh b/dumux/material/fluidsystems/purewatersimple.hh
index 3305b021451f4040a8a4c8da62a8961c29097c1c..abc1da5ef4a10ad32d2f8d6c6cf7de4cf6d47e55 100644
--- a/dumux/material/fluidsystems/purewatersimple.hh
+++ b/dumux/material/fluidsystems/purewatersimple.hh
@@ -372,7 +372,7 @@ public:
 
     using Base::fugacityCoefficient;
     /*!
-     * \brief Calculate the fugacity coefficient \f$\mathrm{[Pa]}\f$ of an individual
+     * \brief Calculate the fugacity coefficient \f$\mathrm{[-]}\f$ of an individual
      *        component in a fluid phase
      *
      * The fugacity coefficient \f$\phi^\kappa_\alpha\f$ of
diff --git a/dumux/material/fluidsystems/spe5.hh b/dumux/material/fluidsystems/spe5.hh
index 03bf1500578fe7a3f801826be551e6555c4f6a1b..25fc09b7e3379468e925dbe704b5aacaf4437a5e 100644
--- a/dumux/material/fluidsystems/spe5.hh
+++ b/dumux/material/fluidsystems/spe5.hh
@@ -415,7 +415,7 @@ public:
     }
 
     /*!
-     * \brief Calculate the fugacity coefficient \f$\mathrm{[Pa]}\f$ of an individual
+     * \brief Calculate the fugacity coefficient \f$\mathrm{[-]}\f$ of an individual
      *        component in a fluid phase
      *
      * The fugacity coefficient \f$\mathrm{\phi^\kappa_\alpha}\f$ is connected