diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
index 7ece22c5ae..288797ed1e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposeParDict
@@ -59,7 +59,7 @@ manualCoeffs
 }
 
 
-//// Is the case distributred
+//// Is the case distributed
 //distributed     yes;
 //// Per slave (so nProcs-1 entries) the directory above the case.
 //roots           
diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index b605f29e57..215add79a7 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -180,7 +180,7 @@ surfaces
 
     triangleCut
     {
-        // Cutingplaneusing iso surface
+        // Cutingplane using iso surface
         type            cuttingPlane;
         planeType       pointAndNormal;
         pointAndNormalDict
diff --git a/src/Allwmake b/src/Allwmake
index 39ce3f16f1..f22e0729db 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -17,11 +17,12 @@ wmake libso lagrangian/basic
 wmake libso triSurface
 wmake libso edgeMesh
 wmake libso surfMesh
-wmake libso meshTools
-wmake libso finiteVolume
 
 decompositionAgglomeration/Allwmake
 
+wmake libso meshTools
+wmake libso finiteVolume
+
 wmake libso sampling
 
 wmake libso dynamicMesh
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index cb2c43e843..a24dd16a5d 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -5,18 +5,18 @@ set -x
 wmake libso dummy
 
 case "$WM_MPLIB" in
-GAMMA)
-    wmake libso gamma
-    ;;
-
 LAM | *MPI* )
-    WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
     set +x
     echo
     echo "Note: ignore spurious warnings about missing mpicxx.h headers"
     set -x
-    wmake libso mpi
+    (WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso mpi)
     ;;
+
+#GAMMA)
+#    wmake libso gamma
+#    ;;
 esac
 
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
index 0438fa276d..5bb4a0ee2d 100644
--- a/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
+++ b/src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriver.C
@@ -317,25 +317,18 @@ Foam::autoHexMeshDriver::autoHexMeshDriver
 
             Info<< surfaces().names()[surfI] << ':' << nl << nl;
 
-            //const triSurfaceMesh& s = surfaces()[surfI];
-            //const geometricSurfacePatchList& regions = s.patches();
-            //labelList nTrisPerRegion(surfaces().countRegions(s));
-
             forAll(regNames, i)
             {
-                //if (nTrisPerRegion[i] > 0)
-                //{
-                    label patchI = meshRefinement::addPatch
-                    (
-                        mesh,
-                        regNames[i],
-                        wallPolyPatch::typeName
-                    );
+                label patchI = meshRefinement::addPatch
+                (
+                    mesh,
+                    regNames[i],
+                    wallPolyPatch::typeName
+                );
 
-                    Info<< patchI << '\t' << regNames[i] << nl;
+                Info<< patchI << '\t' << regNames[i] << nl;
 
-                    globalToPatch_[surfaces().globalRegion(surfI, i)] = patchI;
-                //}
+                globalToPatch_[surfaces().globalRegion(surfI, i)] = patchI;
             }
 
             Info<< nl;
diff --git a/src/decompositionAgglomeration/Allwmake b/src/decompositionAgglomeration/Allwmake
index 144244776f..3294fe48c3 100755
--- a/src/decompositionAgglomeration/Allwmake
+++ b/src/decompositionAgglomeration/Allwmake
@@ -6,7 +6,7 @@ wmake libso decompositionMethods
 
 if [ -d "$FOAM_MPI_LIBBIN" ]
 then
-    wmake libso parMetisDecomp
+    (WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB; wmake libso parMetisDecomp)
 fi
 
 wmake libso MGridGenGamgAgglomeration
diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
index 3572bcb6d0..1926889955 100644
--- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
+++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
@@ -52,18 +52,19 @@ void Foam::setRefCell
 
                 if (refCelli < 0 || refCelli >= field.mesh().nCells())
                 {
-                    FatalErrorIn
+                    FatalIOErrorIn
                     (
-                        "void Foam::setRefCell"
-                         "("
-                         "    const volScalarField&,"
-                         "    const dictionary&,"
-                         "    label& scalar&,"
-                         "    bool"
-                         ")"
+                        "void Foam::setRefCell\n"
+                         "(\n"
+                         "    const volScalarField&,\n"
+                         "    const dictionary&,\n"
+                         "    label& scalar&,\n"
+                         "    bool\n"
+                         ")",
+                        dict
                     )   << "Illegal master cellID " << refCelli
                         << ". Should be 0.." << field.mesh().nCells()
-                        << exit(FatalError);
+                        << exit(FatalIOError);
                 }
             }
             else
@@ -79,36 +80,38 @@ void Foam::setRefCell
             label sumHasRef = returnReduce<label>(hasRef, sumOp<label>());
             if (sumHasRef != 1)
             {
-                FatalErrorIn
+                FatalIOErrorIn
                 (
-                    "void Foam::setRefCell"
-                     "("
-                     "    const volScalarField&,"
-                     "    const dictionary&,"
-                     "    label& scalar&,"
-                     "    bool"
-                     ")"
+                    "void Foam::setRefCell\n"
+                     "(\n"
+                     "    const volScalarField&,\n"
+                     "    const dictionary&,\n"
+                     "    label& scalar&,\n"
+                     "    bool\n"
+                     ")",
+                    dict
                 )
                   << "Unable to set reference cell for field " << field.name()
                   << nl << "    Reference point " << refPointName
-                  << " found on multiple domains" << nl << exit(FatalError);
+                  << " found on multiple domains" << nl << exit(FatalIOError);
             }
         }
         else
         {
-            FatalErrorIn
+            FatalIOErrorIn
             (
-                "void Foam::setRefCell"
-                 "("
-                 "    const volScalarField&,"
-                 "    const dictionary&,"
-                 "    label& scalar&,"
-                 "    bool"
-                 ")"
+                "void Foam::setRefCell\n"
+                 "(\n"
+                 "    const volScalarField&,\n"
+                 "    const dictionary&,\n"
+                 "    label& scalar&,\n"
+                 "    bool\n"
+                 ")",
+                dict
             )
               << "Unable to set reference cell for field" << field.name() << nl
               << "    Please supply either " << refCellName
-              << " or " << refPointName << nl << exit(FatalError);
+              << " or " << refPointName << nl << exit(FatalIOError);
         }
 
         refValue = readScalar(dict.lookup(refValueName));
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index 50888ee31d..2024952864 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -369,7 +369,7 @@ void Foam::isoSurface::generateTriPoints
     {
         const polyPatch& pp = patches[patchI];
 
-        if (pp.coupled())
+        if (isA<processorPolyPatch>(pp))
         {
             if (refCast<const processorPolyPatch>(pp).owner())
             {
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 9511f6dabe..2cbe93c40a 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -466,12 +466,13 @@ Foam::sampledIsoSurface::sampledIsoSurface
 {
     if (!sampledSurface::interpolate())
     {
-        FatalErrorIn
+        FatalIOErrorIn
         (
             "sampledIsoSurface::sampledIsoSurface"
-            "(const word&, const polyMesh&, const dictionary&)"
+            "(const word&, const polyMesh&, const dictionary&)",
+            dict
         )   << "Non-interpolated iso surface not supported since triangles"
-            << " span across cells." << exit(FatalError);
+            << " span across cells." << exit(FatalIOError);
     }
 
     if (zoneID_.index() != -1)
@@ -480,14 +481,15 @@ Foam::sampledIsoSurface::sampledIsoSurface
 
         if (mesh.boundaryMesh().findPatchID(exposedPatchName_) == -1)
         {
-            FatalErrorIn
+            FatalIOErrorIn
             (
                 "sampledIsoSurface::sampledIsoSurface"
-                "(const word&, const polyMesh&, const dictionary&)"
+                "(const word&, const polyMesh&, const dictionary&)",
+                dict
             )   << "Cannot find patch " << exposedPatchName_
                 << " in which to put exposed faces." << endl
                 << "Valid patches are " << mesh.boundaryMesh().names()
-                << exit(FatalError);
+                << exit(FatalIOError);
         }
 
         if (debug && zoneID_.index() != -1)
diff --git a/tutorials/Xoodles/pitzDaily/system/controlDict b/tutorials/Xoodles/pitzDaily/system/controlDict
index a0d269e353..3fc331cc37 100644
--- a/tutorials/Xoodles/pitzDaily/system/controlDict
+++ b/tutorials/Xoodles/pitzDaily/system/controlDict
@@ -52,7 +52,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 
diff --git a/tutorials/Xoodles/pitzDaily3D/system/controlDict b/tutorials/Xoodles/pitzDaily3D/system/controlDict
index d6a13d876c..2952daba44 100644
--- a/tutorials/Xoodles/pitzDaily3D/system/controlDict
+++ b/tutorials/Xoodles/pitzDaily3D/system/controlDict
@@ -52,7 +52,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 
diff --git a/tutorials/channelOodles/channel395/0.org/B b/tutorials/channelFoam/channel395/0.org/B
similarity index 100%
rename from tutorials/channelOodles/channel395/0.org/B
rename to tutorials/channelFoam/channel395/0.org/B
diff --git a/tutorials/channelOodles/channel395/0.org/U b/tutorials/channelFoam/channel395/0.org/U
similarity index 100%
rename from tutorials/channelOodles/channel395/0.org/U
rename to tutorials/channelFoam/channel395/0.org/U
diff --git a/tutorials/channelOodles/channel395/0.org/k b/tutorials/channelFoam/channel395/0.org/k
similarity index 100%
rename from tutorials/channelOodles/channel395/0.org/k
rename to tutorials/channelFoam/channel395/0.org/k
diff --git a/tutorials/channelOodles/channel395/0.org/nuSgs b/tutorials/channelFoam/channel395/0.org/nuSgs
similarity index 100%
rename from tutorials/channelOodles/channel395/0.org/nuSgs
rename to tutorials/channelFoam/channel395/0.org/nuSgs
diff --git a/tutorials/channelOodles/channel395/0.org/nuTilda b/tutorials/channelFoam/channel395/0.org/nuTilda
similarity index 100%
rename from tutorials/channelOodles/channel395/0.org/nuTilda
rename to tutorials/channelFoam/channel395/0.org/nuTilda
diff --git a/tutorials/channelOodles/channel395/0.org/p b/tutorials/channelFoam/channel395/0.org/p
similarity index 100%
rename from tutorials/channelOodles/channel395/0.org/p
rename to tutorials/channelFoam/channel395/0.org/p
diff --git a/tutorials/channelOodles/channel395/0/B.gz b/tutorials/channelFoam/channel395/0/B.gz
similarity index 100%
rename from tutorials/channelOodles/channel395/0/B.gz
rename to tutorials/channelFoam/channel395/0/B.gz
diff --git a/tutorials/channelOodles/channel395/0/U.gz b/tutorials/channelFoam/channel395/0/U.gz
similarity index 100%
rename from tutorials/channelOodles/channel395/0/U.gz
rename to tutorials/channelFoam/channel395/0/U.gz
diff --git a/tutorials/channelOodles/channel395/0/k.gz b/tutorials/channelFoam/channel395/0/k.gz
similarity index 100%
rename from tutorials/channelOodles/channel395/0/k.gz
rename to tutorials/channelFoam/channel395/0/k.gz
diff --git a/tutorials/channelOodles/channel395/0/nuSgs.gz b/tutorials/channelFoam/channel395/0/nuSgs.gz
similarity index 100%
rename from tutorials/channelOodles/channel395/0/nuSgs.gz
rename to tutorials/channelFoam/channel395/0/nuSgs.gz
diff --git a/tutorials/channelOodles/channel395/0/nuTilda.gz b/tutorials/channelFoam/channel395/0/nuTilda.gz
similarity index 100%
rename from tutorials/channelOodles/channel395/0/nuTilda.gz
rename to tutorials/channelFoam/channel395/0/nuTilda.gz
diff --git a/tutorials/channelOodles/channel395/0/p.gz b/tutorials/channelFoam/channel395/0/p.gz
similarity index 100%
rename from tutorials/channelOodles/channel395/0/p.gz
rename to tutorials/channelFoam/channel395/0/p.gz
diff --git a/tutorials/channelOodles/channel395/Allrun b/tutorials/channelFoam/channel395/Allrun
similarity index 100%
rename from tutorials/channelOodles/channel395/Allrun
rename to tutorials/channelFoam/channel395/Allrun
diff --git a/tutorials/channelOodles/channel395/constant/LESProperties b/tutorials/channelFoam/channel395/constant/LESProperties
similarity index 99%
rename from tutorials/channelOodles/channel395/constant/LESProperties
rename to tutorials/channelFoam/channel395/constant/LESProperties
index ad24e882c7..da3b2d07d5 100644
--- a/tutorials/channelOodles/channel395/constant/LESProperties
+++ b/tutorials/channelFoam/channel395/constant/LESProperties
@@ -16,6 +16,8 @@ FoamFile
 
 LESModel            oneEqEddy;
 
+turbulence          on;
+
 printCoeffs         on;
 
 delta               vanDriest;
diff --git a/tutorials/channelOodles/channel395/constant/polyMesh/blockMeshDict b/tutorials/channelFoam/channel395/constant/polyMesh/blockMeshDict
similarity index 100%
rename from tutorials/channelOodles/channel395/constant/polyMesh/blockMeshDict
rename to tutorials/channelFoam/channel395/constant/polyMesh/blockMeshDict
diff --git a/tutorials/channelOodles/channel395/constant/polyMesh/boundary b/tutorials/channelFoam/channel395/constant/polyMesh/boundary
similarity index 100%
rename from tutorials/channelOodles/channel395/constant/polyMesh/boundary
rename to tutorials/channelFoam/channel395/constant/polyMesh/boundary
diff --git a/tutorials/channelOodles/channel395/constant/postChannelDict b/tutorials/channelFoam/channel395/constant/postChannelDict
similarity index 100%
rename from tutorials/channelOodles/channel395/constant/postChannelDict
rename to tutorials/channelFoam/channel395/constant/postChannelDict
diff --git a/tutorials/channelOodles/channel395/constant/transportProperties b/tutorials/channelFoam/channel395/constant/transportProperties
similarity index 100%
rename from tutorials/channelOodles/channel395/constant/transportProperties
rename to tutorials/channelFoam/channel395/constant/transportProperties
diff --git a/tutorials/channelFoam/channel395/constant/turbulenceProperties b/tutorials/channelFoam/channel395/constant/turbulenceProperties
new file mode 100644
index 0000000000..d3f32ecb06
--- /dev/null
+++ b/tutorials/channelFoam/channel395/constant/turbulenceProperties
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//simulationType       laminar;
+//simulationType       RASModel;
+simulationType       LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/channelOodles/channel395/system/controlDict b/tutorials/channelFoam/channel395/system/controlDict
similarity index 96%
rename from tutorials/channelOodles/channel395/system/controlDict
rename to tutorials/channelFoam/channel395/system/controlDict
index b45428a973..a2eccad7d9 100644
--- a/tutorials/channelOodles/channel395/system/controlDict
+++ b/tutorials/channelFoam/channel395/system/controlDict
@@ -52,7 +52,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 
diff --git a/tutorials/channelOodles/channel395/system/fvSchemes b/tutorials/channelFoam/channel395/system/fvSchemes
similarity index 100%
rename from tutorials/channelOodles/channel395/system/fvSchemes
rename to tutorials/channelFoam/channel395/system/fvSchemes
diff --git a/tutorials/channelOodles/channel395/system/fvSolution b/tutorials/channelFoam/channel395/system/fvSolution
similarity index 100%
rename from tutorials/channelOodles/channel395/system/fvSolution
rename to tutorials/channelFoam/channel395/system/fvSolution
diff --git a/tutorials/coodles/pitzDaily/system/controlDict b/tutorials/coodles/pitzDaily/system/controlDict
index 77b748c829..915324f6c3 100644
--- a/tutorials/coodles/pitzDaily/system/controlDict
+++ b/tutorials/coodles/pitzDaily/system/controlDict
@@ -52,7 +52,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 
diff --git a/tutorials/lesCavitatingFoam/throttle/system/controlDict b/tutorials/lesCavitatingFoam/throttle/system/controlDict
index 737c51177a..8c40820a16 100644
--- a/tutorials/lesCavitatingFoam/throttle/system/controlDict
+++ b/tutorials/lesCavitatingFoam/throttle/system/controlDict
@@ -54,7 +54,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled false;
 
diff --git a/tutorials/lesCavitatingFoam/throttle3D/system/controlDict b/tutorials/lesCavitatingFoam/throttle3D/system/controlDict
index e724478c85..903c0569a5 100644
--- a/tutorials/lesCavitatingFoam/throttle3D/system/controlDict
+++ b/tutorials/lesCavitatingFoam/throttle3D/system/controlDict
@@ -54,7 +54,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled false;
 
diff --git a/tutorials/oodles/pitzDaily/system/controlDict b/tutorials/oodles/pitzDaily/system/controlDict
index 3caefe8b07..ea3d0698ab 100644
--- a/tutorials/oodles/pitzDaily/system/controlDict
+++ b/tutorials/oodles/pitzDaily/system/controlDict
@@ -84,7 +84,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 
diff --git a/tutorials/oodles/pitzDailyDirectMapped/system/controlDict b/tutorials/oodles/pitzDailyDirectMapped/system/controlDict
index 3caefe8b07..ea3d0698ab 100644
--- a/tutorials/oodles/pitzDailyDirectMapped/system/controlDict
+++ b/tutorials/oodles/pitzDailyDirectMapped/system/controlDict
@@ -84,7 +84,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         enabled true;
 
diff --git a/tutorials/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/twoPhaseEulerFoam/bed/system/controlDict
index 1fc42f5c6e..bea2a3e8b3 100644
--- a/tutorials/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/twoPhaseEulerFoam/bed/system/controlDict
@@ -58,7 +58,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         // Fields to be  averaged - runTime modifiable
         fields
diff --git a/tutorials/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/twoPhaseEulerFoam/bed2/system/controlDict
index 85c8fc5cb8..230680f3e7 100644
--- a/tutorials/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/twoPhaseEulerFoam/bed2/system/controlDict
@@ -58,7 +58,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         outputControl outputTime;
 
diff --git a/tutorials/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index f159012fa9..82a6a9d095 100644
--- a/tutorials/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -58,7 +58,7 @@ functions
         type fieldAverage;
 
         // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldAverage.so");
+        functionObjectLibs ("libfieldFunctionObjects.so");
 
         // Fields to be  averaged - runTime modifiable
         fields