diff --git a/doc/handbook/dumux-handbook.bib b/doc/handbook/dumux-handbook.bib
index f4d180655ff4624571ef4f862c59fbea390f8b16..97600f24dfb490c06031aaf4ea2f4f973edd4f45 100644
--- a/doc/handbook/dumux-handbook.bib
+++ b/doc/handbook/dumux-handbook.bib
@@ -727,7 +727,7 @@
   author={Finsterle, Stefan},
   year={1993},
   publisher={VAW},
-  url={http://tocs.ulb.tu-darmstadt.de/26322307.pdf}
+  url={https://www.ethz.ch/content/dam/ethz/special-interest/baug/vaw/vaw-dam/documents/das-institut/mitteilungen/1990-1999/121.pdf}
 }
 
 
@@ -1068,7 +1068,11 @@ url = {http://www.sciencedirect.com/science/article/pii/S0169772204001160}
   title={{Release of the IAPWS formulation 2008 for the viscosity of ordinary water substance}},
   author={Cooper, J. R. and Dooley, R. B.},
   year={2008},
-  publisher={The International Association of the Properties of Water and Steam, Berlin, Germany}
+  publisher={The International Association of the Properties of Water and Steam, Berlin, Germany},
+  number =      {IAPWS R12-08},
+  address =     {Berlin, Germany},
+  pages =       {9},
+  url={http://www.iapws.org/relguide/visc.pdf}
 }
 
 @MISC{A3:IAPWS:2003,
@@ -1086,7 +1090,10 @@ url = {http://www.sciencedirect.com/science/article/pii/S0169772204001160}
   title = {{Revised Release on the IAPWS Industrial Formulation 1997 for the
 	Thermodynamic Properties of Water and Steam}},
   howpublished = {\url{http://www.iapws.org/IF97-Rev.pdf}},
-  year = {1997}
+  year =        {1997},
+  number =      {IAPWS R7-97(2012)},
+  address =     {Lucerne, Switzerland},
+  pages =       {49},
 }
 
 @INPROCEEDINGS{A3:gimse:1991,
@@ -1302,7 +1309,7 @@ url={http://dx.doi.org/10.1007/s11242-015-0599-1}
 
 @book{poling2001,
   title={{The properties of gases and liquids}},
-  author={Poling, B. E. and Prausnitz, J. M. and O'Connell, J. P. and others},
+  author={Poling, B. E. and Prausnitz, J. M. and O'Connell, J. P.},
   volume={5},
   year={2001},
   publisher={McGraw-Hill New York},
@@ -1327,22 +1334,15 @@ url={http://dx.doi.org/10.1007/s11242-015-0599-1}
   number = {445}
 }
 
-@PHDTHESIS{CLASS2001,
-  author = {H. Class},
-  title = {{Theorie und numerische Modellierung nichtisothermer Mehrphasenprozesse
-	in NAPL-kontaminierten por\"{o}sen Medien.}},
-  school = {University of Stuttgart},
-  year = {2001}
-}
-
-@BOOK{A3:class:2001,
-  title = {{Theorie und numerische Modellierung nichtisothermer Mehrphasenprozesse
-	in NAPL-kontaminierten por\"osen Medien}},
-  publisher = {Institut f\"ur Wasserbau, Universit\"at Stuttgart},
-  year = {2001},
-  author = {Class, H.},
-  volume = {105},
-  series = {Mitteilungsheft}
+@PHDTHESIS{A3:class:2001,
+  author =    {Holger Class},
+  title =     {{Theorie und numerische Modellierung nichtisothermer Mehrphasenprozesse in NAPL-kontaminierten porösen Medien}},
+  school =    {Technische Universität Braunschweig},
+  year =      {2001},
+  note =      {\doi{10.18419/opus-223}},
+  doi =       {10.18419/opus-223},
+  file =      {Class2001a-Diss.pdf:Class2001a-Diss.pdf:PDF},
+  url =       {http://dx.doi.org/10.18419/opus-223}
 }
 
 @BOOK{A3:lancaster:1969,
@@ -1546,6 +1546,15 @@ url={http://dx.doi.org/10.1007/s11242-015-0599-1}
   url =    {https://www.dune-project.org/modules/dune-uggrid/}
 }
 
+@Techreport{IAPWS_ThCond,
+  author =      {IAPWS},
+  title =       {{Release on the IAPWS Formulation 2011 for the Thermal Conductivity of Ordinary Water Substance}},
+  institution = {The International Association for the Properties of Water and Steam},
+  year =        {2011},
+  number =      {IAPWS R15-11},
+  address =     {Plzeň, Czech Republic},
+  url =         {http://www.iapws.org/relguide/ThCond.pdf}
+}
 
 @Article{Lemmon2004a,
   author =    {Lemmon, E. W. and Jacobsen, R. T.},
diff --git a/dumux/material/components/h2o.hh b/dumux/material/components/h2o.hh
index c813b2903fb8c5a783aa6485c37b16ad9acd137a..acf9c76d58b658abf5eb0990ec98d1905eada017 100644
--- a/dumux/material/components/h2o.hh
+++ b/dumux/material/components/h2o.hh
@@ -124,7 +124,7 @@ public:
      * See:
      * IAPWS: "Revised Release on the IAPWS Industrial Formulation
      * 1997 for the Thermodynamic Properties of Water and Steam",
-     * http://www.iapws.org/relguide/IF97-Rev.pdf
+     * http://www.iapws.org/relguide/IF97-Rev.pdf \cite IAPWS1997
      */
     static Scalar vaporPressure(Scalar T)
     {
@@ -300,7 +300,7 @@ public:
      * See:
      * IAPWS: "Revised Release on the IAPWS Industrial Formulation
      * 1997 for the Thermodynamic Properties of Water and Steam",
-     * http://www.iapws.org/relguide/IF97-Rev.pdf
+     * http://www.iapws.org/relguide/IF97-Rev.pdf \cite IAPWS1997
      */
     static const Scalar liquidInternalEnergy(Scalar temperature,
                                              Scalar pressure)
@@ -350,7 +350,7 @@ public:
      * See:
      * IAPWS: "Revised Release on the IAPWS Industrial Formulation
      * 1997 for the Thermodynamic Properties of Water and Steam",
-     * http://www.iapws.org/relguide/IF97-Rev.pdf
+     * http://www.iapws.org/relguide/IF97-Rev.pdf  \cite IAPWS1997
     */
     static Scalar gasInternalEnergy(Scalar temperature, Scalar pressure)
     {
@@ -734,8 +734,10 @@ public:
      * freesteam - IAPWS-IF97 steam tables library
      * copyright (C) 2004-2009  John Pye
      *
-     * Appendix B: Recommended Interpolating equation for Industrial Use
-     * see http://www.iapws.org/relguide/thcond.pdf
+     * See:
+     * IAPWS: "Release on the IAPWS Formulation 2011 for the Thermal Conductivity
+     * of Ordinary Water Substance", http://www.iapws.org/relguide/ThCond.pdf
+     * \cite IAPWS_ThCond
      *
      * \param temperature absolute temperature in \f$\mathrm{[K]}\f$
      * \param pressure of the phase in \f$\mathrm{[Pa]}\f$
@@ -765,8 +767,10 @@ public:
      * freesteam - IAPWS-IF97 steam tables library
      * copyright (C) 2004-2009  John Pye
      *
-     * Appendix B: Recommended Interpolating equation for Industrial Use
-     * see http://www.iapws.org/relguide/thcond.pdf
+     * See:
+     * IAPWS: "Release on the IAPWS Formulation 2011 for the Thermal Conductivity
+     * of Ordinary Water Substance", http://www.iapws.org/relguide/ThCond.pdf
+     * \cite IAPWS_ThCond
      *
      * \param temperature absolute temperature in \f$\mathrm{[K]}\f$
      * \param pressure of the phase in \f$\mathrm{[Pa]}\f$