diff --git a/dumux/io/gnuplotinterface.hh b/dumux/io/gnuplotinterface.hh
index 0dcf5a12df276dfc6936e7d0c412c61e0d3a8ce9..0adb15dfaf702b61e67c03bac63eb5551868428c 100644
--- a/dumux/io/gnuplotinterface.hh
+++ b/dumux/io/gnuplotinterface.hh
@@ -105,6 +105,7 @@ public:
      *
      * \param title The name of the output file
      * \param plottingWindowNumber The ID of the specific plot
+     * \param interaction Specifies whether a live output via a gnuplot window is wanted
      */
     void plot(const std::string &title,
               const unsigned int plottingWindowNumber,
@@ -196,7 +197,7 @@ public:
     /*!
      * \brief Adds a file to list of plotted lines for specific window number
      *
-     * \param addFile Function to be plotted
+     * \param file Function to be plotted
      * \param plotName The name of the data set
      * \param plottingWindowNumber The ID of the specific plot
      * \param plotOptions Specific gnuplot options passed to this plot
diff --git a/dumux/io/ploteffectivediffusivitymodel.hh b/dumux/io/ploteffectivediffusivitymodel.hh
index 7b9fa486a436bdf78026d30bd871218d01048cbc..9afd03c17a2773146cadf7c679cab6062a46f173 100644
--- a/dumux/io/ploteffectivediffusivitymodel.hh
+++ b/dumux/io/ploteffectivediffusivitymodel.hh
@@ -54,10 +54,11 @@ public:
     /*!
      * \brief Plot the effective diffusion factor-saturation curve
      *
-     * \param params The material law parameters
+     * \param porosity The porosity of the porous medium
      * \param lowerSat Minimum x-value
      * \param upperSat Maximum x-value
      * \param plotName Name of the plotted curve
+     * \param interaction Specifies whether a live output via a gnuplot window is wanted
      */
     void plotdeff(Scalar porosity,
                   Scalar lowerSat = 0.0,
diff --git a/dumux/io/plotmateriallaw.hh b/dumux/io/plotmateriallaw.hh
index 0a4e16090bc6dade0eeb2180d15da87294810943..fba84ea6360aa3279329b5b7223c6e9746be368f 100644
--- a/dumux/io/plotmateriallaw.hh
+++ b/dumux/io/plotmateriallaw.hh
@@ -62,6 +62,7 @@ public:
      * \param lowerSat Minimum x-value
      * \param upperSat Maximum x-value
      * \param plotName Name of the plotted curve
+     * \param interaction Specifies whether a live output via a gnuplot window is wanted
      */
     void plotpcsw(const MaterialLawParams &params,
                   Scalar lowerSat = 0.0,
@@ -100,6 +101,7 @@ public:
      * \param lowerpc Minimum x-value
      * \param upperpc Maximum x-value
      * \param plotName Name of the plotted curve
+     * \param interaction Specifies whether a live output via a gnuplot window is wanted
      */
     void plotswpc(const MaterialLawParams &params,
                   Scalar lowerpc = 0.0,
@@ -137,6 +139,7 @@ public:
      * \param lowerSat Minimum x-value
      * \param upperSat Maximum x-value
      * \param plotName Name of the plotted curve
+     * \param interaction Specifies whether a live output via a gnuplot window is wanted
      */
     void plotdpcdsw(const MaterialLawParams &params,
                     Scalar lowerSat = 0.0,
@@ -175,6 +178,7 @@ public:
      * \param lowerpc Minimum x-value
      * \param upperpc Maximum x-value
      * \param plotName Name of the plotted curve
+     * \param interaction Specifies whether a live output via a gnuplot window is wanted
      */
     void plotdswdpc(const MaterialLawParams &params,
                     Scalar lowerpc = 0.0,
@@ -212,6 +216,7 @@ public:
      * \param lowerSat Minimum x-value
      * \param upperSat Maximum x-value
      * \param plotName Name of the plotted curve
+     * \param interaction Specifies whether a live output via a gnuplot window is wanted
      */
     void plotkr(const MaterialLawParams &params,
                 Scalar lowerSat = 0.0,
@@ -253,6 +258,7 @@ public:
      * \param lowerSat Minimum x-value
      * \param upperSat Maximum x-value
      * \param plotName Name of the plotted curve
+     * \param interaction Specifies whether a live output via a gnuplot window is wanted
      */
     void plotdkrdsw(const MaterialLawParams &params,
                     Scalar lowerSat = 0.0,
diff --git a/dumux/io/plotthermalconductivitymodel.hh b/dumux/io/plotthermalconductivitymodel.hh
index 4ef8e5899172103dbd3573ce2fbb3cf7c018ab3d..79ad9a9af485b471217b84ca7aa410ed828c17c1 100644
--- a/dumux/io/plotthermalconductivitymodel.hh
+++ b/dumux/io/plotthermalconductivitymodel.hh
@@ -24,6 +24,8 @@
 #ifndef DUMUX_PLOT_THERMAL_CONDUCTIVITY_LAW_HH
 #define DUMUX_PLOT_THERMAL_CONDUCTIVITY_LAW_HH
 
+#include <dune/common/deprecated.hh>
+
 #include <dumux/common/basicproperties.hh>
 #include <dumux/io/gnuplotinterface.hh>
 #include <dumux/material/fluidstates/compositionalfluidstate.hh>
@@ -78,15 +80,28 @@ public:
         lambdaN_ = FluidSystem::template thermalConductivity<FluidState>(fluidstate, nPhaseIdx);
     }
 
+    //! Constructor
+    DUNE_DEPRECATED_MSG("Constructor() has changed signature")
+    PlotThermalConductivityModel()
+    : numIntervals_(1000)
+    {
+        PlotThermalConductivityModel(293.15, 1e5);
+    }
+
     /*!
      * \brief Plot the effective thermal conductivity-saturation curve
      *
-     * \param params The material law parameters
+     * \param porosity The porosity of the porous medium
+     * \param rhoSolid The density of the solid material
+     * \param lambdaSolid The thermal conductivity of the solid material
      * \param lowerSat Minimum x-value
      * \param upperSat Maximum x-value
      * \param plotName Name of the plotted curve
+     * \param interaction Specifies whether a live output via a gnuplot window is wanted
      */
-    void plotlambdaeff(Scalar porosity, Scalar rhoSolid, Scalar lambdaSolid,
+    void plotlambdaeff(Scalar porosity,
+                       Scalar rhoSolid,
+                       Scalar lambdaSolid,
                        Scalar lowerSat = 0.0,
                        Scalar upperSat = 1.0,
                        std::string plotName = "lambda_eff",
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
index 1e79fcf522ed3da7fa31bef2e5a02ea52cbeaadf..42c56617dc079b194a9e339c69c2a8ec8eb5de69 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh
@@ -108,11 +108,12 @@ public:
     /*!
      * \brief Returns the effective thermal conductivity \f$[W/(m K)]\f$ after Johansen (1975).
      *
-     * \param sw The saturation of the wetting phase
-     * \param lambdaW the thermal conductivity of the wetting phase
-     * \param lambdaN the thermal conductivity of the non-wetting phase
-     * \param lambdaSolid the thermal conductivity of the solid phase
+     * \param Sw The saturation of the wetting phase
+     * \param lambdaW The thermal conductivity of the wetting phase
+     * \param lambdaN The thermal conductivity of the non-wetting phase
+     * \param lambdaSolid The thermal conductivity of the solid phase
      * \param porosity The porosity
+     * \param rhoSolid The density of solid phase
      *
      * \return Effective thermal conductivity \f$[W/(m K)]\f$ after Johansen (1975)
      */
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh
index 9165e1eec2e59c6c663a9597cfb6cbfe9d818cfe..5128e984d41328814b77d5ef6029035b65c80bb5 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh
@@ -74,11 +74,12 @@ public:
      * \brief Returns the effective thermal conductivity \f$[W/(m K)]\f$.
      *
      * \param sw The saturation of the wetting phase
-     * \param lambdaW the thermal conductivity of the wetting phase
-     * \param lambdaN the thermal conductivity of the non-wetting phase
-     * \param lambdaSolid the thermal conductivity of the solid phase
+     * \param lambdaW The thermal conductivity of the wetting phase
+     * \param lambdaN The thermal conductivity of the non-wetting phase
+     * \param lambdaSolid The thermal conductivity of the solid phase
      * \param porosity The porosity
-     *
+     * \param rhoSolid The density of the solid phase
+     * 
      * \return Effective thermal conductivity of the fluid phases
      */
     static Scalar effectiveThermalConductivity(const Scalar sw,
diff --git a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
index e5227b44b8c6ba2061f0937258e6ae5ade3cae1c..f81607dcb56fea77019e5bea0740a0d615b274be 100644
--- a/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
@@ -103,10 +103,11 @@ public:
      * \brief effective thermal conductivity \f$[W/(m K)]\f$ after Somerton (1974)
      *
      * \param sw The saturation of the wetting phase
-     * \param lambdaW the thermal conductivity of the wetting phase
-     * \param lambdaN the thermal conductivity of the non-wetting phase
-     * \param lambdaSolid the thermal conductivity of the solid phase
+     * \param lambdaW The thermal conductivity of the wetting phase
+     * \param lambdaN The thermal conductivity of the non-wetting phase
+     * \param lambdaSolid The thermal conductivity of the solid phase
      * \param porosity The porosity
+     * \param rhoSolid The density of solid phase
      *
      * \return effective thermal conductivity \f$[W/(m K)]\f$ after Somerton (1974)
      */
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
index f73d1fd11a900962383a6c98b514ff1ac8464198..0ca88a4e31685607e9ba81caaa49e9d55f3f9140 100644
--- a/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
@@ -193,7 +193,7 @@ public:
     }
 
 
-    //! \copydoc Dumux::ImplicitProblem::initialPhasePresence()
+    //! \copydoc Dumux::InjectionProblem::initialPhasePresence()
     int initialPhasePresence(const Vertex &vertex,
                              int &vIdxGlobal,
                              const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
index 115c20ed843cfb912ad67459cc528a35596985c2..8b0de7a6de8d2421c50268f606092448cc1da460 100644
--- a/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
@@ -193,7 +193,7 @@ public:
     }
 
 
-    //! \copydoc Dumux::ImplicitProblem::initialPhasePresence()
+    //! \copydoc Dumux::InjectionProblem::initialPhasePresence()
     int initialPhasePresence(const Vertex &vertex,
                              int &vIdxGlobal,
                              const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh
index 5f8bbbdebf8e726692079778227e6c8fd54e5377..da6a5bf19efe973b86eb7630db5821b2da3f7e76 100644
--- a/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh
@@ -106,7 +106,7 @@ public:
      */
     void plotMaterialLaw()
     {
-        PlotThermalConductivityModel<TypeTag> plotThermalConductivityModel_;
+        PlotThermalConductivityModel<TypeTag> plotThermalConductivityModel_(293.15, 1e5);
         std::string fileName = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Conductivity, File);
         plotThermalConductivityModel_.plotlambdaeff(porosity_, rhoSolid_, lambdaSolid_,
                                                     0.0, 1.0, fileName, false);
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
index ac5a0717fe32b47e84372ab0d3380f0763e1723f..365cdd7e3a0a8bff6dc6bdcb2d5b42e24aca9084 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
@@ -193,7 +193,7 @@ public:
     }
 
 
-    //! \copydoc Dumux::ImplicitProblem::initialPhasePresence()
+    //! \copydoc Dumux::InjectionProblem::initialPhasePresence()
     int initialPhasePresence(const Vertex &vertex,
                              int &vIdxGlobal,
                              const GlobalPosition &globalPos) const
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
index ace13131400d6f5f4460d48ba548f4df796c6734..ae1ddf316820276efbe584821ccf2593ef66dcea 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
@@ -193,7 +193,7 @@ public:
     }
 
 
-    //! \copydoc Dumux::ImplicitProblem::initialPhasePresence()
+    //! \copydoc Dumux::InjectionProblem::initialPhasePresence()
     int initialPhasePresence(const Vertex &vertex,
                              int &vIdxGlobal,
                              const GlobalPosition &globalPos) const