diff --git a/doc/handbook/dumux-handbook.bib b/doc/handbook/dumux-handbook.bib
index 1ed37d81dbdedb28f1c2d016a3fdf0179ffdb1e2..81d9a85eb737234a5c19c3d0691e87de9b25393a 100644
--- a/doc/handbook/dumux-handbook.bib
+++ b/doc/handbook/dumux-handbook.bib
@@ -123,6 +123,18 @@
   publisher = {Battelle Press, Columbus, OH, USA}
 }
 
+@article{ambrose1989,
+  title={{Vapour pressures up to their critical temperatures of normal alkanes and 1-alkanols}},
+  author={Ambrose, D and Walton, J},
+  journal={Pure and Applied Chemistry},
+  volume={61},
+  number={8},
+  pages={1395--1403},
+  year={1989},
+  url={https://dx.doi.org/10.1351/pac198961081395}
+}
+
+
 @BOOK{ANDERSON-CFD-95,
   title = {{Computational Fluid Mechanics}},
   publisher = {McGraw-Hill},
@@ -412,6 +424,19 @@
   pages = {191-214}
 }
 
+@article{delshad1989,
+  title={{Comparison of the three-phase oil relative permeability models}},
+  author={Delshad, M. and Pope, G. A.},
+  journal={Transport in Porous Media},
+  volume={4},
+  number={1},
+  pages={59--83},
+  year={1989},
+  publisher={Springer},
+  url={https://dx.doi.org/10.1007/BF00134742}
+}
+
+
 @ARTICLE{DITTERICH1996,
   author = {E. Ditterich},
   title = {{Wirbel um den Bodenschutz}},
@@ -433,6 +458,14 @@
   url={https://dx.doi.org/10.1016/S0009-2541(02)00263-2}
 }
 
+@phdthesis{ebigbo2005,
+  title={{Thermal effects of carbon dioxide sequestration in the subsurface}},
+  author={Ebigbo, A.},
+  year={2005},
+  school={Master’s thesis, Institut f{\"u}r Wasserbau, Universit{\"a}t Stuttgart},
+  url={https://www.hydrosys.uni-stuttgart.de/institut/hydrosys/publikationen/paper/Dipl_Anozie_Ebigbo.pdf}
+}
+
 
 @INPROCEEDINGS{A3:edwards:1994,
   author = {Edwards, M. G. and Rogers, C. F.},
@@ -632,6 +665,28 @@
   year = {2000}
 }
 
+@article{joekar2008,
+  title={{Insights into the relationships among capillary pressure, saturation, interfacial area and relative permeability using pore-network modeling}},
+  author={Joekar-Niasar, V. and Hassanizadeh, S.M. and Leijnse, A.},
+  journal={Transport in Porous Media},
+  volume={74},
+  number={2},
+  pages={201--219},
+  year={2008},
+  publisher={Springer},
+  url={https://dx.doi.org/10.1007/s11242-007-9191-7}
+}
+
+
+@techreport{johansen1977,
+  title={{Thermal conductivity of soils}},
+  author={Johansen, O.},
+  year={1977},
+  institution={DTIC Document},
+  url={https://http://oai.dtic.mil/oai/oai?verb=getRecord&metadataPrefix=html&identifier=ADA044002}
+}
+
+
 @ARTICLE{KALUARACHCHI1992,
   author = {J. J. Kaluarachchi and J. C. Parker},
   title = {{Multiphase Flow with a Simplified Model for Oil Entrapment}},
@@ -812,6 +867,16 @@
   year = {2000}
 }
 
+@article{nield2006,
+  title={{Convection with Change of Phase}},
+  author={Nield, D. A. and Bejan, A.},
+  journal={Convection in Porous Media},
+  pages={403--452},
+  year={2006},
+  publisher={Springer},
+  url={https://dx.doi.org/10.1007/0-387-33431-9_10}
+}
+
 @ARTICLE{NIESSNER2005,
   author = {J. Niessner and R. Helmig and H. Jakobs and J. Roberts},
   title = {{Interface Condition and Exact Linearization in the Newton Iterations
@@ -850,6 +915,15 @@
   year = {2005}
 }
 
+%no doi or link available
+@phdthesis{nuske2009,
+  title={{Determination of interfacial area-capillary pressure-saturation relationships for a single fracture}},
+  author={Nuske, K.P.},
+  year={2009},
+  school={Master’s thesis, Universit{\"a}t Stuttgart}
+}
+
+
 @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.},
@@ -860,6 +934,19 @@
   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}
 }
 
+@article{oliveira2003,
+  title={{Estimation of primary drainage three-phase relative permeability for organic liquid transport in the vadose zone}},
+  author={Oliveira, L. I. and Demond, A. H.},
+  journal={Journal of Contaminant Hydrology},
+  volume={66},
+  number={3},
+  pages={261--285},
+  year={2003},
+  publisher={Elsevier},
+  url={https://dx.doi.org/10.1016/S0169-7722(03)00029-9}
+}
+
+
 @BOOK{ORTEGA2000,
   title = {{Iterative Solution of Nonlinear Equations in Several Variables}},
   publisher = {Society for Industrial and Applied Mathematics},
@@ -967,6 +1054,19 @@
   url = {\url{http://www.sciencedirect.com/science/article/B6V06-49NXY7J-F/2/e8260e5d8f19639019cddea4776c024c}}
 }
 
+@article{peng1976,
+  title={{A new two-constant equation of state}},
+  author={Peng, D.-Y. and Robinson, D. B.},
+  journal={Industrial \& Engineering Chemistry Fundamentals},
+  volume={15},
+  number={1},
+  pages={59--64},
+  year={1976},
+  publisher={ACS Publications},
+  url={https://dx.doi.org/10.1021/i160057a011}
+}
+
+
 @article{prydz1972,
   title={An Improved Oxygen Vapor Pressure Representation},
   author={Prydz, R.},
@@ -1054,6 +1154,19 @@
   key = {Sae05}
 }
 
+@article{somerton1974,
+  title={{Thermal behavior of unconsolidated oil sands}},
+  author={Somerton, W.H. and Keese, J.A. and Chu, S.L. and others},
+  journal={Society of Petroleum Engineers Journal},
+  volume={14},
+  number={05},
+  pages={513--521},
+  year={1974},
+  publisher={Society of Petroleum Engineers},
+  url={https://dx.doi.org/10.2118/4506-PA}
+}
+
+
 @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.},
@@ -1082,7 +1195,7 @@
 %no doi or link available
 @article{tchobanoglous1985,
   title={Water Quality: Characteristics},
-  author={Tchobanoglous, G and Schroeder, ED},
+  author={Tchobanoglous, G. and Schroeder, E.D.},
   journal={Modeling, Modification: Addison-Wesley},
   year={1985}
 }
@@ -1098,6 +1211,19 @@
   number = {14}
 }
 
+@article{ward1964,
+  title={{Turbulent flow in porous media}},
+  author={Ward, J.C.},
+  journal={Journal of the Hydraulics Division},
+  volume={90},
+  number={5},
+  pages={1--12},
+  year={1964},
+  publisher={ASCE},
+  url={https://cedb.asce.org/cgi/WWWdisplay.cgi?13255#}
+}
+
+
 @ARTICLE{A3:Wen:1996,
   author = {Wen, X. H. and G\'{o}mez-Hern\'{a}ndez, J. J.},
   title = {{Upscaling hydraulic conductivities in heterogenous media: An overview}},
@@ -1111,7 +1237,7 @@
   title = {{The Method of Volume Averaging}},
   publisher = {Kluwer Academic Publishers},
   year = {1999},
-  author = {Whitaker, Stephen},
+  author = {Whitaker, S.},
   volume = {13},
   series = {Theory and Applications of Transport in Porous Media},
   address = {Dordrecht}
diff --git a/dumux/material/eos/pengrobinson.hh b/dumux/material/eos/pengrobinson.hh
index 533884b40f8be143f27571d25782bddc0ff98ba2..effca8aa844efed3162584d57cff42c5339b7e63 100644
--- a/dumux/material/eos/pengrobinson.hh
+++ b/dumux/material/eos/pengrobinson.hh
@@ -24,12 +24,9 @@
  *
  * See:
  *
- * D.-Y. Peng, D.B. Robinson: A new two-constant equation of state,
- * Industrial & Engineering Chemistry Fundamentals, 1976, 15 (1),
- * pp. 59–64
+ * D.-Y. Peng, D.B. Robinson (1976, pp. 59–64) \cite peng1976 <BR>
  *
- * R. Reid, et al.: The Properties of Gases and Liquids,
- * 4th edition, McGraw-Hill, 1987, pp. 42-44, 82
+ * R. Reid, et al. (1987, pp. 42-44, 82) \cite reid1987
  */
 #ifndef DUMUX_PENG_ROBINSON_HH
 #define DUMUX_PENG_ROBINSON_HH
@@ -51,12 +48,9 @@ namespace Dumux
  *
  * See:
  *
- * D.-Y. Peng, D.B. Robinson: A new two-constant equation of state,
- * Industrial & Engineering Chemistry Fundamentals, 1976, 15 (1),
- * pp. 59–64
+ * D.-Y. Peng, D.B. Robinson (1976, pp. 59–64) \cite peng1976 <BR>
  *
- * R. Reid, et al.: The Properties of Gases and Liquids,
- * 4th edition, McGraw-Hill, 1987, pp. 42-44, 82
+ * R. Reid, et al. (1987, pp. 42-44, 82) \cite reid1987
  */
 template <class Scalar>
 class PengRobinson
@@ -449,9 +443,7 @@ protected:
      *
      * See:
      *
-     * D. Ambrose, J. Walton: "Vapor Pressures up to Their Critical
-     * Temperatures of Normal Alkanes and 1-Alkanols", Pure
-     * Appl. Chem., 61, 1395-1403, 1989
+     * D. Ambrose, J. Walton (1989, pp. 1395-1403) \cite ambrose1989
      */
     template <class Params>
     static Scalar ambroseWalton_(const Params &params, Scalar T)
diff --git a/dumux/material/eos/pengrobinsonmixture.hh b/dumux/material/eos/pengrobinsonmixture.hh
index 777374dce6fc9c10e0e82da7c99dacb5438de48d..d327668e7a462bf971c2b96283df0b42ae1a659e 100644
--- a/dumux/material/eos/pengrobinsonmixture.hh
+++ b/dumux/material/eos/pengrobinsonmixture.hh
@@ -86,8 +86,7 @@ public:
      *
      * See:
      *
-      * R. Reid, et al.: The Properties of Gases and Liquids,
-      * 4th edition, McGraw-Hill, 1987, pp. 42-44, 143-145
+      * R. Reid, et al. (1987, pp. 42-44, 143-145) \cite reid1987
       */
     template <class FluidState, class Params>
     static Scalar computeFugacityCoefficient(const FluidState &fs,
diff --git a/dumux/material/eos/pengrobinsonparams.hh b/dumux/material/eos/pengrobinsonparams.hh
index 3c1f411ebd7aa48d570a46632a5535ce61bfc2a8..203f0215adbe8fe9fd3645a440ca8a2902627125 100644
--- a/dumux/material/eos/pengrobinsonparams.hh
+++ b/dumux/material/eos/pengrobinsonparams.hh
@@ -24,8 +24,7 @@
  *
  * See:
  *
- * R. Reid, et al.: The Properties of Gases and Liquids, 4th edition,
- * McGraw-Hill, 1987, pp. 43-44
+ * R. Reid, et al. (1987, pp. 43-44) \cite reid1987
  */
 #ifndef DUMUX_PENG_ROBINSON_PARAMS_HH
 #define DUMUX_PENG_ROBINSON_PARAMS_HH
@@ -39,8 +38,7 @@ namespace Dumux
  *
  * See:
  *
- * R. Reid, et al.: The Properties of Gases and Liquids, 4th edition,
- * McGraw-Hill, 1987, pp. 43-44
+ * R. Reid, et al. (1987, pp. 43-44) \cite reid1987
  */
 template <class Scalar>
 class PengRobinsonParams
@@ -53,6 +51,7 @@ public:
     Scalar a() const
     { return a_; }
 
+
     /*!
      * \brief Returns the repulsive parameter 'b' of the Peng-Robinson
      *        fluid.
diff --git a/dumux/material/eos/pengrobinsonparamsmixture.hh b/dumux/material/eos/pengrobinsonparamsmixture.hh
index 608806efdcd3faf2a4f2ecf598dd364aeee6bbfc..e8371b2e7aa86361b0568faed829564c0e27ecf4 100644
--- a/dumux/material/eos/pengrobinsonparamsmixture.hh
+++ b/dumux/material/eos/pengrobinsonparamsmixture.hh
@@ -26,14 +26,11 @@
  *
  * See:
  *
- * R. Reid, et al.: The Properties of Gases and Liquids, 4th edition,
- * McGraw-Hill, 1987, pp. 43-44
+ * R. Reid, et al. (1987, pp. 43-44) \cite reid1987 <BR>
  *
  * and
  *
- * J.E. Killough, et al.: Fifth Comparative Solution Project:
- * Evaluation of Miscible Flood Simulators, Ninth SPE Symposium on
- * Reservoir Simulation, 1987
+ * J.E. Killough, et al. (1987) \cite SPE5
  */
 #ifndef DUMUX_PENG_ROBINSON_PARAMS_MIXTURE_HH
 #define DUMUX_PENG_ROBINSON_PARAMS_MIXTURE_HH
@@ -54,14 +51,11 @@ namespace Dumux
  *
  * See:
  *
- * R. Reid, et al.: The Properties of Gases and Liquids, 4th edition,
- * McGraw-Hill, 1987, pp. 43-44
+ * R. Reid, et al. (1987, pp. 43-44) \cite reis1987 <BR>
  *
  * and
  *
- * J.E. Killough, et al.: Fifth Comparative Solution Project:
- * Evaluation of Miscible Flood Simulators, Ninth SPE Symposium on
- * Reservoir Simulation, 1987
+ * J.E. Killough, et al. (1987) \cite SPE5
  */
 template <class Scalar, class FluidSystem, int phaseIdx, bool useSpe5Relations=false>
 class PengRobinsonParamsMixture
diff --git a/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh b/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh
index 1df1877531a01a0189b4e97d4e86c625dd064a46..1868fe91e68de99ef3074e0f18d155a1b5ee6fb2 100644
--- a/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh
@@ -74,7 +74,7 @@ namespace Dumux
  *        - the definition of the material law in the spatial parameters is not really intuitive, but using it is:
  *          Hand in values, get back values, do not deal with conversion.
  *
- *        CAREFULL: here w and n still stand for wetting and non-wetting. In the hydrophobic model w stands for
+ *        CAREFUL: here w and n still stand for wetting and non-wetting. In the hydrophobic model w stands for
  *        water (non-wetting) and n for non-water (wetting). Hence, Swr is the wetting phase (gas) residual
  *        saturation and needs to be set accordingly in the spatial parameters.
  */
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
index 99939985aa14afa45e735ead8587988133b2190a..975d8b3bc1cb738d8292b4fcb0a38d8ddabe4fc6 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
@@ -42,7 +42,7 @@ struct JohansenIndices
  *
  * \brief Relation for the saturation-dependent effective thermal conductivity
  *
- * The Johansen method (Johansen 1975) computes the thermal conductivity of dry and the
+ * The Johansen method (Johansen 1975 \cite johansen1977 ) computes the thermal conductivity of dry and the
  * wet soil material and uses a root function of the wetting saturation to compute the
  * effective thermal conductivity for a two-phase fluidsystem. The individual thermal
  * conductivities are calculated as geometric mean of the thermal conductivity of the porous
@@ -62,14 +62,14 @@ struct JohansenIndices
  \lambda_\text{dry} = \frac{0.135*\rho_s*\phi + 64.7}{\rho_s - 0.947 \rho_s*\phi}.
  }\f$
  *
- * Source: Phdthesis (Johansen1975) Johansen, O. Thermal conductivity of soils Norw. Univ. of Sci. Technol., Trondheim, Norway, 1975
+ * Source: Phdthesis (Johansen1975) Johansen, O. Thermal conductivity of soils Norw. Univ. of Sci. Technol., Trondheim, Norway, 1975 \cite johansen1977
  */
 template<class Scalar, class Indices = JohansenIndices>
 class ThermalConductivityJohansen
 {
 public:
     /*!
-     * \brief Returns the effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Johansen (1975).
+     * \brief Returns the effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Johansen (1975) \cite johansen1977 .
      *
      * \param volVars volume variables
      * \param spatialParams spatial parameters
@@ -77,7 +77,7 @@ public:
      * \param fvGeometry fvGeometry (to be passed to spatialParams)
      * \param scvIdx scvIdx (to be passed to spatialParams)
      *
-     * \return Effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Johansen (1975)
+     * \return Effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Johansen (1975) \cite johansen1977 <BR>
      *
      * This formulation is semi-empirical and fitted to quartz sand.
      * This gives an interpolation of the effective thermal conductivities of a porous medium
@@ -86,7 +86,7 @@ public:
      * fluid conductivities and interpolated with the Kersten number.<br>
      * Johansen, O. 1975. Thermal conductivity of soils. Ph.D. diss. Norwegian Univ.
      *                    of Sci. and Technol., Trondheim. (Draft Transl. 637. 1977. U.S. Army
-     *                    Corps of Eng., Cold Regions Res. and Eng. Lab., Hanover, NH.)
+     *                    Corps of Eng., Cold Regions Res. and Eng. Lab., Hanover, NH.) \cite johansen1977
      */
     template<class VolumeVariables, class SpatialParams, class Element, class FVGeometry>
     static Scalar effectiveThermalConductivity(const VolumeVariables& volVars,
@@ -106,7 +106,7 @@ public:
     }
 
     /*!
-     * \brief Returns the effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Johansen (1975).
+     * \brief Returns the effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Johansen (1975) \cite johansen1977 .
      *
      * \param Sw The saturation of the wetting phase
      * \param lambdaW The thermal conductivity of the wetting phase in \f$\mathrm{[W/(m K)]}\f$
@@ -115,7 +115,7 @@ public:
      * \param porosity The porosity
      * \param rhoSolid The density of solid phase in \f$\mathrm{[kg/m^3]}\f$
      *
-     * \return Effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Johansen (1975)
+     * \return Effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Johansen (1975) \cite johansen1977
      */
     static Scalar effectiveThermalConductivity(const Scalar Sw,
                                                const Scalar lambdaW,
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
index 85a328be2e8aef3f8c69f59b6d9d500abab4067c..8c50d28d5d4185995890c146b989b39124e5c356 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
@@ -67,7 +67,7 @@ class ThermalConductivitySomerton
 {
 public:
     /*!
-     * \brief effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974)
+     * \brief effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974) \cite somerton1974 <BR>
      *
      * \param volVars volume variables
      * \param spatialParams spatial parameters
@@ -75,13 +75,13 @@ public:
      * \param fvGeometry fvGeometry (to be passed to spatialParams)
      * \param scvIdx scvIdx (to be passed to spatialParams)
      *
-     * \return effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974)
+     * \return effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974) \cite somerton1974 <BR>
      *
      * This gives an interpolation of the effective thermal conductivities of a porous medium
      * filled with the non-wetting phase and a porous medium filled with the wetting phase.
      * These two effective conductivities are computed as geometric mean of the solid and the
      * fluid conductivities and interpolated with the square root of the wetting saturation.
-     * See f.e. Ebigbo, A.: Thermal Effects of Carbon Dioxide Sequestration in the Subsurface, Diploma thesis.
+     * See f.e. Ebigbo, A.: Thermal Effects of Carbon Dioxide Sequestration in the Subsurface, Diploma thesis \cite ebigbo2005 .
      */
     template<class VolumeVariables, class SpatialParams, class Element, class FVGeometry>
     static Scalar effectiveThermalConductivity(const VolumeVariables& volVars,
@@ -100,7 +100,7 @@ public:
     }
 
     /*!
-     * \brief effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974)
+     * \brief effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974) \cite somerton1974 <BR>
      *
      * \param sw The saturation of the wetting phase
      * \param lambdaW The thermal conductivity of the wetting phase in \f$\mathrm{[W/(m K)]}\f$
@@ -109,7 +109,7 @@ public:
      * \param porosity The porosity
      * \param rhoSolid The density of solid phase in \f$\mathrm{[kg/m^3]}\f$
      *
-     * \return effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974)
+     * \return effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974) \cite somerton1974
      */
     static Scalar effectiveThermalConductivity(const Scalar sw,
                                                const Scalar lambdaW,
diff --git a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh
index 3d1d1a277cbb409cd270e7af0e69ce580128a79a..81158e1fe5a2f11f43752e37de79c5afb1764358 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh
+++ b/dumux/material/fluidmatrixinteractions/2pia/awnsurfaceexpfct.hh
@@ -39,7 +39,7 @@ namespace Dumux
  * \ingroup material
  *
  * \brief Implementation of the exponential function relating
- *             specific interfacial area to wetting phase saturation and capillary pressure as suggested by Nuske(2009) (Diploma thesis).
+ *             specific interfacial area to wetting phase saturation and capillary pressure as suggested by Nuske(2009) (Diploma thesis) \cite nuske2009 .
  */
 template <class ParamsT>
 class AwnSurfaceExpFct
diff --git a/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh b/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh
index 79d23ba0141c0838178cc4fd4a57192e814568a8..bb5ac86a1b94cc3ceb19409b1f2a1825ba657298 100644
--- a/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh
+++ b/dumux/material/fluidmatrixinteractions/2pia/awnsurfacepolynomial2ndorder.hh
@@ -40,7 +40,7 @@ namespace Dumux
  * \ingroup material
  *
  * \brief Implementation of the polynomial of second order relating
- *             specific interfacial  area to wetting phase saturation and capillary pressure as suggested by Joakar-Niasar(2007).
+ *             specific interfacial  area to wetting phase saturation and capillary pressure as suggested by Joekar-Niasar(2008) \cite joekar2008 .
  */
 template <class ScalarT, class ParamsT = AwnSurfacePolynomial2ndOrderParams<ScalarT> >
 class AwnSurfacePolynomial2ndOrder
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh b/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
index e07bd8e1fbd05a076589a83c8deaa6d6a6a253c9..5e9485f2e3aeddad50534296c1de443272f22e2b 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkervangen3p.hh
@@ -272,7 +272,7 @@ public:
      *
      * The permeability of water in a 3p system equals the standard 2p description.
      * (see p61. in "Comparison of the Three-Phase Oil Relative Permeability Models"
-     * MOJDEH  DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83.)
+     * MOJDEH  DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83.) \cite delshad1989 <BR>
      *
      * \param sn Non-wetting liquid saturation
      * \param sg Gas saturation
@@ -298,11 +298,11 @@ public:
      *        after the Model of Parker et al. (1987).
      *
      * See model 7 in "Comparison of the Three-Phase Oil Relative Permeability Models"
-     * MOJDEH  DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83.
+     * MOJDEH  DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83 \cite delshad1989 <BR>
      * or more comprehensive in
      * "Estimation of primary drainage three-phase relative permeability for organic
      * liquid transport in the vadose zone", Leonardo I. Oliveira, Avery H. Demond,
-     * Journal of Contaminant Hydrology 66 (2003), 261-285
+     * Journal of Contaminant Hydrology 66 (2003), 261-285 \cite oloiveira2003 <BR>
      *
      *
      * \param sw Wetting liquid saturation
@@ -347,7 +347,7 @@ public:
      *
      * The permeability of gas in a 3p system equals the standard 2p description.
      * (see p61. in "Comparison of the Three-Phase Oil Relative Permeability Models"
-     * MOJDEH  DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83.)
+     * MOJDEH  DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83.) \cite delshad1989 <BR>
      *
      * \param sw Wetting liquid saturation
      * \param sn Non-wetting liquid saturation
diff --git a/dumux/material/fluidsystems/brineairfluidsystem.hh b/dumux/material/fluidsystems/brineairfluidsystem.hh
index b0bd731941a65edf060916c42bce6db124b5f5c6..159351719accbe00bab4cecd2c4d62266d18f371 100644
--- a/dumux/material/fluidsystems/brineairfluidsystem.hh
+++ b/dumux/material/fluidsystems/brineairfluidsystem.hh
@@ -343,9 +343,10 @@ public:
      * \param pressure phase pressure in \f$\mathrm{[Pa]}\f$
      * \param fluidState the fluid state
      *
-     * Equation given in:    - Batzle & Wang (1992)
+     * Equation given in:
+     *                         - Batzle & Wang (1992) \cite batzle1992 <BR>
      *                         - cited by: Bachu & Adams (2002)
-     *                           "Equations of State for basin geofluids"
+     *                           "Equations of State for basin geofluids" \cite adams2002
      */
     using Base::density;
     template <class FluidState>
@@ -380,9 +381,10 @@ public:
      * \param fluidState An arbitrary fluid state
      * \param phaseIdx The index of the fluid phase to consider
      *
-     * Equation given in:    - Batzle & Wang (1992)
+     * Equation given in:
+     *                         - Batzle & Wang (1992) \cite batzle1992 <BR>
      *                         - cited by: Bachu & Adams (2002)
-     *                           "Equations of State for basin geofluids"
+     *                           "Equations of State for basin geofluids" \cite adams2002
      */
     using Base::viscosity;
     template <class FluidState>
@@ -543,7 +545,7 @@ public:
      * See:
      * Class Class 2000
      * Theorie und numerische Modellierung nichtisothermer Mehrphasenprozesse in NAPL-kontaminierten porösen Medien
-     * Chapter 2.1.13 Innere Energie, Wäremekapazität, Enthalpie
+     * Chapter 2.1.13 Innere Energie, Wäremekapazität, Enthalpie \cite A3:class:2001 <BR>
      *
      * Formula (2.42):
      * the specific enthalpy of a gas phase result from the sum of (enthalpies*mass fraction) of the components
@@ -699,8 +701,9 @@ private:
      * \param temperature temperature of component in \f$\mathrm{[K]}\f$
      * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
      *
-     * Equations given in:    - Batzle & Wang (1992)
-     *                        - cited by: Adams & Bachu in Geofluids (2002) 2, 257-271
+     * Equations given in:
+     *                        - Batzle & Wang (1992) \cite batzle1992 <BR>
+     *                        - cited by: Adams & Bachu in Geofluids (2002) 2, 257-271 \cite adams2002
      */
 
     static Scalar liquidDensity_(Scalar T,
diff --git a/dumux/material/fluidsystems/h2oairfluidsystem.hh b/dumux/material/fluidsystems/h2oairfluidsystem.hh
index 4f5e4c9973604d44e80f8a440168c14901bdeedf..34ee489a7b298b9ccac5572e65f14cb78e530da7 100644
--- a/dumux/material/fluidsystems/h2oairfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairfluidsystem.hh
@@ -373,7 +373,7 @@ public:
      * in
      * S.O.Ochs: "Development of a multiphase multicomponent
      * model for PEMFC - Technical report: IRTG-NUPUS",
-     * University of Stuttgart, 2008
+     * University of Stuttgart, 2008 \cite ochs2008 <BR>
      *
      *
      * \param phaseIdx index of the phase
@@ -630,7 +630,7 @@ public:
      * See:
      * Class Class 2000
      * Theorie und numerische Modellierung nichtisothermer Mehrphasenprozesse in NAPL-kontaminierten porösen Medien
-     * Chapter 2.1.13 Innere Energie, Wäremekapazität, Enthalpie
+     * Chapter 2.1.13 Innere Energie, Wäremekapazität, Enthalpie \cite A3:class:2001 <BR>
      *
      * Formula (2.42):
      * the specifiv enthalpy of a gasphase result from the sum of (enthalpies*mass fraction) of the components
diff --git a/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh b/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
index 028d2f55c1611f21501a721c9c12d73d4a892bd9..d40ec33e9abf15e530a6bea6a85318d1861f54ca 100644
--- a/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh
@@ -295,7 +295,7 @@ public:
          *
          * See: R. Reid, et al.: The Properties of Gases and Liquids,
          * 4th edition, McGraw-Hill, 1987, 407-410
-         * 5th edition, McGraw-Hill, 20001, p. 9.21/22
+         * 5th edition, McGraw-Hill, 2001, p. 9.21/22
          *
          * in this case, we use a simplified version in order to avoid
          * computationally costly evaluation of sqrt and pow functions and
diff --git a/dumux/material/fluidsystems/spe5fluidsystem.hh b/dumux/material/fluidsystems/spe5fluidsystem.hh
index 2752275a588b954ce5539b8bff6b674ef2dcb399..a140755898147fd0083d7b5e7b217221a063b7c4 100644
--- a/dumux/material/fluidsystems/spe5fluidsystem.hh
+++ b/dumux/material/fluidsystems/spe5fluidsystem.hh
@@ -28,7 +28,7 @@
  *
  * J.E. Killough, et al.: Fifth Comparative Solution Project:
  * Evaluation of Miscible Flood Simulators, Ninth SPE Symposium on
- * Reservoir Simulation, 1987
+ * Reservoir Simulation, 1987 \cite SPE5
  */
 #ifndef DUMUX_SPE5_FLUID_SYSTEM_HH
 #define DUMUX_SPE5_FLUID_SYSTEM_HH
@@ -53,7 +53,7 @@ namespace FluidSystems
  *
  * J.E. Killough, et al.: Fifth Comparative Solution Project:
  * Evaluation of Miscible Flood Simulators, Ninth SPE Symposium on
- * Reservoir Simulation, 1987
+ * Reservoir Simulation, 1987 \cite SPE5
  */
 template <class Scalar>
 class Spe5
diff --git a/dumux/material/spatialparams/implicitspatialparams1p.hh b/dumux/material/spatialparams/implicitspatialparams1p.hh
index 53b892295ea72dce3fa22e5893697a9805cbf9ef..e8c8344c83e184071a17c585ed50f9d397f20056 100644
--- a/dumux/material/spatialparams/implicitspatialparams1p.hh
+++ b/dumux/material/spatialparams/implicitspatialparams1p.hh
@@ -168,10 +168,10 @@ public:
      * \brief Apply the Forchheimer coefficient for inertial forces
      *        calculation.
      *
-     *        Source: Ward, J.C. 1964 Turbulent flow in porous media. ASCE J. Hydraul. Div 90.
+     *        Source: Ward, J.C. 1964 Turbulent flow in porous media. ASCE J. Hydraul. Div 90 \cite ward1964 .
      *        Actually the Forchheimer coefficient is also a function of the dimensions of the
      *        porous medium. Taking it as a constant is only a first approximation
-     *        (Nield, Bejan, Convection in porous media, 2006, p. 10)
+     *        (Nield, Bejan, Convection in porous media, 2006, p. 10 \cite nield2006 )
      *
      * \param element The current finite element
      * \param fvGeometry The current finite volume geometry of the element