diff --git a/doc/handbook/dumux-handbook.bib b/doc/handbook/dumux-handbook.bib
index a88b369b0d43f2a50ee3b1ed879865918c311168..1ed37d81dbdedb28f1c2d016a3fdf0179ffdb1e2 100644
--- a/doc/handbook/dumux-handbook.bib
+++ b/doc/handbook/dumux-handbook.bib
@@ -74,7 +74,8 @@
 	of PEM fuel cells}},
   journal = {Journal of Power Sources},
   year = {2006},
-  pages = {in print}
+  pages = {in print},
+  url={https://dx.doi.org/10.1016/j.jpowsour.2005.12.068}
 }
 
 @article{adams2002,
@@ -420,6 +421,19 @@
   number = {4}
 }
 
+@article{duan2003,
+  title={{An improved model calculating CO 2 solubility in pure water and aqueous NaCl solutions from 273 to 533 K and from 0 to 2000 bar}},
+  author={Duan, Z. and Sun, R.},
+  journal={Chemical geology},
+  volume={193},
+  number={3},
+  pages={257--271},
+  year={2003},
+  publisher={Elsevier},
+  url={https://dx.doi.org/10.1016/S0009-2541(02)00263-2}
+}
+
+
 @INPROCEEDINGS{A3:edwards:1994,
   author = {Edwards, M. G. and Rogers, C. F.},
   title = {{A flux continuous scheme for the full tensor pressure equation}},
@@ -446,6 +460,27 @@
   pages = {433--449}
 }
 
+@article{ferrell1967,
+  title={{Diffusion coefficients of nitrogen and oxygen in water}},
+  author={Ferrell, R. T. and Himmelblau, D. M.},
+  journal={Journal of chemical and engineering data},
+  volume={12},
+  number={1},
+  pages={111--115},
+  year={1967},
+  publisher={ACS Publications},
+  url={https://dx.doi.org/10.1021/je60032a036}
+}
+
+@book{finsterle1993,
+  title={{Inverse Modellierung zur Bestimmung hydrogeologischer Parameter eines Zweiphasensystems}},
+  author={Finsterle, Stefan},
+  year={1993},
+  publisher={VAW},
+  url={http://tocs.ulb.tu-darmstadt.de/26322307.pdf}
+}
+
+
 @TECHREPORT{A3:forsyth:1993,
   author = {Forsyth, P. A.},
   title = {{Three dimensional modeling of steam flush for DNAPL site remediation}},
@@ -705,6 +740,14 @@
   author = {Looney, B. B. and Falta, R. W.}
 }
 
+@article{lyman1990,
+  title={{Handbook of chemical property estimation methods: environmental behavior of organic compounds}},
+  author={Lyman, W. J. and Reehl, W. F. and Rosenblatt, D. H.},
+  year={1990},
+  publisher={Washington, DC (United States); American Chemical Society},
+  url={https://www.osti.gov/scitech/biblio/6902382}
+}
+
 @BOOK{MEISTER2008,
   title = {{Numerik linearer Gleichungssysteme: Eine Einf\"{u}hrung in moderne
 	Verfahren.}},
@@ -807,6 +850,16 @@
   year = {2005}
 }
 
+@article{ochs2008,
+  title={{Structural and electrochemical characterization of zirconium and silicon based sol-gel coatings for corrosion protection}},
+  author={Ochs, C.J. and Sittner, F. and Ugas-Carri{\'o}n, R. and Yekehtaz, M. and Ensinger, W.},
+  journal={Current Topics in Electrochemistry},
+  volume={13},
+  pages={59--65},
+  year={2008},
+  url={https://www.researchgate.net/profile/Christopher_Ochs/publication/229811805_Structural_and_electrochemical_characterization_of_zirconium_and_silicon_based_sol-gel_coatings_for_corrosion_protection/links/09e41501118fbee7b2000000.pdf}
+}
+
 @BOOK{ORTEGA2000,
   title = {{Iterative Solution of Nonlinear Equations in Several Variables}},
   publisher = {Society for Industrial and Applied Mathematics},
@@ -926,6 +979,14 @@
   url={https://dx.doi.org/10.1088/0026-1394/8/1/002}
 }
 
+@misc{sander1999,
+  title={{Compilation of Henry's law constants for inorganic and organic species of potential importance in environmental chemistry}},
+  author={Sander, R.},
+  year={1999},
+  publisher={Max-Planck Institute of Chemistry, Air Chemistry Department Mainz, Germany},
+  url={http://enviromap.utah.gov/businesses/E/EnSolutions/depleteduranium/performassess/compliancereport/docs/2014/07Jul/supinfo/appreferences/Sander1999.pdf}
+}
+
 @PHDTHESIS{SHETA1999,
   author = {H. Sheta},
   title = {{Simulation von Mehrphasenvorg\"{a}engen in por\"{o}sen Medien unter
@@ -993,6 +1054,40 @@
   key = {Sae05}
 }
 
+@article{spycher2003,
+  title={{CO 2-H 2 O mixtures in the geological sequestration of CO 2. I. Assessment and calculation of mutual solubilities from 12 to 100 C and up to 600 bar}},
+  author={Spycher, N. and Pruess, K. and Ennis-King, J.},
+  journal={Geochimica et cosmochimica acta},
+  volume={67},
+  number={16},
+  pages={3015--3031},
+  year={2003},
+  publisher={Elsevier},
+  url={https://dx.doi.org/10.1016/S0016-7037(03)00273-4}
+}
+
+
+@article{spycher2005,
+  title={{CO 2-H 2 O mixtures in the geological sequestration of CO 2. II. Partitioning in chloride brines at 12--100 C and up to 600 bar}},
+  author={Spycher, N. and Pruess, K.},
+  journal={Geochimica et Cosmochimica Acta},
+  volume={69},
+  number={13},
+  pages={3309--3320},
+  year={2005},
+  publisher={Elsevier},
+  url={https://dx.doi.org/10.1016/j.gca.2005.01.015}
+}
+
+%no doi or link available
+@article{tchobanoglous1985,
+  title={Water Quality: Characteristics},
+  author={Tchobanoglous, G and Schroeder, ED},
+  journal={Modeling, Modification: Addison-Wesley},
+  year={1985}
+}
+
+
 @ARTICLE{TENG2000,
   author = {H. Teng and T. S. Zhao},
   title = {{An extension of Darcy's law to non-Stokes flow in porous media}},
@@ -1072,6 +1167,42 @@
   url={https://dx.doi.org/10.1021/je60084a016}
 }
 
+@article{vargaftik1975,
+  title={{Tables on the thermophysical properties of liquids and gases in normal and dissociated states}},
+  author={Vargaftik, Natan B},
+  year={1975},
+  publisher={Hemisphere},
+  url={https://cds.cern.ch/record/101055}
+}
+
+@article{watanabe2004,
+  title={{Guideline on the Henry's Constant and Vapor-Liquid Distribution Constant for Gases in H2O and D2O at High Temperatures}},
+  author={Watanabe, K and Dooley, RB},
+  journal={International Association for the Properties of Water and Steam},
+  year={2004},
+  url={https://www.iapws.org/relguide/HenGuide.pdf}
+}
+
+@techreport{walker1981,
+  title={{Studies of heat transfer and water migration in soils. Final report}},
+  author={Walker, WR and Sabey, JD and Hampton, DR},
+  year={1981},
+  institution={Colorado State Univ., Fort Collins (USA). Solar Energy Applications Lab.},
+  url={https://www.osti.gov/scitech/biblio/6149346}
+}
+
+@article{xu2003,
+  title={{Diffusion of water in liquid and supercritical carbon dioxide: an NMR study}},
+  author={Xu, B. and Nagashima, K. and DeSimone, J. M. and Johnson, C. S.},
+  journal={The Journal of Physical Chemistry A},
+  volume={107},
+  number={1},
+  pages={1--3},
+  year={2003},
+  publisher={ACS Publications},
+  url={https://dx.doi.org/10.1021/jp021943g}
+}
+
 @MISC{ALBERTA-HP,
   title = {{The {ALBERTA} Website: \url{http://www.alberta-fem.de/}}},
   key = {ALBERTA}
diff --git a/dumux/material/binarycoefficients/air_mesitylene.hh b/dumux/material/binarycoefficients/air_mesitylene.hh
index 1cb4ee9b72de51beddaeaf38530332f88915c767..bf6f2898b6f73e9cbfb4e8bdc2792e7342c23866 100644
--- a/dumux/material/binarycoefficients/air_mesitylene.hh
+++ b/dumux/material/binarycoefficients/air_mesitylene.hh
@@ -52,8 +52,7 @@ public:
     /*!
      * \brief Binary diffusion coefficent \f$\mathrm{[m^2/s]}\f$ for air and mesitylene.
      * I used the method according to Wilke and Lee
-     * see Handbook of chem. property's Estimation Methods
-     * W.J. Lyman, W.F. Reehl, D.H. Rosenblatt
+     * see W.J. Lyman, W.F. Reehl, D.H. Rosenblatt (1990) \cite lyman1990 <BR>
      * \param temperature temperature in \f$\mathrm{[K]}\f$
      * \param pressure pressure in \f$\mathrm{[Pa]}\f$
      *
diff --git a/dumux/material/binarycoefficients/air_xylene.hh b/dumux/material/binarycoefficients/air_xylene.hh
index 0f335637080d64c0817707d8437dd70083b1684c..a59d66d668057735d38feb35535602b66b92d6fd 100644
--- a/dumux/material/binarycoefficients/air_xylene.hh
+++ b/dumux/material/binarycoefficients/air_xylene.hh
@@ -52,8 +52,7 @@ public:
     /*!
      * \brief Binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ for air and xylene.
      * method according to Wilke and Lee
-     * see Handbook of chem. property's Estimation Methods
-     * W.J. Lyman, W.F. Reehl, D.H. Rosenblatt
+     * see W.J. Lyman, W.F. Reehl, D.H. Rosenblatt (1990) \cite lyman1990 <BR>
      * \param temperature temperature in \f$\mathrm{[K]}\f$
      * \param pressure pressure in \f$\mathrm{[Pa]}\f$
      *
diff --git a/dumux/material/binarycoefficients/brine_air.hh b/dumux/material/binarycoefficients/brine_air.hh
index 51b5ffec1a819a79e9bc91fe747efb350f633877..72ab50ecc4354a78f1c98b75aa91a22889813055 100644
--- a/dumux/material/binarycoefficients/brine_air.hh
+++ b/dumux/material/binarycoefficients/brine_air.hh
@@ -48,7 +48,7 @@ public:
     /*!
      * \brief Binary diffusion coefficent \f$\mathrm{[m^2/s]}\f$ of water in the Air phase.
      *
-     * According to "Diffusion of Water in Liquid and Supercritical Carbon Dioxide: An NMR Study",Bin Xu et al., 2002
+     * According to B. Xu et al. (2003) \cite xu2003 <BR>
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pressure the phase pressure \f$\mathrm{[Pa]}\f$
      */
@@ -79,12 +79,9 @@ public:
         *
         * See:
         *
-        * R. Reid et al.: "The properties of Gases and Liquids", 4th edition,
-        * pp. 599, McGraw-Hill, 1987
+        * R. Reid et al. (1987, pp. 599) \cite reid1987 <BR>
         *
-        * R. Ferrell, D. Himmelblau: "Diffusion Coeffients of Nitrogen and
-        * Oxygen in Water", Journal of Chemical Engineering and Data,
-        * Vol. 12, No. 1, pp. 111-115, 1967
+        * R. Ferrell, D. Himmelblau (1967, pp. 111-115) \cite ferrell1967
         */
     static Scalar liquidDiffCoeff(Scalar temperature, Scalar pressure) {
         //Diffusion coefficient of Air in the H2O phase
@@ -99,9 +96,9 @@ public:
      *        for a given temperature, pressure, Air density and brine
      *        XlNaCl.
      *
-     *        Implemented according to "Spycher and Pruess 2005"
-     *        applying the activity coefficient expression of "Duan and Sun 2003"
-     *        and the correlations for pure water given in "Spycher, Pruess and Ennis-King 2003"
+     *        Implemented according to Spycher and Pruess (2005) \cite spycher2005 <BR>
+     *        applying the activity coefficient expression of Duan and Sun (2003) \cite duan2003 <BR>
+     *        and the correlations for pure water given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      *
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -156,7 +153,7 @@ public:
 
     /*!
      * \brief Returns the fugacity coefficient \f$\mathrm{[-]}\f$ of the Air component in a water-Air mixture
-     * (given in Spycher, Pruess and Ennis-King (2003))
+     * (given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 )
      *
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -182,7 +179,7 @@ public:
 
     /*!
      * \brief Returns the fugacity coefficient \f$\mathrm{[-]}\f$ of the H2O component in a water-Air mixture
-     * (given in Spycher, Pruess and Ennis-King (2003))
+     * (given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 )
      *
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -256,8 +253,8 @@ private:
 
     /*!
      * \brief Returns the activity coefficient of Air in brine for a
-     *           molal description. According to "Duan and Sun 2003"
-     *           given in "Spycher and Pruess 2005"
+     *           molal description. According to Duan and Sun (2003) \cite duan2003 <BR>
+     *           given in Spycher and Pruess (2005) \cite spycher2005 <BR>
      *
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -276,7 +273,7 @@ private:
     /*!
      * \brief Returns the paramater A for the calculation of
      * them mutual solubility in the water-Air system.
-     * Given in Spycher, Pruess and Ennis-King (2003)
+     * Given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      *
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -296,7 +293,7 @@ private:
     /*!
      * \brief Returns the paramater B for the calculation of
      * the mutual solubility in the water-Air system.
-     * Given in Spycher, Pruess and Ennis-King (2003)
+     * Given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      *
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -316,7 +313,7 @@ private:
     /*!
      * \brief Returns the parameter lambda, which is needed for the
      * calculation of the Air activity coefficient in the brine-Air system.
-     * Given in Spycher and Pruess (2005)
+     * Given in Spycher and Pruess (2005) \cite spycher2005 <BR>
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
      */
@@ -335,7 +332,7 @@ private:
     /*!
      * \brief Returns the parameter xi, which is needed for the
      * calculation of the Air activity coefficient in the brine-Air system.
-     * Given in Spycher and Pruess (2005)
+     * Given in Spycher and Pruess (2005) \cite spycher2005 <BR>
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
      */
@@ -353,7 +350,7 @@ private:
     /*!
      * \brief Returns the equilibrium constant for Air, which is needed for the
      * calculation of the mutual solubility in the water-Air system
-     * Given in Spycher, Pruess and Ennis-King (2003)
+     * Given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      * \param T the temperature \f$\mathrm{[K]}\f$
      */
     static Scalar equilibriumConstantAir_(Scalar T) {
@@ -367,7 +364,7 @@ private:
     /*!
      * \brief Returns the equilibrium constant for H2O, which is needed for the
      * calculation of the mutual solubility in the water-Air system
-     * Given in Spycher, Pruess and Ennis-King (2003)
+     * Given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      * \param T the temperature \f$\mathrm{[K]}\f$
      */
     static Scalar equilibriumConstantH2O_(Scalar T) {
diff --git a/dumux/material/binarycoefficients/brine_co2.hh b/dumux/material/binarycoefficients/brine_co2.hh
index de2065a253eb622f2855d34df4bbdb8a5f231865..a402b55520951225a25bda8d2cfe2a7a1d0eb6d4 100644
--- a/dumux/material/binarycoefficients/brine_co2.hh
+++ b/dumux/material/binarycoefficients/brine_co2.hh
@@ -47,8 +47,7 @@ public:
     /*!
      * \brief Binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ of water in the CO2 phase.
      *
-     * According to "Diffusion of Water in Liquid and Supercritical Carbon
-     * Dioxide: An NMR Study", Bin Xu et al., 2002.
+     * According to B. Xu et al. (2002) \cite xu2003 <BR>
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pressure the phase pressure \f$\mathrm{[Pa]}\f$
      */
@@ -82,9 +81,9 @@ public:
      *        for a given temperature, pressure, CO2 density and brine
      *        salinity.
      *
-     *        Implemented according to "Spycher and Pruess 2005"
-     *        applying the activity coefficient expression of "Duan and Sun 2003"
-     *        and the correlations for pure water given in "Spycher, Pruess and Ennis-King 2003"
+     *        Implemented according to Spycher and Pruess (2005) \cite spycher2005 <BR>
+     *        applying the activity coefficient expression of Duan and Sun (2003) \cite duan2003 <BR>
+     *        and the correlations for pure water given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      *
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -137,7 +136,7 @@ public:
 
     /*!
      * \brief Returns the fugacity coefficient of the CO2 component in a water-CO2 mixture
-     * (given in Spycher, Pruess and Ennis-King (2003))
+     * (given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 )
      *
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -163,7 +162,7 @@ public:
 
     /*!
      * \brief Returns the fugacity coefficient of the H2O component in a water-CO2 mixture
-     * (given in Spycher, Pruess and Ennis-King (2003))
+     * (given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 )
      *
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -235,8 +234,8 @@ private:
 
     /*!
      * \brief Returns the activity coefficient of CO2 in brine for a
-     *           molal description. According to "Duan and Sun 2003"
-     *           given in "Spycher and Pruess 2005"
+     *           molal description. According to Duan and Sun (2003) \cite duan2003 <BR>
+     *           given in Spycher and Pruess (2005) \cite spycher2005 <BR>
      *
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -255,7 +254,7 @@ private:
     /*!
      * \brief Returns the paramater A for the calculation of
      * them mutual solubility in the water-CO2 system.
-     * Given in Spycher, Pruess and Ennis-King (2003)
+     * Given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      *
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -275,7 +274,7 @@ private:
     /*!
      * \brief Returns the paramater B for the calculation of
      * the mutual solubility in the water-CO2 system.
-     * Given in Spycher, Pruess and Ennis-King (2003)
+     * Given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      *
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
@@ -295,7 +294,7 @@ private:
     /*!
      * \brief Returns the parameter lambda, which is needed for the
      * calculation of the CO2 activity coefficient in the brine-CO2 system.
-     * Given in Spycher and Pruess (2005)
+     * Given in Spycher and Pruess (2005) \cite spycher2005 <BR>
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
      */
@@ -314,7 +313,7 @@ private:
     /*!
      * \brief Returns the parameter xi, which is needed for the
      * calculation of the CO2 activity coefficient in the brine-CO2 system.
-     * Given in Spycher and Pruess (2005)
+     * Given in Spycher and Pruess (2005) \cite spycer2005 <BR>
      * \param T the temperature \f$\mathrm{[K]}\f$
      * \param pg the gas phase pressure \f$\mathrm{[Pa]}\f$
      */
@@ -332,7 +331,7 @@ private:
     /*!
      * \brief Returns the equilibrium constant for CO2, which is needed for the
      * calculation of the mutual solubility in the water-CO2 system
-     * Given in Spycher, Pruess and Ennis-King (2003)
+     * Given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      * \param T the temperature \f$\mathrm{[K]}\f$
      */
     static Scalar equilibriumConstantCO2_(Scalar T) {
@@ -346,7 +345,7 @@ private:
     /*!
      * \brief Returns the equilibrium constant for H2O, which is needed for the
      * calculation of the mutual solubility in the water-CO2 system
-     * Given in Spycher, Pruess and Ennis-King (2003)
+     * Given in Spycher, Pruess and Ennis-King (2003) \cite spycher2003 <BR>
      * \param T the temperature \f$\mathrm{[K]}\f$
      */
     static Scalar equilibriumConstantH2O_(Scalar T) {
diff --git a/dumux/material/binarycoefficients/fullermethod.hh b/dumux/material/binarycoefficients/fullermethod.hh
index 42cee693f117f13a4238d62ed62763c5be5bf4a3..0d5383024d35097296c73cb02d70e830bc58aaae 100644
--- a/dumux/material/binarycoefficients/fullermethod.hh
+++ b/dumux/material/binarycoefficients/fullermethod.hh
@@ -43,8 +43,7 @@ namespace BinaryCoeff
  * using to the method proposed by Fuller. This method and is only
  * valid at "low" pressures.
  *
- * See: R. Reid, et al.: The Properties of Gases and Liquids, 4th
- * edition, McGraw-Hill, 1987, pp. 587-588
+ * See: R. Reid, et al. (1987, pp. 587-588) \cite reid1987
  */
 template <class Scalar>
 inline Scalar fullerMethod(const Scalar *M, // molar masses [g/mol]
diff --git a/dumux/material/binarycoefficients/h2o_air.hh b/dumux/material/binarycoefficients/h2o_air.hh
index 1d2486af906437e9d6ddcb1bd272030d82ef9450..3731d68a9a1054e82d60a7a4f2c954897202fed5 100644
--- a/dumux/material/binarycoefficients/h2o_air.hh
+++ b/dumux/material/binarycoefficients/h2o_air.hh
@@ -42,10 +42,8 @@ public:
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      *
      * Henry coefficient See:
-     * Stefan Finsterle, 1993
-     * Inverse Modellierung zur Bestimmung hydrogeologischer Parameter eines Zweiphasensystems
-     * page 29 Formula (2.9) (nach Tchobanoglous & Schroeder, 1985)
-     *
+     * Stefan Finsterle (1993, page 29 Formula (2.9)) \cite finsterle1993 <BR>
+     * (nach Tchobanoglous & Schroeder, 1985 \cite tchobanoglous1985 )
      */
     template <class Scalar>
     static Scalar henry(Scalar temperature)
@@ -61,11 +59,10 @@ public:
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * \param pressure the phase pressure \f$\mathrm{[Pa]}\f$
      * Vargaftik: Tables on the thermophysical properties of liquids and gases.
-     * John Wiley & Sons, New York, 1975.
-     *
+     * John Wiley & Sons, New York, 1975. \cite vargaftik1975 <BR>
      * Walker, Sabey, Hampton: Studies of heat transfer and water migration in soils.
      * Dep. of Agricultural and Chemical Engineering, Colorado State University,
-     * Fort Collins, 1981.
+     * Fort Collins, 1981. \cite walker1981
      */
     template <class Scalar>
     static Scalar gasDiffCoeff(Scalar temperature, Scalar pressure)
@@ -97,12 +94,9 @@ public:
      *
      * See:
      *
-     * R. Reid et al.: "The properties of Gases and Liquids", 4th edition,
-     * pp. 599, McGraw-Hill, 1987
+     * R. Reid et al. (1987, pp. 599) \cite reid1987 <BR>
      *
-     * R. Ferrell, D. Himmelblau: "Diffusion Coefficients of Nitrogen and
-     * Oxygen in Water", Journal of Chemical Engineering and Data,
-     * Vol. 12, No. 1, pp. 111-115, 1967
+     * R. Ferrell, D. Himmelblau (1967, pp. 111-115) \cite ferrell1967
      */
     template <class Scalar>
     static Scalar liquidDiffCoeff(Scalar temperature, Scalar pressure)
diff --git a/dumux/material/binarycoefficients/h2o_mesitylene.hh b/dumux/material/binarycoefficients/h2o_mesitylene.hh
index 6d3456e38995f881f7bb273e6f47c97c67fe965a..54dd75e0101d6d8dcbe07545dbe18207405f7212 100644
--- a/dumux/material/binarycoefficients/h2o_mesitylene.hh
+++ b/dumux/material/binarycoefficients/h2o_mesitylene.hh
@@ -43,7 +43,7 @@ public:
      * \param temperature the temperature \f$\mathrm{[K]}\f$
      * See:
      *
-     *  Sanders1999 Henry collection
+     *  R. Sander (1999) \cite sander1999
      */
     template <class Scalar>
     static Scalar henry(Scalar temperature)
diff --git a/dumux/material/binarycoefficients/h2o_n2.hh b/dumux/material/binarycoefficients/h2o_n2.hh
index 93f1d6f2322f4b96f1ec0cbe747c0b3e7f0c59d4..8f85c01f999127292bbde4d7efe86deef9d9a09f 100644
--- a/dumux/material/binarycoefficients/h2o_n2.hh
+++ b/dumux/material/binarycoefficients/h2o_n2.hh
@@ -91,12 +91,9 @@ public:
      *
      * See:
      *
-     * R. Reid et al.: "The properties of Gases and Liquids", 4th edition,
-     * pp. 599, McGraw-Hill, 1987
+     * R. Reid et al. (1987, pp. 599) \cite reid1987 <BR>
      *
-     * R. Ferrell, D. Himmelblau: "Diffusion Coeffients of Nitrogen and
-     * Oxygen in Water", Journal of Chemical Engineering and Data,
-     * Vol. 12, No. 1, pp. 111-115, 1967
+     * R. Ferrell, D. Himmelblau (1967, pp. 111-115) \cite ferrell1967
      */
     template <class Scalar>
     static Scalar liquidDiffCoeff(Scalar temperature, Scalar pressure)
diff --git a/dumux/material/binarycoefficients/h2o_o2.hh b/dumux/material/binarycoefficients/h2o_o2.hh
index 36ba3fa5d6d8a40b6c09b64b2eab877ddd70c843..4a20c83d257eff18fd472b830f36dea42c0313c0 100644
--- a/dumux/material/binarycoefficients/h2o_o2.hh
+++ b/dumux/material/binarycoefficients/h2o_o2.hh
@@ -91,12 +91,9 @@ public:
      *
      * See:
      *
-     * R. Reid et al.: "The properties of Gases and Liquids", 4th edition,
-     * pp. 599, McGraw-Hill, 1987
+     * R. Reid et al. (1987, pp. 599) \cite reid1987 <BR>
      *
-     * R. Ferrell, D. Himmelblau: "Diffusion Coeffients of Nitrogen and
-     * Oxygen in Water", Journal of Chemical Engineering and Data,
-     * Vol. 12, No. 1, pp. 111-115, 1967
+     * R. Ferrell, D. Himmelblau (1967, pp. 111-115) \cite ferrell1967
      */
     template <class Scalar>
     static Scalar liquidDiffCoeff(Scalar temperature, Scalar pressure)
diff --git a/dumux/material/binarycoefficients/h2o_xylene.hh b/dumux/material/binarycoefficients/h2o_xylene.hh
index c35fc34ea9586af8a1c8ec4f090253586e2ca064..f02fa606bef80b12d09c82a8852c031117d3b04b 100644
--- a/dumux/material/binarycoefficients/h2o_xylene.hh
+++ b/dumux/material/binarycoefficients/h2o_xylene.hh
@@ -44,13 +44,13 @@ public:
      *
      * See:
      *
-     *  Sanders1999 Henry collection
+     *  Sander (1999) \cite sander1999
      */
 
     template <class Scalar>
     static Scalar henry(Scalar temperature)
     {
-        // after Sanders
+        // after Sander
         Scalar sanderH = 1.5e-1;    //[M/atm]
         //conversion to our Henry definition
         Scalar dumuxH = sanderH / 101.325; // has now [(mol/m^3)/Pa]
diff --git a/dumux/material/binarycoefficients/henryiapws.hh b/dumux/material/binarycoefficients/henryiapws.hh
index 01f04dc2d695a785ca234487e6a7b9178754dbf8..5f5997f3a0dec94483671621bb18f6ed580fff9d 100644
--- a/dumux/material/binarycoefficients/henryiapws.hh
+++ b/dumux/material/binarycoefficients/henryiapws.hh
@@ -43,8 +43,7 @@ namespace Dumux
  * IAPWS: "Guideline on the Henry's Constant and Vapor-Liquid
  * Distribution Constant for Gases in H2O and D2O at High
  * Temperatures"
- * Equation (5)
- * http://www.iapws.org/relguide/HenGuide.pdf
+ * Equation (5) \cite watanabe2004 <BR>
  *
  * Range of validity: T = {278.12 ; 636.46}
  * approximations beyond this range are increasingly incorrect.
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistry.hh b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
index 566ef266e2c1c744c46f5b397876b233a04a658e..ae87a01cbede635988acd9a8fa99ee56b86923f3 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistry.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
@@ -46,14 +46,14 @@ NEW_PROP_TAG(VolumeVariables);
 
 /*!
  * \brief
- * The type of electrochemistry models implemented here (Ochs [2008] or Acosta et al. [2006])
+ * The type of electrochemistry models implemented here (Ochs (2008) \cite ochs2008 or Acosta et al. (2006) \cite A3:acosta:2006 )
  */
 enum ElectroChemistryModel { Ochs, Acosta };
 
 /*!
  * \brief
  * This class calculates source terms and current densities for fuel cells
- * with the electrochemical models suggested by Ochs [2008] or Acosta et al. [2006]
+ * with the electrochemical models suggested by Ochs (2008) \cite ochs2008 or Acosta et al. (2006) \cite A3:acosta:2006
  */
 template <class TypeTag, Dumux::ElectroChemistryModel electroChemistryModel>
 class ElectroChemistry
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
index f0a5da97f642fb0d683181b9961bedc477d5331e..45cee53c81528cef8096b25e197afabffcb61826 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
@@ -43,7 +43,7 @@ NEW_PROP_TAG(PrimaryVariables);
 /*!
 * \brief
 * Class calculating source terms and current densities for fuel cells
-* with the electrochemical models suggested by Ochs [2008] or Acosta [2006]
+* with the electrochemical models suggested by Ochs (2008) \cite ochs2008 or Acosta (2006) \cite A3:acosta:2006
 * for the non-isothermal case
 */
 template <class TypeTag, Dumux::ElectroChemistryModel electroChemistryModel>