diff --git a/dune/phasefield/porenetwork/fem_1p_navierstokes.hh b/dune/phasefield/porenetwork/fem_1p_navierstokes.hh
index aa3294a31c334a205aadb3375e4bbdf44043706f..1f6c2c763c6ba67e1198ff025befea1f6f7cb29c 100644
--- a/dune/phasefield/porenetwork/fem_1p_navierstokes.hh
+++ b/dune/phasefield/porenetwork/fem_1p_navierstokes.hh
@@ -8,7 +8,7 @@
 #include<dune/pdelab/localoperator/variablefactories.hh>
 #include<dune/pdelab/gridfunctionspace/gridfunctionspace.hh>
 
-#include"fem_base_porenetwork.hh"
+#include<dune/phasefield/porenetwork/fem_base_porenetwork.hh>
 
 
 
diff --git a/dune/phasefield/porenetwork/pn_1pflow.hh b/dune/phasefield/porenetwork/pn_1pflow.hh
index fa1e81f815e7df82dd2a134374ecad2b97642e27..cac91eac0da8ea0af65d9a37788b4a48141403fa 100644
--- a/dune/phasefield/porenetwork/pn_1pflow.hh
+++ b/dune/phasefield/porenetwork/pn_1pflow.hh
@@ -9,6 +9,7 @@
 #include<dune/grid/io/file/vtk.hh>
 #include<dune/pdelab/newton/newton.hh>
 #include<dune/pdelab/common/functionutilities.hh>
+#include<dune/pdelab/finiteelementmap/pkfem.hh>
 #include<dune/pdelab/function/callableadapter.hh>
 
 #include <dune/phasefield/porenetwork/fem_1p_cahnhilliard_r.hh>
diff --git a/src/pntest/pntest.cc b/src/pntest/pntest.cc
index 29003522721f2cc454421f7e692a27584239ff1a..d1a8d99647101b497d5d8a9e934e836fd92f017b 100644
--- a/src/pntest/pntest.cc
+++ b/src/pntest/pntest.cc
@@ -9,12 +9,7 @@
 #include<dune/common/timer.hh>
 #if HAVE_DUNE_ALUGRID
 #include<dune/alugrid/grid.hh>
-#include<dune/alugrid/dgf.hh>
-#include<dune/grid/io/file/dgfparser/dgfparser.hh>
 #endif
-// pdelab includes
-#include<dune/pdelab/finiteelementmap/pkfem.hh>
-#include<dune/pdelab/finiteelementmap/qkfem.hh>
 // phasefield includes
 #include<dune/phasefield/porenetwork/pn_1pflow.hh>
 
@@ -41,6 +36,7 @@ int main(int argc, char** argv)
     ptreeparser.readINITree("pn1p.ini",ptree);
     ptreeparser.readOptions(argc,argv,ptree);
 
+    // Define Template Options
     typedef double RF;
     typedef Params_fs_r< RF,
                           //DoubleWell_limited< RF, DoubleWell_poly<RF>, Limiter_FakeDiverging<RF> >,
@@ -51,10 +47,16 @@ int main(int argc, char** argv)
                           //VelDissipation_Quadratic_Shifted<RF>
                           > Parameters;
     Parameters param(ptree);
+
+    //Set input/output filenamens
     std::string GridFilename = ptree.get("domain.filename","square.msh");
     std::string OutputFilename = ptree.get("output.filename","output");
+
+    //Create Simulation
     Pn_1PFlow<Parameters> pn_1pFlow(GridFilename,OutputFilename,param);
 
+
+    //Example of usecase for Pn_1PFlow
     std::cout << "Kf = " << pn_1pFlow.getKf() << " phiSolid = " << pn_1pFlow.getPhiSolid() << std::endl;
     pn_1pFlow.writeVTK(0.0);
     pn_1pFlow.grow(0.2);