diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C
index cc41c03969..ca4e0dcb58 100644
--- a/applications/solvers/DNS/dnsFoam/dnsFoam.C
+++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C
@@ -55,9 +55,8 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Starting time loop" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -123,7 +122,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C b/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
index e9f223faad..786146219b 100644
--- a/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
+++ b/applications/solvers/Lagrangian/kinematicParcelFoam/kinematicParcelFoam.C
@@ -53,10 +53,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
-
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         Info<< "Evolving " << kinematicCloud.name() << endl;
@@ -72,7 +70,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
index 5b56c72a8c..7f1a7a00a5 100644
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
@@ -48,9 +48,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nCalculating temperature distribution\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
@@ -72,7 +71,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index f5ec1ec364..9d2073bf2e 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
index ad0107319f..df0ccb8209 100644
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -50,9 +50,8 @@ int main(int argc, char *argv[])
 
 #   include "CourantNo.H"
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
@@ -72,7 +71,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index ded711f718..89a7b7f956 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -130,7 +130,7 @@ scalar StCoNum = 0.0;
 
     Info<< "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 53ae8af8be..1320b19d31 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -195,7 +195,7 @@ scalar StCoNum = 0.0;
 
     Info<< "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 52f513bfb9..d18ef0d2f4 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
index 0e57e0b00b..ddb4c35530 100644
--- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
+++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index b62adb9ffc..927afe9bc2 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -132,7 +132,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 4c41a0db2d..31d034bc57 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C
index b9b4f140bd..a835e8ea42 100644
--- a/applications/solvers/combustion/engineFoam/engineFoam.C
+++ b/applications/solvers/combustion/engineFoam/engineFoam.C
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 6d1a9d2caa..e915818bdc 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 59b0c9e99e..502406d132 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -220,7 +220,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 // ************************************************************************* //
diff --git a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
index 26d388ab24..c349e7520e 100644
--- a/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
+++ b/applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index b1b11a7cec..0cd144fce2 100644
--- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -51,9 +51,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index d985abe25d..bf6a9f24f3 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readSIMPLEControls.H"
diff --git a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
index b4bdc9e493..0571ee5082 100644
--- a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
+++ b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
@@ -47,9 +47,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         surfaceScalarField phiv
@@ -124,7 +123,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
index b3f1c8e06d..7cd692b71d 100644
--- a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
+++ b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.value() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -187,7 +186,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
index 593bc742cf..57b15a0f9b 100644
--- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
 
     autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readPISOControls.H"
@@ -134,7 +133,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 741141c1c4..6ff7960798 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readPISOControls.H"
@@ -127,7 +126,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
index 87dcf947b0..0324da8299 100644
--- a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C
@@ -50,9 +50,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -118,7 +117,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
index 11daf2e0b4..ff0b3ad21a 100644
--- a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
+++ b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
@@ -47,9 +47,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting iteration loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Iteration = " << runTime.timeName() << nl << endl;
 
         solve
@@ -73,7 +72,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
index e121150c7a..d89b636d04 100644
--- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
+++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
@@ -71,9 +71,8 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Starting time loop" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
 #       include "readPISOControls.H"
 #       include "readBPISOControls.H"
 
@@ -163,7 +162,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C
index 9edd07a8d0..86c18e2ac4 100644
--- a/applications/solvers/financial/financialFoam/financialFoam.C
+++ b/applications/solvers/financial/financialFoam/financialFoam.C
@@ -55,9 +55,8 @@ int main(int argc, char *argv[])
 
     Info<< "Starting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         delta == fvc::grad(V)().component(Foam::vector::X);
 
         solve
@@ -85,7 +84,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
index 1a9f023253..bd0ce2ac37 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
@@ -69,9 +69,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index c8e62813e8..26e732cf9c 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -66,9 +66,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index e9c48b937f..d91b6398f2 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -51,9 +51,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index 21e4912ae7..5996e6be23 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -54,9 +54,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
index 8a19fd0264..faff0edba0 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
 
     Info << "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index 2360fb6677..ab10aab8d4 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -58,9 +58,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         fvVectorMatrix divR = turbulence->divDevReff(U);
@@ -145,7 +144,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/channelFoam/channelFoam.C b/applications/solvers/incompressible/channelFoam/channelFoam.C
index 94d8f4acd4..009a300161 100644
--- a/applications/solvers/incompressible/channelFoam/channelFoam.C
+++ b/applications/solvers/incompressible/channelFoam/channelFoam.C
@@ -51,9 +51,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         #include "readPISOControls.H"
@@ -149,7 +148,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index d8c549668f..9ac6bd4fa6 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -48,9 +48,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -108,7 +107,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index f949b39cfc..c5d2b0576c 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -111,7 +110,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
index aee117ab6e..b705d2bbb7 100644
--- a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 95b4bc0843..555e6e0cfe 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -139,7 +138,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 4b9c231180..162d81ddaa 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -156,7 +156,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index ec0515aa19..b5ac02c563 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -49,9 +49,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
@@ -78,7 +77,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
index 8d61f2ebe7..a124288dc5 100644
--- a/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
+++ b/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
 
     Info << "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
 
         nAveragingSteps++;
 
@@ -82,5 +81,5 @@ int main(int argc, char *argv[])
 
     Info << "End\n" << endl;
 
-    return(0);
+    return 0;
 }
diff --git a/applications/solvers/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/molecularDynamics/mdFoam/mdFoam.C
index a1c13246e3..287065754e 100644
--- a/applications/solvers/molecularDynamics/mdFoam/mdFoam.C
+++ b/applications/solvers/molecularDynamics/mdFoam/mdFoam.C
@@ -50,9 +50,8 @@ int main(int argc, char *argv[])
 
     Info << "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
 
         nAveragingSteps++;
 
@@ -78,5 +77,5 @@ int main(int argc, char *argv[])
 
     Info << "End\n" << endl;
 
-    return(0);
+    return 0;
 }
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index 4a6f845fd8..66df8cfb9f 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readBubbleFoamControls.H"
@@ -90,7 +89,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index 81bceab2e5..12a8f4d499 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
 
     Info<< "\n end \n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 5696f9420e..65afde39c2 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index bfac075aec..ff5a669123 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index 8f55efd8de..0386e6625c 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 512086c9b5..7d2048037a 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index e2040bc107..d50dcc0b0e 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 25a77af89d..d0626cbf05 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 
     Info<< "\n end \n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
index 74533d0416..fbff84f808 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
@@ -57,7 +57,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class multiphaseMixture Declaration
+                      Class multiphaseMixture Declaration
 \*---------------------------------------------------------------------------*/
 
 class multiphaseMixture
@@ -85,15 +85,6 @@ public:
             {
                 return word::hash()(key.first()) + word::hash()(key.second());
             }
-
-            label operator()
-            (
-                const interfacePair& key,
-                const label tableSize
-            ) const
-            {
-                return mag(operator()(key)) % tableSize;
-            }
         };
 
 
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index a43dd5408b..ad8dbe3646 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -57,9 +57,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -93,7 +92,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index dbc8b2774f..be8eea9061 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -87,7 +86,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index 6bc7f9738b..ce3fb2aa55 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
index afa3c66001..4574ef7f1c 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
@@ -57,9 +57,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nCalculating displacement field\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Iteration: " << runTime.value() << nl << endl;
 
 #       include "readSolidDisplacementFoamControls.H"
@@ -133,7 +132,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
index 00a98b2531..4c14b00cc6 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
@@ -55,9 +55,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nCalculating displacement field\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Iteration: " << runTime.value() << nl << endl;
 
 #       include "readSteadyStressFoamControls.H"
@@ -90,7 +89,7 @@ int main(int argc, char *argv[])
 
     Info<< "\n end \n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/FixedList/FixedListTest.C b/applications/test/FixedList/FixedListTest.C
index a5e3341b65..e46e910d3a 100644
--- a/applications/test/FixedList/FixedListTest.C
+++ b/applications/test/FixedList/FixedListTest.C
@@ -52,16 +52,24 @@ int main(int argc, char *argv[])
     list[1] = 2;
     list[2] = 3;
     list[3] = 4;
-    Info<< list << endl;
+
+    Info<< "list:" << list
+        << " hash:" << FixedList<label, 4>::Hash<>()(list) << endl;
+
+    Info<< "FixedList<label, ..> is contiguous, "
+        "thus hashing function is irrelevant: with string::hash" << endl;
+
+    Info<< "list:" << list
+        << " hash:" << FixedList<label, 4>::Hash<string::hash>()(list) << endl;
 
     label a[4] = {0, 1, 2, 3};
     FixedList<label, 4> list2(a);
-    Info<< list2 << endl;
 
-    Info<< FixedList<label, 4>::Hash<>()(list2) << endl;
+    Info<< "list:" << list2
+        << " hash:" << FixedList<label, 4>::Hash<>()(list2) << endl;
 
-    //FixedList<label, 3> hmm(Sin);
-    //Info<< hmm << endl;
+    // FixedList<label, 3> hmm(Sin);
+    // Info<< hmm << endl;
 
     if (Pstream::parRun())
     {
@@ -69,7 +77,12 @@ int main(int argc, char *argv[])
         {
             Serr<< "slave sending to master "
                 << Pstream::masterNo() << endl;
-            OPstream toMaster(Pstream::masterNo(), IOstream::ASCII);
+
+            OPstream toMaster
+            (
+                Pstream::blocking, Pstream::masterNo(), IOstream::ASCII
+            );
+
             FixedList<label, 2> list3;
             list3[0] = 0;
             list3[1] = 1;
@@ -79,13 +92,16 @@ int main(int argc, char *argv[])
         {
             for
             (
-                int slave=Pstream::firstSlave();
-                slave<=Pstream::lastSlave();
+                int slave = Pstream::firstSlave();
+                slave <= Pstream::lastSlave();
                 slave++
             )
             {
                 Serr << "master receiving from slave " << slave << endl;
-                IPstream fromSlave(slave, IOstream::ASCII);
+                IPstream fromSlave
+                (
+                    Pstream::blocking, slave, IOstream::ASCII
+                );
                 FixedList<label, 2> list3(fromSlave);
 
                 Serr<< list3 << endl;
diff --git a/applications/test/Gstream/GsTest.C b/applications/test/Gstream/GsTest.C
index 8589674e70..61e3581ae5 100644
--- a/applications/test/Gstream/GsTest.C
+++ b/applications/test/Gstream/GsTest.C
@@ -43,5 +43,5 @@ int main()
 
     } while (wind.waitForEvent());
 
-    return(0);
+    return 0;
 }
diff --git a/applications/test/Hashing/Make/files b/applications/test/Hashing/Make/files
new file mode 100644
index 0000000000..a5f1087728
--- /dev/null
+++ b/applications/test/Hashing/Make/files
@@ -0,0 +1,3 @@
+testHashing.C
+
+EXE = $(FOAM_USER_APPBIN)/testHashing
diff --git a/applications/test/Hashing/Make/options b/applications/test/Hashing/Make/options
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/applications/test/Hashing/hashingTests b/applications/test/Hashing/hashingTests
new file mode 100644
index 0000000000..162854bbef
--- /dev/null
+++ b/applications/test/Hashing/hashingTests
@@ -0,0 +1,59 @@
+/*-------------------------------*- C++ -*---------------------------------*\
+|    =========                                                              |
+|    \\      /     OpenFOAM                                                 |
+|     \\    /                                                               |
+|      \\  /       The Open Source CFD Toolbox                              |
+|       \\/                                        http://www.OpenFOAM.org  |
+\*-------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+stringList
+(
+    "The quick brown fox jumps over the lazy dog"
+    "The best hash is the one you don't write yourself!"
+)
+
+
+labelList
+(
+    0
+    1
+    100
+    1000
+    -1
+    -10
+    -100
+)
+
+labelListList
+(
+    (0)
+    (0 0)
+    (0 0 0)
+    (0 1)
+    (100 1000)
+    (0 1 100 1000)
+)
+
+// edges are hashed commutatively
+edgeList
+(
+    (0 1)
+    (1 0)
+    (45 100)
+    (100 45)
+    (128 1000)
+    (1000 128)
+)
+
+// triFaces are also hashed commutatively (via multiply/add)
+triFaceList
+(
+    (10 20 30)
+    (30 20 10)
+    (20 10 30)
+)
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/Hashing/testHashing.C b/applications/test/Hashing/testHashing.C
new file mode 100644
index 0000000000..24a198a74f
--- /dev/null
+++ b/applications/test/Hashing/testHashing.C
@@ -0,0 +1,166 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    testHashing
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#include "IOstreams.H"
+#include "IOobject.H"
+#include "IFstream.H"
+
+#include "stringList.H"
+#include "labelList.H"
+#include "labelPair.H"
+#include "edgeList.H"
+#include "triFaceList.H"
+
+#include "Hash.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    IFstream is("hashingTests");
+
+
+    while (is.good())
+    {
+        const word listType(is);
+
+        Info<< endl;
+        IOobject::writeDivider(Info) << listType << endl;
+
+        if (listType == "stringList")
+        {
+            Info<< "contiguous = " << contiguous<string>() << endl << endl;
+
+            stringList lst(is);
+
+            forAll(lst, i)
+            {
+                unsigned hash1 = string::hash()(lst[i]);
+
+                Info<< hex << hash1 << ": " << lst[i] << endl;
+            }
+
+        }
+        else if (listType == "labelList")
+        {
+            Info<<"contiguous = " << contiguous<label>() << endl << endl;
+
+            labelList lst(is);
+
+            forAll(lst, i)
+            {
+                // direct value
+                unsigned hash1 = Hash<label>()(lst[i]);
+
+                // hashed byte-wise
+                unsigned hash2 = Hash<label>()(lst[i], 0);
+
+                Info<< hex << hash1
+                    << " (seeded: " << hash2 << ")"
+                    << ": " << dec << lst[i] << endl;
+            }
+
+            if (contiguous<label>())
+            {
+                unsigned hash3 = Hasher
+                (
+                    lst.cdata(),
+                    lst.size() * sizeof(label)
+                );
+
+                Info<<"contiguous hashed value " << hex << hash3 << endl;
+            }
+        }
+        else if (listType == "labelListList")
+        {
+            List< List<label> > lst(is);
+
+            forAll(lst, i)
+            {
+                unsigned hash1 = Hasher
+                (
+                    lst[i].cdata(),
+                    lst[i].size() * sizeof(label)
+                );
+
+                Info<< hex << hash1
+                    << ": " << dec << lst[i] << endl;
+            }
+
+        }
+        else if (listType == "edgeList")
+        {
+            Info<<"contiguous = " << contiguous<edge>() << endl << endl;
+
+            edgeList lst(is);
+
+            forAll(lst, i)
+            {
+                unsigned hash1 = Hash<edge>()(lst[i]);
+
+                // as FixedList
+                unsigned hash2 = labelPair::Hash<>()(lst[i]);
+
+                Info<< hex << hash1 << " (as FixedList: " << hash2
+                    << "): " << dec << lst[i] << endl;
+            }
+        }
+        else if (listType == "triFaceList")
+        {
+            Info<<"contiguous = " << contiguous<triFace>() << endl << endl;
+
+            triFaceList lst(is);
+
+            forAll(lst, i)
+            {
+                // direct value
+                unsigned hash1 = Hash<triFace>()(lst[i]);
+                unsigned hash2 = FixedList<label, 3>::Hash<>()(lst[i]);
+
+                Info<< hex << hash1 << " (as FixedList: " << hash2
+                    << "): " << dec << lst[i] << endl;
+            }
+        }
+        else
+        {
+            Info<< "unknown type: " << listType << endl;
+        }
+
+    }
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/HashingSpeed/Make/files b/applications/test/HashingSpeed/Make/files
new file mode 100644
index 0000000000..2d0e54d6e3
--- /dev/null
+++ b/applications/test/HashingSpeed/Make/files
@@ -0,0 +1,3 @@
+testHashingSpeed.C
+
+EXE = $(FOAM_USER_APPBIN)/testHashingSpeed
diff --git a/applications/test/HashingSpeed/Make/options b/applications/test/HashingSpeed/Make/options
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/applications/test/HashingSpeed/testHashingSpeed.C b/applications/test/HashingSpeed/testHashingSpeed.C
new file mode 100644
index 0000000000..3d43909d14
--- /dev/null
+++ b/applications/test/HashingSpeed/testHashingSpeed.C
@@ -0,0 +1,1070 @@
+// code taken more-or-less from Paul Hsieh's tests
+
+#include "Hasher.H"
+
+#include <stdio.h>
+#include <time.h>
+
+#ifndef CLOCKS_PER_SEC
+# ifdef CLK_TCK
+#  define CLOCKS_PER_SEC (CLK_TCK)
+# endif
+#endif
+
+#undef mix
+#undef rot
+
+/*
+-------------------------------------------------------------------------------
+lookup3.c, by Bob Jenkins, May 2006, Public Domain.
+
+These are functions for producing 32-bit hashes for hash table lookup.
+hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
+are externally useful functions.  Routines to test the hash are included
+if SELF_TEST is defined.  You can use this free for any purpose.  It's in
+the public domain.  It has no warranty.
+
+You probably want to use hashlittle().  hashlittle() and hashbig()
+hash byte arrays.  hashlittle() is is faster than hashbig() on
+little-endian machines.  Intel and AMD are little-endian machines.
+On second thought, you probably want hashlittle2(), which is identical to
+hashlittle() except it returns two 32-bit hashes for the price of one.
+You could implement hashbig2() if you wanted but I haven't bothered here.
+
+If you want to find a hash of, say, exactly 7 integers, do
+  a = i1;  b = i2;  c = i3;
+  mix(a,b,c);
+  a += i4; b += i5; c += i6;
+  mix(a,b,c);
+  a += i7;
+  final(a,b,c);
+then use c as the hash value.  If you have a variable length array of
+4-byte integers to hash, use hashword().  If you have a byte array (like
+a character string), use hashlittle().  If you have several byte arrays, or
+a mix of things, see the comments above hashlittle().
+
+Why is this so big?  I read 12 bytes at a time into 3 4-byte integers,
+then mix those integers.  This is fast (you can do a lot more thorough
+mixing with 12*3 instructions on 3 integers than you can with 3 instructions
+on 1 byte), but shoehorning those bytes into integers efficiently is messy.
+-------------------------------------------------------------------------------
+*/
+
+#include <stdio.h>      /* defines printf for tests */
+#include <time.h>       /* defines time_t for timings in the test */
+#include <stdint.h>     /* defines uint32_t etc */
+#include <sys/param.h>  /* attempt to define endianness */
+#ifdef linux
+# include <endian.h>    /* attempt to define endianness */
+#endif
+
+/*
+ * My best guess at if you are big-endian or little-endian.  This may
+ * need adjustment.
+ */
+#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
+     __BYTE_ORDER == __LITTLE_ENDIAN) || \
+    (defined(i386) || defined(__i386__) || defined(__i486__) || \
+     defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
+# define HASH_LITTLE_ENDIAN 1
+# define HASH_BIG_ENDIAN 0
+#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
+       __BYTE_ORDER == __BIG_ENDIAN) || \
+      (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel))
+# define HASH_LITTLE_ENDIAN 0
+# define HASH_BIG_ENDIAN 1
+#else
+# define HASH_LITTLE_ENDIAN 0
+# define HASH_BIG_ENDIAN 0
+#endif
+
+#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
+
+/*
+-------------------------------------------------------------------------------
+mix -- mix 3 32-bit values reversibly.
+
+This is reversible, so any information in (a,b,c) before mix() is
+still in (a,b,c) after mix().
+
+If four pairs of (a,b,c) inputs are run through mix(), or through
+mix() in reverse, there are at least 32 bits of the output that
+are sometimes the same for one pair and different for another pair.
+This was tested for:
+* pairs that differed by one bit, by two bits, in any combination
+  of top bits of (a,b,c), or in any combination of bottom bits of
+  (a,b,c).
+* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
+  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
+  is commonly produced by subtraction) look like a single 1-bit
+  difference.
+* the base values were pseudorandom, all zero but one bit set, or
+  all zero plus a counter that starts at zero.
+
+Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
+satisfy this are
+    4  6  8 16 19  4
+    9 15  3 18 27 15
+   14  9  3  7 17  3
+Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
+for "differ" defined as + with a one-bit base and a two-bit delta.  I
+used http://burtleburtle.net/bob/hash/avalanche.html to choose
+the operations, constants, and arrangements of the variables.
+
+This does not achieve avalanche.  There are input bits of (a,b,c)
+that fail to affect some output bits of (a,b,c), especially of a.  The
+most thoroughly mixed value is c, but it doesn't really even achieve
+avalanche in c.
+
+This allows some parallelism.  Read-after-writes are good at doubling
+the number of bits affected, so the goal of mixing pulls in the opposite
+direction as the goal of parallelism.  I did what I could.  Rotates
+seem to cost as much as shifts on every machine I could lay my hands
+on, and rotates are much kinder to the top and bottom bits, so I used
+rotates.
+-------------------------------------------------------------------------------
+*/
+#define mix(a,b,c) \
+{ \
+  a -= c;  a ^= rot(c, 4);  c += b; \
+  b -= a;  b ^= rot(a, 6);  a += c; \
+  c -= b;  c ^= rot(b, 8);  b += a; \
+  a -= c;  a ^= rot(c,16);  c += b; \
+  b -= a;  b ^= rot(a,19);  a += c; \
+  c -= b;  c ^= rot(b, 4);  b += a; \
+}
+
+/*
+-------------------------------------------------------------------------------
+final -- final mixing of 3 32-bit values (a,b,c) into c
+
+Pairs of (a,b,c) values differing in only a few bits will usually
+produce values of c that look totally different.  This was tested for
+* pairs that differed by one bit, by two bits, in any combination
+  of top bits of (a,b,c), or in any combination of bottom bits of
+  (a,b,c).
+* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
+  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
+  is commonly produced by subtraction) look like a single 1-bit
+  difference.
+* the base values were pseudorandom, all zero but one bit set, or
+  all zero plus a counter that starts at zero.
+
+These constants passed:
+ 14 11 25 16 4 14 24
+ 12 14 25 16 4 14 24
+and these came close:
+  4  8 15 26 3 22 24
+ 10  8 15 26 3 22 24
+ 11  8 15 26 3 22 24
+-------------------------------------------------------------------------------
+*/
+#define final(a,b,c) \
+{ \
+    c ^= b; c -= rot(b, 14); \
+    a ^= c; a -= rot(c, 11); \
+    b ^= a; b -= rot(a, 25); \
+    c ^= b; c -= rot(b, 16); \
+    a ^= c; a -= rot(c, 4);  \
+    b ^= a; b -= rot(a, 14); \
+    c ^= b; c -= rot(b, 24); \
+}
+
+/*
+--------------------------------------------------------------------
+ This works on all machines.  To be useful, it requires
+ -- that the key be an array of uint32_t's, and
+ -- that the length be the number of uint32_t's in the key
+
+ The function hashword() is identical to hashlittle() on little-endian
+ machines, and identical to hashbig() on big-endian machines,
+ except that the length has to be measured in uint32_ts rather than in
+ bytes.  hashlittle() is more complicated than hashword() only because
+ hashlittle() has to dance around fitting the key bytes into registers.
+--------------------------------------------------------------------
+*/
+uint32_t hashword(
+const uint32_t *k,                   /* the key, an array of uint32_t values */
+size_t          length,               /* the length of the key, in uint32_ts */
+uint32_t        initval)         /* the previous hash, or an arbitrary value */
+{
+  uint32_t a,b,c;
+
+  /* Set up the internal state */
+  a = b = c = 0xdeadbeef + (((uint32_t)length)<<2) + initval;
+
+  /*------------------------------------------------- handle most of the key */
+  while (length > 3)
+  {
+    a += k[0];
+    b += k[1];
+    c += k[2];
+    mix(a,b,c);
+    length -= 3;
+    k += 3;
+  }
+
+  /*------------------------------------------- handle the last 3 uint32_t's */
+  switch(length)                     /* all the case statements fall through */
+  {
+  case 3 : c+=k[2];
+  case 2 : b+=k[1];
+  case 1 : a+=k[0];
+    final(a,b,c);
+  case 0:     /* case 0: nothing left to add */
+    break;
+  }
+  /*------------------------------------------------------ report the result */
+  return c;
+}
+
+
+/*
+--------------------------------------------------------------------
+hashword2() -- same as hashword(), but take two seeds and return two
+32-bit values.  pc and pb must both be nonnull, and *pc and *pb must
+both be initialized with seeds.  If you pass in (*pb)==0, the output
+(*pc) will be the same as the return value from hashword().
+--------------------------------------------------------------------
+*/
+void hashword2 (
+const uint32_t *k,                   /* the key, an array of uint32_t values */
+size_t          length,               /* the length of the key, in uint32_ts */
+uint32_t       *pc,                      /* IN: seed OUT: primary hash value */
+uint32_t       *pb)               /* IN: more seed OUT: secondary hash value */
+{
+  uint32_t a,b,c;
+
+  /* Set up the internal state */
+  a = b = c = 0xdeadbeef + ((uint32_t)(length<<2)) + *pc;
+  c += *pb;
+
+  /*------------------------------------------------- handle most of the key */
+  while (length > 3)
+  {
+    a += k[0];
+    b += k[1];
+    c += k[2];
+    mix(a,b,c);
+    length -= 3;
+    k += 3;
+  }
+
+  /*------------------------------------------- handle the last 3 uint32_t's */
+  switch(length)                     /* all the case statements fall through */
+  {
+  case 3 : c+=k[2];
+  case 2 : b+=k[1];
+  case 1 : a+=k[0];
+    final(a,b,c);
+  case 0:     /* case 0: nothing left to add */
+    break;
+  }
+  /*------------------------------------------------------ report the result */
+  *pc=c; *pb=b;
+}
+
+
+/*
+-------------------------------------------------------------------------------
+hashlittle() -- hash a variable-length key into a 32-bit value
+  k       : the key (the unaligned variable-length array of bytes)
+  length  : the length of the key, counting by bytes
+  initval : can be any 4-byte value
+Returns a 32-bit value.  Every bit of the key affects every bit of
+the return value.  Two keys differing by one or two bits will have
+totally different hash values.
+
+The best hash table sizes are powers of 2.  There is no need to do
+mod a prime (mod is sooo slow!).  If you need less than 32 bits,
+use a bitmask.  For example, if you need only 10 bits, do
+  h = (h & hashmask(10));
+In which case, the hash table should have hashsize(10) elements.
+
+If you are hashing n strings (uint8_t **)k, do it like this:
+  for (i=0, h=0; i<n; ++i) h = hashlittle( k[i], len[i], h);
+
+By Bob Jenkins, 2006.  bob_jenkins@burtleburtle.net.  You may use this
+code any way you wish, private, educational, or commercial.  It's free.
+
+Use for hash table lookup, or anything where one collision in 2^^32 is
+acceptable.  Do NOT use for cryptographic purposes.
+-------------------------------------------------------------------------------
+*/
+
+uint32_t hashlittle( const void *key, size_t length, uint32_t initval)
+{
+  uint32_t a,b,c;                                          /* internal state */
+  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
+
+  /* Set up the internal state */
+  a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
+
+  u.ptr = key;
+  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
+    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
+    const uint8_t  *k8;
+
+    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
+    while (length > 12)
+    {
+      a += k[0];
+      b += k[1];
+      c += k[2];
+      mix(a,b,c);
+      length -= 12;
+      k += 3;
+    }
+
+    /*----------------------------- handle the last (probably partial) block */
+
+    k8 = (const uint8_t *)k;
+    switch(length)
+    {
+    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
+    case 11: c+=((uint32_t)k8[10])<<16;  /* fall through */
+    case 10: c+=((uint32_t)k8[9])<<8;    /* fall through */
+    case 9 : c+=k8[8];                   /* fall through */
+    case 8 : b+=k[1]; a+=k[0]; break;
+    case 7 : b+=((uint32_t)k8[6])<<16;   /* fall through */
+    case 6 : b+=((uint32_t)k8[5])<<8;    /* fall through */
+    case 5 : b+=k8[4];                   /* fall through */
+    case 4 : a+=k[0]; break;
+    case 3 : a+=((uint32_t)k8[2])<<16;   /* fall through */
+    case 2 : a+=((uint32_t)k8[1])<<8;    /* fall through */
+    case 1 : a+=k8[0]; break;
+    case 0 : return c;
+    }
+
+  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
+    const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
+    const uint8_t  *k8;
+
+    /*--------------- all but last block: aligned reads and different mixing */
+    while (length > 12)
+    {
+      a += k[0] + (((uint32_t)k[1])<<16);
+      b += k[2] + (((uint32_t)k[3])<<16);
+      c += k[4] + (((uint32_t)k[5])<<16);
+      mix(a,b,c);
+      length -= 12;
+      k += 6;
+    }
+
+    /*----------------------------- handle the last (probably partial) block */
+    k8 = (const uint8_t *)k;
+    switch(length)
+    {
+    case 12: c+=k[4]+(((uint32_t)k[5])<<16);
+             b+=k[2]+(((uint32_t)k[3])<<16);
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 11: c+=((uint32_t)k8[10])<<16;     /* fall through */
+    case 10: c+=k[4];
+             b+=k[2]+(((uint32_t)k[3])<<16);
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 9 : c+=k8[8];                      /* fall through */
+    case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 7 : b+=((uint32_t)k8[6])<<16;      /* fall through */
+    case 6 : b+=k[2];
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 5 : b+=k8[4];                      /* fall through */
+    case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 3 : a+=((uint32_t)k8[2])<<16;      /* fall through */
+    case 2 : a+=k[0];
+             break;
+    case 1 : a+=k8[0];
+             break;
+    case 0 : return c;                     /* zero length requires no mixing */
+    }
+
+  } else {                        /* need to read the key one byte at a time */
+    const uint8_t *k = (const uint8_t *)key;
+
+    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
+    while (length > 12)
+    {
+      a += k[0];
+      a += ((uint32_t)k[1])<<8;
+      a += ((uint32_t)k[2])<<16;
+      a += ((uint32_t)k[3])<<24;
+      b += k[4];
+      b += ((uint32_t)k[5])<<8;
+      b += ((uint32_t)k[6])<<16;
+      b += ((uint32_t)k[7])<<24;
+      c += k[8];
+      c += ((uint32_t)k[9])<<8;
+      c += ((uint32_t)k[10])<<16;
+      c += ((uint32_t)k[11])<<24;
+      mix(a,b,c);
+      length -= 12;
+      k += 12;
+    }
+
+    /*-------------------------------- last block: affect all 32 bits of (c) */
+    switch(length)                   /* all the case statements fall through */
+    {
+    case 12: c+=((uint32_t)k[11])<<24;
+    case 11: c+=((uint32_t)k[10])<<16;
+    case 10: c+=((uint32_t)k[9])<<8;
+    case 9 : c+=k[8];
+
+    case 8 : b+=((uint32_t)k[7])<<24;
+    case 7 : b+=((uint32_t)k[6])<<16;
+    case 6 : b+=((uint32_t)k[5])<<8;
+    case 5 : b+=k[4];
+
+    case 4 : a+=((uint32_t)k[3])<<24;
+    case 3 : a+=((uint32_t)k[2])<<16;
+    case 2 : a+=((uint32_t)k[1])<<8;
+    case 1 : a+=k[0];
+             break;
+
+    case 0 : return c;
+    }
+  }
+
+  final(a,b,c);
+  return c;
+}
+
+
+/*
+ * hashlittle2: return 2 32-bit hash values
+ *
+ * This is identical to hashlittle(), except it returns two 32-bit hash
+ * values instead of just one.  This is good enough for hash table
+ * lookup with 2^^64 buckets, or if you want a second hash if you're not
+ * happy with the first, or if you want a probably-unique 64-bit ID for
+ * the key.  *pc is better mixed than *pb, so use *pc first.  If you want
+ * a 64-bit value do something like "*pc + (((uint64_t)*pb)<<32)".
+ */
+void hashlittle2(
+  const void *key,       /* the key to hash */
+  size_t      length,    /* length of the key */
+  uint32_t   *pc,        /* IN: primary initval, OUT: primary hash */
+  uint32_t   *pb)        /* IN: secondary initval, OUT: secondary hash */
+{
+  uint32_t a,b,c;                                          /* internal state */
+  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
+
+  /* Set up the internal state */
+  a = b = c = 0xdeadbeef + ((uint32_t)length) + *pc;
+  c += *pb;
+
+  u.ptr = key;
+  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
+    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
+    const uint8_t  *k8;
+
+    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
+    while (length > 12)
+    {
+      a += k[0];
+      b += k[1];
+      c += k[2];
+      mix(a,b,c);
+      length -= 12;
+      k += 3;
+    }
+
+    /*----------------------------- handle the last (probably partial) block */
+
+    k8 = (const uint8_t *)k;
+    switch(length)
+    {
+    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
+    case 11: c+=((uint32_t)k8[10])<<16;  /* fall through */
+    case 10: c+=((uint32_t)k8[9])<<8;    /* fall through */
+    case 9 : c+=k8[8];                   /* fall through */
+    case 8 : b+=k[1]; a+=k[0]; break;
+    case 7 : b+=((uint32_t)k8[6])<<16;   /* fall through */
+    case 6 : b+=((uint32_t)k8[5])<<8;    /* fall through */
+    case 5 : b+=k8[4];                   /* fall through */
+    case 4 : a+=k[0]; break;
+    case 3 : a+=((uint32_t)k8[2])<<16;   /* fall through */
+    case 2 : a+=((uint32_t)k8[1])<<8;    /* fall through */
+    case 1 : a+=k8[0]; break;
+    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
+    }
+
+  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
+    const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
+    const uint8_t  *k8;
+
+    /*--------------- all but last block: aligned reads and different mixing */
+    while (length > 12)
+    {
+      a += k[0] + (((uint32_t)k[1])<<16);
+      b += k[2] + (((uint32_t)k[3])<<16);
+      c += k[4] + (((uint32_t)k[5])<<16);
+      mix(a,b,c);
+      length -= 12;
+      k += 6;
+    }
+
+    /*----------------------------- handle the last (probably partial) block */
+    k8 = (const uint8_t *)k;
+    switch(length)
+    {
+    case 12: c+=k[4]+(((uint32_t)k[5])<<16);
+             b+=k[2]+(((uint32_t)k[3])<<16);
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 11: c+=((uint32_t)k8[10])<<16;     /* fall through */
+    case 10: c+=k[4];
+             b+=k[2]+(((uint32_t)k[3])<<16);
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 9 : c+=k8[8];                      /* fall through */
+    case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 7 : b+=((uint32_t)k8[6])<<16;      /* fall through */
+    case 6 : b+=k[2];
+             a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 5 : b+=k8[4];                      /* fall through */
+    case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
+             break;
+    case 3 : a+=((uint32_t)k8[2])<<16;      /* fall through */
+    case 2 : a+=k[0];
+             break;
+    case 1 : a+=k8[0];
+             break;
+    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
+    }
+
+  } else {                        /* need to read the key one byte at a time */
+    const uint8_t *k = (const uint8_t *)key;
+
+    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
+    while (length > 12)
+    {
+      a += k[0];
+      a += ((uint32_t)k[1])<<8;
+      a += ((uint32_t)k[2])<<16;
+      a += ((uint32_t)k[3])<<24;
+      b += k[4];
+      b += ((uint32_t)k[5])<<8;
+      b += ((uint32_t)k[6])<<16;
+      b += ((uint32_t)k[7])<<24;
+      c += k[8];
+      c += ((uint32_t)k[9])<<8;
+      c += ((uint32_t)k[10])<<16;
+      c += ((uint32_t)k[11])<<24;
+      mix(a,b,c);
+      length -= 12;
+      k += 12;
+    }
+
+    /*-------------------------------- last block: affect all 32 bits of (c) */
+    switch(length)                   /* all the case statements fall through */
+    {
+    case 12: c+=((uint32_t)k[11])<<24;
+    case 11: c+=((uint32_t)k[10])<<16;
+    case 10: c+=((uint32_t)k[9])<<8;
+    case 9 : c+=k[8];
+    case 8 : b+=((uint32_t)k[7])<<24;
+    case 7 : b+=((uint32_t)k[6])<<16;
+    case 6 : b+=((uint32_t)k[5])<<8;
+    case 5 : b+=k[4];
+    case 4 : a+=((uint32_t)k[3])<<24;
+    case 3 : a+=((uint32_t)k[2])<<16;
+    case 2 : a+=((uint32_t)k[1])<<8;
+    case 1 : a+=k[0];
+             break;
+    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
+    }
+  }
+
+  final(a,b,c);
+  *pc=c; *pb=b;
+}
+
+
+
+/*
+ * hashbig():
+ * This is the same as hashword() on big-endian machines.  It is different
+ * from hashlittle() on all machines.  hashbig() takes advantage of
+ * big-endian byte ordering.
+ */
+uint32_t hashbig( const void *key, size_t length, uint32_t initval)
+{
+  uint32_t a,b,c;
+  union { const void *ptr; size_t i; } u; /* to cast key to (size_t) happily */
+
+  /* Set up the internal state */
+  a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
+
+  u.ptr = key;
+  if (HASH_BIG_ENDIAN && ((u.i & 0x3) == 0)) {
+    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
+    const uint8_t  *k8;
+
+    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
+    while (length > 12)
+    {
+      a += k[0];
+      b += k[1];
+      c += k[2];
+      mix(a,b,c);
+      length -= 12;
+      k += 3;
+    }
+
+    /*----------------------------- handle the last (probably partial) block */
+
+    k8 = (const uint8_t *)k;
+    switch(length)                   /* all the case statements fall through */
+    {
+    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
+    case 11: c+=((uint32_t)k8[10])<<8;  /* fall through */
+    case 10: c+=((uint32_t)k8[9])<<16;  /* fall through */
+    case 9 : c+=((uint32_t)k8[8])<<24;  /* fall through */
+    case 8 : b+=k[1]; a+=k[0]; break;
+    case 7 : b+=((uint32_t)k8[6])<<8;   /* fall through */
+    case 6 : b+=((uint32_t)k8[5])<<16;  /* fall through */
+    case 5 : b+=((uint32_t)k8[4])<<24;  /* fall through */
+    case 4 : a+=k[0]; break;
+    case 3 : a+=((uint32_t)k8[2])<<8;   /* fall through */
+    case 2 : a+=((uint32_t)k8[1])<<16;  /* fall through */
+    case 1 : a+=((uint32_t)k8[0])<<24; break;
+    case 0 : return c;
+    }
+
+  } else {                        /* need to read the key one byte at a time */
+    const uint8_t *k = (const uint8_t *)key;
+
+    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
+    while (length > 12)
+    {
+      a += ((uint32_t)k[0])<<24;
+      a += ((uint32_t)k[1])<<16;
+      a += ((uint32_t)k[2])<<8;
+      a += ((uint32_t)k[3]);
+      b += ((uint32_t)k[4])<<24;
+      b += ((uint32_t)k[5])<<16;
+      b += ((uint32_t)k[6])<<8;
+      b += ((uint32_t)k[7]);
+      c += ((uint32_t)k[8])<<24;
+      c += ((uint32_t)k[9])<<16;
+      c += ((uint32_t)k[10])<<8;
+      c += ((uint32_t)k[11]);
+      mix(a,b,c);
+      length -= 12;
+      k += 12;
+    }
+
+    /*-------------------------------- last block: affect all 32 bits of (c) */
+    switch(length)                   /* all the case statements fall through */
+    {
+    case 12: c+=k[11];
+    case 11: c+=((uint32_t)k[10])<<8;
+    case 10: c+=((uint32_t)k[9])<<16;
+    case 9 : c+=((uint32_t)k[8])<<24;
+    case 8 : b+=k[7];
+    case 7 : b+=((uint32_t)k[6])<<8;
+    case 6 : b+=((uint32_t)k[5])<<16;
+    case 5 : b+=((uint32_t)k[4])<<24;
+    case 4 : a+=k[3];
+    case 3 : a+=((uint32_t)k[2])<<8;
+    case 2 : a+=((uint32_t)k[1])<<16;
+    case 1 : a+=((uint32_t)k[0])<<24;
+             break;
+    case 0 : return c;
+    }
+  }
+
+  final(a,b,c);
+  return c;
+}
+
+
+uint32_t hashLookup3Orig (const char * k, int length) {
+    return hashlittle (k, length, 0);
+}
+
+uint32_t hashLookup3 (const char * k, int length) {
+    return Foam::Hasher(k, length, 0);
+}
+
+
+
+/* ======================================================================== */
+
+static uint32_t crc_16_table[16] = {
+  0x0000, 0xCC01, 0xD801, 0x1400, 0xF001, 0x3C00, 0x2800, 0xE401,
+  0xA001, 0x6C00, 0x7800, 0xB401, 0x5000, 0x9C01, 0x8801, 0x4400
+};
+
+/*
+ *	This code was found at: http://wannabe.guru.org/alg/node191.html
+ *  and still exists here: http://www.fearme.com/misc/alg/node191.html
+ *
+ *  this source code is based on Rex and Binstock which, in turn,
+ *  acknowledges William James Hunt.
+ *
+ *	According to the site this CRC uses the polynomial x^16+x^5+x^2+1.
+ *	Unfortunately, DOCSIS uses x^16+x^12+x^5+1.  D'oh!
+ */
+
+static uint32_t GetCRC16Update (uint32_t start_crc, const char * data_stream, int length) {
+uint32_t crc = start_crc;
+uint32_t r;
+
+  /* while there is more data to process */
+  while (length-- > 0) {
+
+    /* compute checksum of lower four bits of *data_stream */
+    r = crc_16_table[crc & 0xF];
+    crc = (crc >> 4) & 0x0FFF;
+    crc ^= r ^ crc_16_table[*data_stream & 0xF];
+
+    /* now compute checksum of upper four bits of *data_stream */
+    r = crc_16_table[crc & 0xF];
+    crc = (crc >> 4) & 0x0FFF;
+    crc ^= r ^ crc_16_table[(*data_stream >> 4) & 0xF];
+
+    /* next... */
+    data_stream++;
+  }
+
+  return crc;
+}
+
+uint32_t GetCRC16 (const char * data_stream, int length) {
+	return GetCRC16Update (0, data_stream, length);
+}
+
+/* ======================================================================== */
+
+static uint32_t crc_table[256];
+
+/*  This code was found at:
+ *  http://cell.onecall.net/cell-relay/publications/software/CRC/32bitCRC.c.html
+ */
+
+/*                                                                      */
+/* crc32h.c -- package to compute 32-bit CRC one byte at a time using   */
+/*             the high-bit first (Big-Endian) bit ordering convention  */
+/*                                                                      */
+/* Synopsis:                                                            */
+/*  gen_crc_table() -- generates a 256-word table containing all CRC    */
+/*                     remainders for every possible 8-bit byte.  It    */
+/*                     must be executed (once) before any CRC updates.  */
+/*                                                                      */
+/*  unsigned update_crc(crc_accum, data_blk_ptr, data_blk_size)         */
+/*           unsigned crc_accum; char *data_blk_ptr; int data_blk_size; */
+/*           Returns the updated value of the CRC accumulator after     */
+/*           processing each byte in the addressed block of data.       */
+/*                                                                      */
+/*  It is assumed that an unsigned long is at least 32 bits wide and    */
+/*  that the predefined type char occupies one 8-bit byte of storage.   */
+/*                                                                      */
+/*  The generator polynomial used for this version of the package is    */
+/*  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x^1+x^0 */
+/*  as specified in the Autodin/Ethernet/ADCCP protocol standards.      */
+/*  Other degree 32 polynomials may be substituted by re-defining the   */
+/*  symbol POLYNOMIAL below.  Lower degree polynomials must first be    */
+/*  multiplied by an appropriate power of x.  The representation used   */
+/*  is that the coefficient of x^0 is stored in the LSB of the 32-bit   */
+/*  word and the coefficient of x^31 is stored in the most significant  */
+/*  bit.  The CRC is to be appended to the data most significant byte   */
+/*  first.  For those protocols in which bytes are transmitted MSB      */
+/*  first and in the same order as they are encountered in the block    */
+/*  this convention results in the CRC remainder being transmitted with */
+/*  the coefficient of x^31 first and with that of x^0 last (just as    */
+/*  would be done by a hardware shift register mechanization).          */
+/*                                                                      */
+/*  The table lookup technique was adapted from the algorithm described */
+/*  by Avram Perez, Byte-wise CRC Calculations, IEEE Micro 3, 40 (1983).*/
+
+/* generate the table of CRC remainders for all possible bytes */
+
+#define CRC32POLYNOMIAL 0x04c11db7L
+
+static void GenerateCRC32Table (void) {
+register int i, j;
+register uint32_t crc_accum;
+
+	for ( i = 0;  i < 256;  i++ ) {
+		crc_accum = ( (unsigned long) i << 24 );
+        for ( j = 0;  j < 8;  j++ ) {
+			if ( crc_accum & 0x80000000L ) {
+				crc_accum = ( crc_accum << 1 ) ^ CRC32POLYNOMIAL;
+			} else {
+				crc_accum = ( crc_accum << 1 );
+			}
+		}
+		crc_table[i] = crc_accum;
+	}
+	return;
+}
+
+/* update the CRC on the data block one byte at a time */
+
+static uint32_t UpdateCRC32 (uint32_t crc_accum, const char *data_blk_ptr, int data_blk_size) {
+register int j;
+register uint8_t i;
+
+	for (j = 0; j < data_blk_size; j++) {
+		i = (crc_accum >> 24) ^ *data_blk_ptr++;
+		crc_accum = (crc_accum << 8) ^ crc_table[i];
+	}
+	return crc_accum;
+}
+
+uint32_t GetCRC32 (const char * data_stream, int length) {
+	return UpdateCRC32 (0, data_stream, length);
+}
+
+/* ======================================================================== */
+
+/* Performs two parallel CRC-32 on even and odd bytes of the input, then
+   combines the two in a further CRC-32 calculation */
+
+uint32_t GetCRC32PH (const char *data_blk_ptr, int data_blk_size) {
+int j;
+uint8_t i0, i1;
+uint32_t crc_accum0 = 0, crc_accum1 = 0x23456789u;
+
+	if (data_blk_size & 1) crc_accum0 ^= *data_blk_ptr++;
+	for (j = 1; j < data_blk_size; j+=2) {
+		i0 = ((crc_accum0 >> 24) ^ *data_blk_ptr++);
+		i1 = ((crc_accum1 >> 24) ^ *data_blk_ptr++);
+		crc_accum0 = (crc_accum0 << 8) ^ crc_table[i0];
+		crc_accum1 = (crc_accum1 << 8) ^ crc_table[i1];
+	}
+	return crc_accum0 + crc_accum1;
+}
+
+/* ======================================================================== */
+
+/* Fowler / Noll / Vo (FNV) Hash
+
+   http://www.isthe.com/chongo/tech/comp/fnv/ */
+
+uint32_t FNVHash (const char * data, int len) {
+int i;
+uint32_t hash;
+
+	hash = 2166136261u;
+	for (i=0; i < len; i++) {
+		hash = (16777619u * hash) ^ data[i];
+	}
+	return hash;
+}
+
+/* ======================================================================== */
+
+/*
+ * http://burtleburtle.net/bob/hash/doobs.html
+ */
+
+uint32_t oneAtATimeHash (const char * s, int len) {
+int32_t hash;
+int i;
+
+	for (hash = 0, i = 0; i < len; i++) {
+		hash += s[i];
+		hash += (hash << 10);
+		hash ^= (hash >>  6);	/* Non-portable due to ANSI C */
+	}
+	hash += (hash <<  3);
+	hash ^= (hash >> 11);		/* Non-portable due to ANSI C */
+	hash += (hash << 15);
+	return (uint32_t) hash;
+}
+
+/* ======================================================================== */
+
+uint32_t oneAtATimeHashPH (const char * s, int len) {
+int32_t hash0 = 0, hash1 = 0x23456789;
+int i;
+
+	if (len & 1) hash1 ^= *s++;
+
+	for (i = 1; i < len; i+=2) {
+		hash0 += *s++;
+		hash1 += *s++;
+		hash0 += (hash0 << 10);
+		hash1 += (hash1 << 10);
+		hash0 ^= (hash0 >>  6);	/* Non-portable due to ANSI C */
+		hash1 ^= (hash1 >>  6);	/* Non-portable due to ANSI C */
+	}
+
+	hash0 += hash1;
+
+	hash0 += (hash0 <<  3);
+	hash0 ^= (hash0 >> 11);		/* Non-portable due to ANSI C */
+	hash0 += (hash0 << 15);
+	return (uint32_t) hash0;
+}
+
+/* ======================================================================== */
+
+/* By Paul Hsieh (C) 2004, 2005.  Covered under the Paul Hsieh derivative
+   license. See:
+   http://www.azillionmonkeys.com/qed/weblicense.html for license details.
+
+   http://www.azillionmonkeys.com/qed/hash.html */
+
+#undef get16bits
+#if 0
+#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \
+  || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
+#define get16bits(d) (*((const uint16_t *) (d)))
+#endif
+#endif
+
+#if !defined (get16bits)
+#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\
+                       +(uint32_t)(((const uint8_t *)(d))[0]) )
+#endif
+
+uint32_t SuperFastHash (const char * data, int len)
+{
+    uint32_t hash = 0;
+
+    if (len <= 0 || data == NULL) return 0;
+
+    unsigned rem = len & 3;
+    len >>= 2;
+
+    /* Main loop */
+    for (;len > 0; len--) {
+        hash += get16bits(data);
+        hash = (hash << 16) ^ ((get16bits(data+2) << 11) ^ hash);
+        hash += hash >> 11;
+        data += 2*sizeof(uint16_t);
+    }
+
+    /* Handle end cases */
+    switch (rem) {
+        case 3 :
+            hash += get16bits(data);
+            hash ^= hash << 16;
+            hash ^= data[sizeof (uint16_t)] << 18;
+            hash += hash >> 11;
+            break;
+
+        case 2 :
+            hash += get16bits (data);
+            hash ^= hash << 11;
+            hash += hash >> 17;
+            break;
+
+        case 1 : hash += *data;
+            hash ^= hash << 10;
+            hash += hash >> 1;
+    }
+
+    /* Force "avalanching" of final 127 bits */
+    hash ^= hash << 3;
+    hash += hash >> 5;
+    hash ^= hash << 4;
+    hash += hash >> 17;
+    hash ^= hash << 25;
+    hash += hash >> 6;
+
+    return hash;
+}
+
+/* ======================================================================== */
+
+/* A hashing function that I believe was created by either Chris Torek or
+   Dan Bernstein */
+
+uint32_t alphaNumHash (const char * s, int len) {
+uint32_t h;
+int i;
+
+    for (h = 0, i = 0; i < len; i++) {
+        h = (h << 5) + (h * 5) + (unsigned char) s[i];
+    }
+    return h;
+}
+
+uint32_t bernstein (const char * s, int len) {
+uint32_t h;
+int i;
+
+    for (h = 0, i = 0; i < len; i++) {
+        h = (h << 5) + h + (unsigned char) s[i];
+    }
+    return h;
+}
+
+
+// found somewhere in the 2nd addition
+uint32_t stroustrup (const char * s, int len) {
+    uint32_t h;
+    int i;
+
+    for (register int i=0; i < len; ++s, ++i)
+    {
+        h = (h << 1) ^ (unsigned char) s[i];
+    }
+
+    return h;
+}
+
+
+/* ======================================================================== */
+
+typedef uint32_t (* hashFn) (const char * s, int len);
+
+#define BUFF_SZ (128*2)
+#define NTESTS 5000000
+
+double test (hashFn hash) {
+static char buff[BUFF_SZ];
+clock_t c0, c1;
+int32_t i;
+
+	for (buff[0]=0, i=1; i < BUFF_SZ; i++) buff[i] = (char) (i + buff[i-1]);
+
+	c0 = clock ();
+	for (i=0; i < NTESTS; i++) hash (buff, BUFF_SZ);
+	c1 = clock ();
+	return (c1 - c0)*(1.0 / (double)CLOCKS_PER_SEC);
+}
+
+struct tagtest {
+	double res;
+	char * name;
+	hashFn hash;
+} tests[] = {
+//	{ 0.0, "CRC32\t\t", GetCRC32                  },
+//	{ 0.0, "oneAtATimeHash\t", oneAtATimeHash     },
+//	{ 0.0, "alphaNumHash\t",  alphaNumHash        },
+	{ 0.0, "FNVHash\t\t", FNVHash                 },
+	{ 0.0, "bernstein\t",  bernstein        },
+	{ 0.0, "stroustrup\t", stroustrup             },
+	{ 0.0, "hashLookup3\t", hashLookup3           },
+	{ 0.0, "hashLookup3Orig\t", hashLookup3Orig   },
+	{ 0.0, "SuperFastHash\t", SuperFastHash       },
+	{ 0.0, NULL, NULL                             }
+};
+
+int main () {
+int i, j;
+	GenerateCRC32Table ();
+
+	for (j=0; tests[j].name != NULL; j++) {
+		for (i=0; i < 3; i++) {
+			double res = test (tests[j].hash);
+			if (tests[j].res == 0.0 || tests[j].res > res) tests[j].res = res;
+		}
+		printf ("%s:%8.4fs\n", tests[j].name, tests[j].res);
+	}
+
+	return 0;
+}
diff --git a/applications/test/LduMatrix/LduMatrixTest3.C b/applications/test/LduMatrix/LduMatrixTest3.C
index 729bc59329..4e9ab70b0c 100644
--- a/applications/test/LduMatrix/LduMatrixTest3.C
+++ b/applications/test/LduMatrix/LduMatrixTest3.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readPISOControls.H"
@@ -143,7 +142,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/Map/MapTest.C b/applications/test/Map/MapTest.C
index f382803c5b..7fb05e76a5 100644
--- a/applications/test/Map/MapTest.C
+++ b/applications/test/Map/MapTest.C
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/PackedList/PackedListTest.C b/applications/test/PackedList/PackedListTest.C
index 41796562ba..05f3a077f8 100644
--- a/applications/test/PackedList/PackedListTest.C
+++ b/applications/test/PackedList/PackedListTest.C
@@ -28,6 +28,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
+#include "uLabel.H"
 #include "IOstreams.H"
 #include "PackedBoolList.H"
 
@@ -38,7 +39,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    Info<< "PackedList max_bits() = " << PackedList<0>::max_bits() << nl;
+    Info<< "PackedList max_bits() = " << PackedList<>::max_bits() << nl;
 
     Info<< "\ntest allocation with value\n";
     PackedList<3> list1(5,1);
@@ -73,6 +74,50 @@ int main(int argc, char *argv[])
     list1[1] = list1[8] = list1[10] = list1[14] = 2;
     list1.print(Info);
 
+
+    Info<< "\ntest operator== between references\n";
+    if (list1[1] == list1[8])
+    {
+        Info<< "[1] == [8] (expected)\n";
+    }
+    else
+    {
+        Info<< "[1] != [8] (unexpected)\n";
+    }
+
+    if (list1[0] != list1[1])
+    {
+        Info<< "[0] != [1] (expected)\n";
+    }
+    else
+    {
+        Info<< "[0] == [1] (unexpected)\n";
+    }
+
+    Info<< "\ntest operator== with iterator\n";
+    {
+        PackedList<3>::iterator iter = list1[1];
+
+        if (iter != list1[8])
+        {
+            Info<< "iter != [8] (expected)\n";
+        }
+        else
+        {
+            Info<< "iter == [8] (unexpected)\n";
+        }
+
+        if (*iter != list1[8])
+        {
+            Info<< "*iter != [8] (unexpected)\n";
+        }
+        else
+        {
+            Info<< "*iter == [8] (expected)\n";
+        }
+    }
+
+
     {
         const PackedList<3>& constLst = list1;
         Info<< "\ntest operator[] const with out-of-range index\n";
diff --git a/applications/test/PackedList2/PackedListTest2.C b/applications/test/PackedList2/PackedListTest2.C
index 22282058ac..ef027fee2e 100644
--- a/applications/test/PackedList2/PackedListTest2.C
+++ b/applications/test/PackedList2/PackedListTest2.C
@@ -32,6 +32,7 @@ Description
 #include "boolList.H"
 #include "PackedBoolList.H"
 #include "HashSet.H"
+#include "StaticHashTable.H"
 #include "cpuTime.H"
 #include <vector>
 
@@ -55,11 +56,26 @@ int main(int argc, char *argv[])
 
     labelHashSet emptyHash;
     labelHashSet fullHash(1000);
-    for(label i = 0; i < n; i++)
+    for (label i = 0; i < n; i++)
     {
         fullHash.insert(i);
     }
 
+    // fullStaticHash is really slow
+    // give it lots of slots to help
+    StaticHashTable<nil, label, Hash<label> > emptyStaticHash;
+    StaticHashTable<nil, label, Hash<label> > fullStaticHash(100000);
+    for (label i = 0; i < n; i++)
+    {
+        fullStaticHash.insert(i, nil());
+    }
+
+    emptyHash.printInfo(Info);
+    fullHash.printInfo(Info);
+    emptyStaticHash.printInfo(Info);
+    fullStaticHash.printInfo(Info);
+
+
     cpuTime timer;
 
     for (label iter = 0; iter < nIters; ++iter)
@@ -235,6 +251,37 @@ int main(int argc, char *argv[])
     Info<< "  sum " << sum << endl;
 
 
+    // Read empty static hash
+    sum = 0;
+    for (label iter = 0; iter < nIters; ++iter)
+    {
+        forAll(unpacked, i)
+        {
+            sum += emptyStaticHash.found(i);
+        }
+    }
+    Info<< "Reading empty StaticHash:" << timer.cpuTimeIncrement()
+        << " s" << endl;
+    Info<< "  sum " << sum << endl;
+
+#if 0
+    // we can skip this test - it is usually quite slow
+    // Read full static hash
+    sum = 0;
+    for (label iter = 0; iter < nIters; ++iter)
+    {
+        forAll(unpacked, i)
+        {
+            sum += fullStaticHash.found(i);
+        }
+    }
+    Info<< "Reading full StaticHash:" << timer.cpuTimeIncrement()
+        << " s" << endl;
+    Info<< "  sum " << sum << endl;
+#endif
+
+    Info<< "Starting write tests" << endl;
+
     //
     // Write
     //
diff --git a/applications/test/dataEntry/testDataEntry.C b/applications/test/dataEntry/testDataEntry.C
index ed6cd4ce82..7a7dd94552 100644
--- a/applications/test/dataEntry/testDataEntry.C
+++ b/applications/test/dataEntry/testDataEntry.C
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
         << "    int(f(x)) lim(x0->x1) = " << dataEntry().integrate(x0, x1) << nl
         << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/graphXi/graphXi.C b/applications/test/graphXi/graphXi.C
index e366cdc3a4..2c3a5750f3 100644
--- a/applications/test/graphXi/graphXi.C
+++ b/applications/test/graphXi/graphXi.C
@@ -60,7 +60,7 @@ int main()
 
     Info<< "end" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/maxMem/maxMem.C b/applications/test/maxMem/maxMem.C
index 0a43faa157..590c542ee9 100644
--- a/applications/test/maxMem/maxMem.C
+++ b/applications/test/maxMem/maxMem.C
@@ -28,5 +28,5 @@ int main(int argc, char *argv[])
         cout << "allocated " << i*nBytes/(1024U*1024U) << " Mbytes" << endl;
     }
 
-    return(0);
+    return 0;
 }
diff --git a/applications/test/nearWallDist-wave/testWallDist2.C b/applications/test/nearWallDist-wave/testWallDist2.C
index 304cdba3d6..8666e0905c 100644
--- a/applications/test/nearWallDist-wave/testWallDist2.C
+++ b/applications/test/nearWallDist-wave/testWallDist2.C
@@ -120,9 +120,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << endl;
 
 
diff --git a/applications/test/parallel/parallelTest.C b/applications/test/parallel/parallelTest.C
index 953870c8e9..bf8440ece6 100644
--- a/applications/test/parallel/parallelTest.C
+++ b/applications/test/parallel/parallelTest.C
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/pointField/testPointField.C b/applications/test/pointField/testPointField.C
index 4f9f3cede6..8087dbaa48 100644
--- a/applications/test/pointField/testPointField.C
+++ b/applications/test/pointField/testPointField.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/regex/regexTest.C b/applications/test/regex/regexTest.C
index 040d7bb397..c6e492d151 100644
--- a/applications/test/regex/regexTest.C
+++ b/applications/test/regex/regexTest.C
@@ -43,8 +43,7 @@ int main(int argc, char *argv[])
 
     List<Tuple2<string, string> > rawList(IFstream("testRegexps")());
     Info<< "input list:" << rawList << endl;
-    IOobject::writeDivider(Info);
-    Info<< endl;
+    IOobject::writeDivider(Info) << endl;
 
     List<string> groups;
 
diff --git a/applications/test/slicedField/slicedFieldTest.C b/applications/test/slicedField/slicedFieldTest.C
index 12779c7d92..a82b4ac712 100644
--- a/applications/test/slicedField/slicedFieldTest.C
+++ b/applications/test/slicedField/slicedFieldTest.C
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
 
     Info<< Sf << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/sphericalTensorField/sphericalTensorFieldTest.C b/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
index e6a62d4d3f..17c85c1bb6 100644
--- a/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
+++ b/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
 
     Info<< ((sf1 + sf2) & (sf1 + sf2)) << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/string/stringTest.C b/applications/test/string/stringTest.C
index 7981356760..b8442102f3 100644
--- a/applications/test/string/stringTest.C
+++ b/applications/test/string/stringTest.C
@@ -38,10 +38,11 @@ int main(int argc, char *argv[])
 {
     string test("$HOME kjhkjhkjh \" \\$HOME/tyetyery ${FOAM_RUN} \n ; hkjh ;$");
 
-    Info<< test << endl;
+    Info<< "string:" << test << nl << "hash:"
+        << unsigned(string::hash()(test)) << endl;
 
     // test sub-strings via iterators
-    string::const_iterator iter = test.end();
+    string::const_iterator iter  = test.end();
     string::const_iterator iter2 = test.end();
     string::size_type fnd = test.find('\\');
 
@@ -77,6 +78,8 @@ int main(int argc, char *argv[])
     cout<< "output string with " << s2.length() << " characters\n";
     cout<< "ostream<<  >" << s2 << "<\n";
     Info<< "Ostream<<  >" << s2 << "<\n";
+    Info<< "hash:" << unsigned(string::hash()(s2)) << endl;
+
 
     Info << "End\n" << endl;
 
diff --git a/applications/test/symmTensorField/symmTensorFieldTest.C b/applications/test/symmTensorField/symmTensorFieldTest.C
index f3b6757d03..c98b8dc476 100644
--- a/applications/test/symmTensorField/symmTensorFieldTest.C
+++ b/applications/test/symmTensorField/symmTensorFieldTest.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
 
     Info<< symm(tf1) << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/tensor/tensorTest.C b/applications/test/tensor/tensorTest.C
index 4530bc7657..efc7824dd6 100644
--- a/applications/test/tensor/tensorTest.C
+++ b/applications/test/tensor/tensorTest.C
@@ -65,5 +65,5 @@ int main()
     Info<< (symm(t7) && t7) - (0.5*(t7 + t7.T()) && t7) << endl;
     Info<< (t7 && symm(t7)) - (t7 && 0.5*(t7 + t7.T())) << endl;
 
-    return(0);
+    return 0;
 }
diff --git a/applications/test/triTet/triTet.C b/applications/test/triTet/triTet.C
index 53b9cd1399..5c850a4377 100644
--- a/applications/test/triTet/triTet.C
+++ b/applications/test/triTet/triTet.C
@@ -36,5 +36,5 @@ int main()
     Info<< "tet circumRadius = "
         << tetrahedron<point, point>(a, b, c, d).circumRadius() << endl;
 
-    return(0);
+    return 0;
 }
diff --git a/applications/test/volField/volFieldTest.C b/applications/test/volField/volFieldTest.C
index e72cc87c98..3b7dafef8e 100644
--- a/applications/test/volField/volFieldTest.C
+++ b/applications/test/volField/volFieldTest.C
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
 
     solve(fvm::ddt(st) + fvm::div(phi, st) - fvm::laplacian(st));
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/volPointInterpolation/volPointInterpolationTest.C b/applications/test/volPointInterpolation/volPointInterpolationTest.C
index d222b14525..07329ac349 100644
--- a/applications/test/volPointInterpolation/volPointInterpolationTest.C
+++ b/applications/test/volPointInterpolation/volPointInterpolationTest.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     pointVectorField pU(pInterp.interpolate(U));
     pU.write();
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/test/wordRe/wordReTest.C b/applications/test/wordRe/wordReTest.C
index a63b4aec2e..cad3ed688b 100644
--- a/applications/test/wordRe/wordReTest.C
+++ b/applications/test/wordRe/wordReTest.C
@@ -86,8 +86,7 @@ int main(int argc, char *argv[])
 
     List<Tuple2<wordRe, string> > rawList(IFstream("testRegexps")());
     Info<< "input list:" << rawList << endl;
-    IOobject::writeDivider(Info);
-    Info<< endl;
+    IOobject::writeDivider(Info) << endl;
 
     forAll(rawList, elemI)
     {
diff --git a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
index 78a0b779dc..c90594ff24 100644
--- a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
+++ b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
index 0542bab893..5ce860640d 100644
--- a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
+++ b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
index d9fbec8785..5810d64ca7 100644
--- a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
+++ b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C
@@ -190,7 +190,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
index d9d18722e6..b1e1395bda 100644
--- a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
+++ b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
index dade6a0e45..d676581a57 100644
--- a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
+++ b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "End" << nl << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C b/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
index 92d718f085..2f7d9c8980 100644
--- a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
+++ b/applications/utilities/mesh/conversion/starToFoam/starToFoam.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "End" << nl << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 1fab34ce94..706866bd2a 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -435,7 +435,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
index 1f9a898d43..52e0f2ae56 100644
--- a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
+++ b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index 21e0d7c1cc..74ab53432a 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -142,7 +142,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
index d05cd1a0e2..7b64177da5 100644
--- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
+++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
index 92bf820c3e..998929c3b0 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
+++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
     Info << "Writing points into directory " << points.path() << nl << endl;
     points.write();
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
index 7f694438e9..f883c3138b 100644
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@@ -377,7 +377,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
index 64d65e3aff..e024ecda58 100644
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
@@ -46,9 +46,8 @@ int main(int argc, char *argv[])
 #   include "createTime.H"
 #   include "createDynamicFvMesh.H"
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << endl;
 
         mesh.update();
diff --git a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
index a10782b553..c47fa9ec17 100644
--- a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
+++ b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C
@@ -47,9 +47,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.theta() << " CA-deg\n" << endl;
 
         mesh.move();
@@ -63,7 +62,7 @@ int main(int argc, char *argv[])
 
     Info<< "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
index 82e6e45a75..d590763229 100644
--- a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
+++ b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C
@@ -46,9 +46,8 @@ int main(int argc, char *argv[])
 
     autoPtr<Foam::motionSolver> motionPtr = motionSolver::New(mesh);
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << endl;
 
         mesh.movePoints(motionPtr->newPoints());
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index 4b50082e10..f9bd650d15 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -203,7 +203,7 @@ int main(int argc, char *argv[])
     Info << "Writing points into directory " << points.path() << nl << endl;
     points.write();
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C b/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
index 179ff05bf9..d134767702 100644
--- a/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
+++ b/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index a7328cb487..fff19e006d 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -723,7 +723,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nEnd.\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx
index c16a43deae..c824ec7e3c 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx
@@ -319,6 +319,7 @@ int vtkPV3FoamReader::RequestData
             << output->GetNumberOfBlocks() << " blocks\n";
     }
 
+
 #ifdef EXPERIMENTAL_TIME_CACHING
     bool needsUpdate = false;
 
@@ -373,6 +374,9 @@ int vtkPV3FoamReader::RequestData
 
 #endif
 
+    // Do any cleanup on the Foam side
+    foamData_->CleanUp();
+
     return 1;
 }
 
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index 0ed3d53185..4c4016c364 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -492,11 +492,15 @@ void Foam::vtkPV3Foam::Update
     convertLagrangianFields(lagrangianOutput);
     reader_->UpdateProgress(0.95);
 
+    meshChanged_ = fieldsChanged_ = false;
+}
+
+
+void Foam::vtkPV3Foam::CleanUp()
+{
     // reclaim some memory
     reduceMemory();
     reader_->UpdateProgress(1.0);
-
-    meshChanged_ = fieldsChanged_ = false;
 }
 
 
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
index af0fb849a4..985f6a3d17 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
@@ -700,6 +700,9 @@ public:
             vtkMultiBlockDataSet* lagrangianOutput
         );
 
+        //- Clean any storage
+        void CleanUp();
+
         //- Allocate and return a list of selected times
         //  returns the count via the parameter
         double* findTimes(int& nTimeSteps);
diff --git a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
index b6acc7806f..34ebbc75dc 100644
--- a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
+++ b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
     Info << "Vmax/Vmin = " << Vmax/Vmin << endl;
     Info << "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
index 6d09449696..bb41fb60d4 100644
--- a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
+++ b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
index 4ae3b13ac9..79f23de3e7 100644
--- a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
+++ b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
         wdot.write();
     }
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
index 14e722f621..6729389218 100644
--- a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
+++ b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
index 723250e3cc..2c481b8927 100644
--- a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
+++ b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C
@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
 
     Info<< "End" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/turbulence/R/R.C b/applications/utilities/postProcessing/turbulence/R/R.C
index 65cbcc94e8..3beeb70878 100644
--- a/applications/utilities/postProcessing/turbulence/R/R.C
+++ b/applications/utilities/postProcessing/turbulence/R/R.C
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 
     Info<< "End" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
index 345548b9d2..5e15aff046 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nEnd\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
index f904d1f899..dac7cd0393 100644
--- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C
index 03e3f77aff..32ae05fa6c 100644
--- a/applications/utilities/preProcessing/boxTurb/boxTurb.C
+++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C
@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 
     Info<< "end" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
index 6009a08575..e9171c330c 100644
--- a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
+++ b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 
     Info << "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 0e294be647..e893520b06 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "end" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 8d8b9f5e6e..c2186b642d 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "end" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index 8b65251fd9..277a4e787f 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
     Info << "Adiabatic flame temperature of mixture " << rMix.name() << " = "
          << products.TH(reactants.H(T0), 1000.0) << " K" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/src/Allwmake b/src/Allwmake
index c3ce648ba0..f22e0729db 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -5,8 +5,8 @@ set -x
 # update OpenFOAM version strings if required
 wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/null
 
-wmakeLnInclude -f OpenFOAM -sf
-wmakeLnInclude -f OSspecific/$WM_OS -sf
+wmakeLnInclude -f OpenFOAM
+wmakeLnInclude -f OSspecific/$WM_OS
 Pstream/Allwmake
 
 wmake libo  OSspecific/$WM_OS
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 833be5ccd5..c99ee23fa5 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -3,35 +3,42 @@ global/dimensionedConstants/dimensionedConstants.C
 global/argList/argList.C
 global/clock/clock.C
 
-primitives/bools/bool/bool.C
-primitives/bools/bool/boolIO.C
-primitives/bools/Switch/Switch.C
-primitives/bools/Switch/SwitchIO.C
+bools = primitives/bools
+$(bools)/bool/bool.C
+$(bools)/bool/boolIO.C
+$(bools)/Switch/Switch.C
+$(bools)/Switch/SwitchIO.C
+
 primitives/char/charIO.C
-primitives/int/intIO.C
-primitives/uint/uintIO.C
-primitives/long/longIO.C
-primitives/longLong/longLongIO.C
-primitives/ulong/ulongIO.C
-primitives/label/label.C
-primitives/uLabel/uLabel.C
+
+ints = primitives/ints
+$(ints)/int/intIO.C
+$(ints)/uint/uintIO.C
+$(ints)/long/longIO.C
+$(ints)/longLong/longLongIO.C
+$(ints)/ulong/ulongIO.C
+$(ints)/label/label.C
+$(ints)/uLabel/uLabel.C
+
 primitives/Scalar/doubleScalar/doubleScalar.C
 primitives/Scalar/floatScalar/floatScalar.C
 primitives/Scalar/scalar/scalar.C
-primitives/labelVector/labelVector.C
-primitives/vector/vector.C
-primitives/vector2D/vector2D.C
-primitives/sphericalTensor/sphericalTensor.C
-primitives/sphericalTensor2D/sphericalTensor2D.C
-primitives/diagTensor/diagTensor.C
-primitives/symmTensor/symmTensor.C
-primitives/tensor/tensor.C
-primitives/tensor2D/tensor2D.C
-primitives/labelSphericalTensor/labelSphericalTensor.C
-primitives/labelSymmTensor/labelSymmTensor.C
-primitives/labelTensor/labelTensor.C
+primitives/DiagTensor/diagTensor/diagTensor.C
+primitives/SphericalTensor/sphericalTensor/sphericalTensor.C
+primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C
+primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C
+primitives/SymmTensor/symmTensor/symmTensor.C
+primitives/Tensor/labelTensor/labelTensor.C
+primitives/Tensor/tensor/tensor.C
+primitives/Vector/complexVector/complexVector.C
+primitives/Vector/labelVector/labelVector.C
+primitives/Vector/vector/vector.C
+
+primitives/Tensor2D/tensor2D/tensor2D.C
+primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C
+primitives/Vector2D/vector2D/vector2D.C
+
 primitives/complex/complex.C
-primitives/complexVector/complexVector.C
 primitives/quaternion/quaternion.C
 primitives/septernion/septernion.C
 
@@ -45,6 +52,8 @@ $(strings)/fileName/fileNameIO.C
 $(strings)/keyType/keyTypeIO.C
 $(strings)/wordRe/wordReIO.C
 
+primitives/hashes/Hasher/Hasher.C
+
 sha1 = primitives/hashes/SHA1
 $(sha1)/SHA1.C
 $(sha1)/SHA1Digest.C
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index ee1c7ba7cc..8ae3697f1d 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -83,7 +83,7 @@ public:
     // Constructors
 
         //- Construct given initial table size
-        HashPtrTable(const label size = 100);
+        HashPtrTable(const label size = 128);
 
         //- Construct from Istream using given Istream constructor class
         template<class INew>
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
index 6bf84e0c55..d63921f95b 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
@@ -33,14 +33,14 @@ License
 
 template<class Key, class Hash>
 template<class AnyType>
-Foam::HashSet<Key, Hash>::HashSet(const HashTable<AnyType, Key, Hash>& ht)
+Foam::HashSet<Key, Hash>::HashSet(const HashTable<AnyType, Key, Hash>& h)
 :
-    HashTable<nil, Key, Hash>(ht.size())
+    HashTable<nil, Key, Hash>(h.size())
 {
     for
     (
-        typename HashTable<AnyType, Key, Hash>::const_iterator cit = ht.begin();
-        cit != ht.end();
+        typename HashTable<AnyType, Key, Hash>::const_iterator cit = h.cbegin();
+        cit != h.cend();
         ++cit
     )
     {
@@ -62,7 +62,7 @@ template<class Key, class Hash>
 bool Foam::HashSet<Key, Hash>::operator==(const HashSet<Key, Hash>& rhs) const
 {
     // Are all lhs elements in rhs?
-    for (const_iterator iter = this->begin(); iter != this->end(); ++iter)
+    for (const_iterator iter = this->cbegin(); iter != this->cend(); ++iter)
     {
         if (!rhs.found(iter.key()))
         {
@@ -71,7 +71,7 @@ bool Foam::HashSet<Key, Hash>::operator==(const HashSet<Key, Hash>& rhs) const
     }
 
     // Are all rhs elements in lhs?
-    for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+    for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
         if (!found(iter.key()))
         {
@@ -94,7 +94,7 @@ template<class Key, class Hash>
 void Foam::HashSet<Key, Hash>::operator|=(const HashSet<Key, Hash>& rhs)
 {
     // Add rhs elements into lhs
-    for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+    for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
         insert(iter.key());
     }
@@ -105,7 +105,7 @@ template<class Key, class Hash>
 void Foam::HashSet<Key, Hash>::operator&=(const HashSet<Key, Hash>& rhs)
 {
     // Remove elements not also found in rhs
-    for (iterator iter = this->begin(); iter != this->end(); ++iter)
+    for (iterator iter = this->cbegin(); iter != this->cend(); ++iter)
     {
         if (!rhs.found(iter.key()))
         {
@@ -119,7 +119,7 @@ template<class Key, class Hash>
 void Foam::HashSet<Key, Hash>::operator^=(const HashSet<Key, Hash>& rhs)
 {
     // Add missed rhs elements, remove duplicate elements
-    for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+    for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
         if (found(iter.key()))
         {
@@ -138,7 +138,7 @@ template<class Key, class Hash>
 void Foam::HashSet<Key, Hash>::operator-=(const HashSet<Key, Hash>& rhs)
 {
     // Remove rhs elements from lhs
-    for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+    for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
         erase(iter.key());
     }
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index 9a4c5951be..6353818d7e 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -72,7 +72,7 @@ public:
     // Constructors
 
         //- Construct given initial size
-        HashSet(const label size = 100)
+        HashSet(const label size = 128)
         :
             HashTable<nil, Key, Hash>(size)
         {}
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 3ed474b32d..c2034a69ea 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -30,20 +30,49 @@ License
 #include "HashTable.H"
 #include "List.H"
 
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template<class T, class Key, class Hash>
+Foam::label Foam::HashTable<T, Key, Hash>::canonicalSize(const label size)
+{
+    if (size < 1)
+    {
+        return 0;
+    }
+
+    // enforce power of two
+    unsigned int goodSize = size;
+
+    if (goodSize & (goodSize - 1))
+    {
+        // brute-force is fast enough
+        goodSize = 1;
+        while (goodSize < unsigned(size))
+        {
+            goodSize <<= 1;
+        }
+    }
+
+    return goodSize;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
 Foam::HashTable<T, Key, Hash>::HashTable(const label size)
 :
-    tableSize_(size),
-    table_(NULL),
+    HashTableName(),
     nElmts_(0),
+    tableSize_(canonicalSize(size)),
+    table_(NULL),
     endIter_(*this, NULL, 0),
     endConstIter_(*this, NULL, 0)
 {
     if (tableSize_)
     {
         table_ = new hashedEntry*[tableSize_];
+
         for (label hashIdx = 0; hashIdx < tableSize_; hashIdx++)
         {
             table_[hashIdx] = 0;
@@ -56,9 +85,9 @@ template<class T, class Key, class Hash>
 Foam::HashTable<T, Key, Hash>::HashTable(const HashTable<T, Key, Hash>& ht)
 :
     HashTableName(),
+    nElmts_(0),
     tableSize_(ht.tableSize_),
     table_(NULL),
-    nElmts_(0),
     endIter_(*this, NULL, 0),
     endConstIter_(*this, NULL, 0)
 {
@@ -71,7 +100,7 @@ Foam::HashTable<T, Key, Hash>::HashTable(const HashTable<T, Key, Hash>& ht)
             table_[hashIdx] = 0;
         }
 
-        for (const_iterator iter = ht.begin(); iter != ht.end(); ++iter)
+        for (const_iterator iter = ht.cbegin(); iter != ht.cend(); ++iter)
         {
             insert(iter.key(), *iter);
         }
@@ -85,9 +114,9 @@ Foam::HashTable<T, Key, Hash>::HashTable
 )
 :
     HashTableName(),
+    nElmts_(0),
     tableSize_(0),
     table_(NULL),
-    nElmts_(0),
     endIter_(*this, NULL, 0),
     endConstIter_(*this, NULL, 0)
 {
@@ -113,9 +142,9 @@ Foam::HashTable<T, Key, Hash>::~HashTable()
 template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::found(const Key& key) const
 {
-    if (tableSize_)
+    if (nElmts_)
     {
-        label hashIdx = Hash()(key, tableSize_);
+        const label hashIdx = hashKeyIndex(key);
 
         for (hashedEntry* ep = table_[hashIdx]; ep; ep = ep->next_)
         {
@@ -145,9 +174,9 @@ Foam::HashTable<T, Key, Hash>::find
     const Key& key
 )
 {
-    if (tableSize_)
+    if (nElmts_)
     {
-        label hashIdx = Hash()(key, tableSize_);
+        const label hashIdx = hashKeyIndex(key);
 
         for (hashedEntry* ep = table_[hashIdx]; ep; ep = ep->next_)
         {
@@ -177,9 +206,9 @@ Foam::HashTable<T, Key, Hash>::find
     const Key& key
 ) const
 {
-    if (tableSize_)
+    if (nElmts_)
     {
-        label hashIdx = Hash()(key, tableSize_);
+        const label hashIdx = hashKeyIndex(key);
 
         for (hashedEntry* ep = table_[hashIdx]; ep; ep = ep->next_)
         {
@@ -198,7 +227,7 @@ Foam::HashTable<T, Key, Hash>::find
     }
 #   endif
 
-    return end();
+    return cend();
 }
 
 
@@ -209,7 +238,7 @@ Foam::List<Key> Foam::HashTable<T, Key, Hash>::toc() const
     List<Key> tofc(nElmts_);
     label i = 0;
 
-    for (const_iterator iter = begin(); iter != end(); ++iter)
+    for (const_iterator iter = cbegin(); iter != cend(); ++iter)
     {
         tofc[i++] = iter.key();
     }
@@ -231,7 +260,8 @@ bool Foam::HashTable<T, Key, Hash>::set
         resize(2);
     }
 
-    label hashIdx = Hash()(key, tableSize_);
+    const label hashIdx = hashKeyIndex(key);
+
     hashedEntry* existing = 0;
     hashedEntry* prev = 0;
 
@@ -351,7 +381,7 @@ bool Foam::HashTable<T, Key, Hash>::erase(const iterator& cit)
             else
             {
                 // No previous found. Mark with special value which is
-                // - not end()
+                // - not end()/cend()
                 // - handled by operator++
                 it.elmtPtr_ = reinterpret_cast<hashedEntry*>(this);
                 it.hashIndex_ = -1;
@@ -449,14 +479,16 @@ Foam::label Foam::HashTable<T, Key, Hash>::erase
 
 
 template<class T, class Key, class Hash>
-void Foam::HashTable<T, Key, Hash>::resize(const label newSize)
+void Foam::HashTable<T, Key, Hash>::resize(const label sz)
 {
+    label newSize = canonicalSize(sz);
+
     if (newSize == tableSize_)
     {
 #       ifdef FULLDEBUG
         if (debug)
         {
-            Info<< "HashTable<T, Key, Hash>::resize(const label newSize) : "
+            Info<< "HashTable<T, Key, Hash>::resize(const label) : "
                 << "new table size == old table size\n";
         }
 #       endif
@@ -466,7 +498,7 @@ void Foam::HashTable<T, Key, Hash>::resize(const label newSize)
 
     HashTable<T, Key, Hash>* newTable = new HashTable<T, Key, Hash>(newSize);
 
-    for (const_iterator iter = begin(); iter != end(); ++iter)
+    for (const_iterator iter = cbegin(); iter != cend(); ++iter)
     {
         newTable->insert(iter.key(), *iter);
     }
@@ -565,7 +597,7 @@ void Foam::HashTable<T, Key, Hash>::operator=
         clear();
     }
 
-    for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+    for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
         insert(iter.key(), *iter);
     }
@@ -579,22 +611,22 @@ bool Foam::HashTable<T, Key, Hash>::operator==
 ) const
 {
     // Are all my elements in rhs?
-    for (const_iterator iter = begin(); iter != end(); ++iter)
+    for (const_iterator iter = cbegin(); iter != cend(); ++iter)
     {
         const_iterator fnd = rhs.find(iter.key());
 
-        if (fnd == rhs.end() || fnd() != iter())
+        if (fnd == rhs.cend() || fnd() != iter())
         {
             return false;
         }
     }
 
     // Are all rhs elements in me?
-    for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+    for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
         const_iterator fnd = find(iter.key());
 
-        if (fnd == end() || fnd() != iter())
+        if (fnd == cend() || fnd() != iter())
         {
             return false;
         }
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index 457e2f1b7e..5112f6fb7d 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -39,9 +39,10 @@ SourceFiles
 #define HashTable_H
 
 #include "label.H"
+#include "uLabel.H"
 #include "word.H"
-#include "className.H"
 #include "Xfer.H"
+#include "className.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -108,18 +109,25 @@ class HashTable
 
     // Private data: size of table, the table and current number of elements
 
+        //- The current number of elements in table
+        label nElmts_;
+
         //- Number of primary entries allocated in table (not necessarily used)
         label tableSize_;
 
         //- The table of primary entries
         hashedEntry** table_;
 
-        //- The current number of elements in table
-        label nElmts_;
-
 
     // Private Member Functions
 
+        //- Return a canonical (power-of-two) size
+        static label canonicalSize(const label);
+
+        //- Return the hash index of the Key within the current table size.
+        //  No checks for zero-sized tables.
+        inline label hashKeyIndex(const Key&) const;
+
         //- Assign a new hashedEntry to a possibly already existing key
         bool set(const Key&, const T& newElmt, bool protect);
 
@@ -142,10 +150,10 @@ public:
     // Constructors
 
         //- Construct given initial table size
-        HashTable(const label size = 100);
+        HashTable(const label size = 128);
 
         //- Construct from Istream
-        HashTable(Istream&, const label size = 100);
+        HashTable(Istream&, const label size = 128);
 
         //- Construct as copy
         HashTable(const HashTable<T, Key, Hash>&);
@@ -183,6 +191,8 @@ public:
             //- Return the table of contents
             List<Key> toc() const;
 
+            //- Print information
+            Ostream& printInfo(Ostream&) const;
 
         // Edit
 
@@ -280,7 +290,7 @@ public:
             // Private data
 
                 //- Reference to the HashTable this is an iterator for
-                HashTable<T, Key, Hash>& curHashTable_;
+                HashTable<T, Key, Hash>& hashTable_;
 
                 //- Current element
                 hashedEntry* elmtPtr_;
@@ -288,7 +298,6 @@ public:
                 //- Current hash index
                 label hashIndex_;
 
-
         public:
 
             // Constructors
@@ -301,7 +310,6 @@ public:
                     label hashIndex
                 );
 
-
             // Member operators
 
                 inline void operator=(const iterator&);
@@ -318,7 +326,7 @@ public:
                 inline iterator& operator++();
                 inline iterator operator++(int);
 
-                inline const Key& key();
+                inline const Key& key() const;
         };
 
 
@@ -339,7 +347,7 @@ public:
             // Private data
 
                 //- Reference to the HashTable this is an iterator for
-                const HashTable<T, Key, Hash>& curHashTable_;
+                const HashTable<T, Key, Hash>& hashTable_;
 
                 //- Current element
                 const hashedEntry* elmtPtr_;
@@ -380,7 +388,7 @@ public:
                 inline const_iterator& operator++();
                 inline const_iterator operator++(int);
 
-                inline const Key& key();
+                inline const Key& key() const;
         };
 
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index aea5f3043a..005979df3f 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -42,6 +42,17 @@ inline Foam::HashTable<T, Key, Hash>::hashedEntry::hashedEntry
 {}
 
 
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template<class T, class Key, class Hash>
+inline Foam::label
+Foam::HashTable<T, Key, Hash>::hashKeyIndex(const Key& key) const
+{
+    // size is power of two - this is the modulus
+    return Hash()(key) & (tableSize_ - 1);
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -112,7 +123,7 @@ inline const T& Foam::HashTable<T, Key, Hash>::operator[](const Key& key) const
 {
     const_iterator iter = find(key);
 
-    if (iter == end())
+    if (iter == cend())
     {
         FatalErrorIn("HashTable<T, Key, Hash>::operator[](const Key&) const")
             << key << " not found in table.  Valid entries: "
@@ -146,12 +157,12 @@ inline T& Foam::HashTable<T, Key, Hash>::operator()(const Key& key)
 template<class T, class Key, class Hash>
 inline Foam::HashTable<T, Key, Hash>::iterator::iterator
 (
-    HashTable<T, Key, Hash>& curHashTable,
+    HashTable<T, Key, Hash>& hashTbl,
     hashedEntry* elmt,
     label hashIndex
 )
 :
-    curHashTable_(curHashTable),
+    hashTable_(hashTbl),
     elmtPtr_(elmt),
     hashIndex_(hashIndex)
 {}
@@ -241,12 +252,12 @@ Foam::HashTable<T, Key, Hash>::iterator::operator++()
     // Step to the next table entry
     while
     (
-        ++hashIndex_ < curHashTable_.tableSize_
-     && !(elmtPtr_ = curHashTable_.table_[hashIndex_])
+        ++hashIndex_ < hashTable_.tableSize_
+     && !(elmtPtr_ = hashTable_.table_[hashIndex_])
     )
     {}
 
-    if (hashIndex_ == curHashTable_.tableSize_)
+    if (hashIndex_ == hashTable_.tableSize_)
     {
         // make end iterator
         elmtPtr_ = 0;
@@ -271,7 +282,7 @@ Foam::HashTable<T, Key, Hash>::iterator::operator++
 
 template<class T, class Key, class Hash>
 inline
-const Key& Foam::HashTable<T, Key, Hash>::iterator::key()
+const Key& Foam::HashTable<T, Key, Hash>::iterator::key() const
 {
     return elmtPtr_->key_;
 }
@@ -283,8 +294,15 @@ Foam::HashTable<T, Key, Hash>::begin()
 {
     label i = 0;
 
-    while (table_ && !table_[i] && ++i < tableSize_)
-    {}
+    if (nElmts_)
+    {
+        while (table_ && !table_[i] && ++i < tableSize_)
+        {}
+    }
+    else
+    {
+        i = tableSize_;
+    }
 
     if (i == tableSize_)
     {
@@ -317,12 +335,12 @@ Foam::HashTable<T, Key, Hash>::end()
 template<class T, class Key, class Hash>
 inline Foam::HashTable<T, Key, Hash>::const_iterator::const_iterator
 (
-    const HashTable<T, Key, Hash>& curHashTable,
+    const HashTable<T, Key, Hash>& hashTbl,
     const hashedEntry* elmt,
     label hashIndex
 )
 :
-    curHashTable_(curHashTable),
+    hashTable_(hashTbl),
     elmtPtr_(elmt),
     hashIndex_(hashIndex)
 {}
@@ -334,7 +352,7 @@ inline Foam::HashTable<T, Key, Hash>::const_iterator::const_iterator
     const iterator& iter
 )
 :
-    curHashTable_(iter.curHashTable_),
+    hashTable_(iter.hashTable_),
     elmtPtr_(iter.elmtPtr_),
     hashIndex_(iter.hashIndex_)
 {}
@@ -413,14 +431,14 @@ Foam::HashTable<T, Key, Hash>::const_iterator::operator++()
     if
     (
         !(elmtPtr_ = elmtPtr_->next_)
-     && ++hashIndex_ < curHashTable_.tableSize_
-     && !(elmtPtr_ = curHashTable_.table_[hashIndex_])
+     && ++hashIndex_ < hashTable_.tableSize_
+     && !(elmtPtr_ = hashTable_.table_[hashIndex_])
     )
     {
         while
         (
-            ++hashIndex_ < curHashTable_.tableSize_
-         && !(elmtPtr_ = curHashTable_.table_[hashIndex_])
+            ++hashIndex_ < hashTable_.tableSize_
+         && !(elmtPtr_ = hashTable_.table_[hashIndex_])
         )
         {}
     }
@@ -444,7 +462,7 @@ Foam::HashTable<T, Key, Hash>::const_iterator::operator++
 
 template<class T, class Key, class Hash>
 inline
-const Key& Foam::HashTable<T, Key, Hash>::const_iterator::key()
+const Key& Foam::HashTable<T, Key, Hash>::const_iterator::key() const
 {
     return elmtPtr_->key_;
 }
@@ -456,8 +474,15 @@ Foam::HashTable<T, Key, Hash>::cbegin() const
 {
     label i = 0;
 
-    while (table_ && !table_[i] && ++i < tableSize_)
-    {}
+    if (nElmts_)
+    {
+        while (table_ && !table_[i] && ++i < tableSize_)
+        {}
+    }
+    else
+    {
+        i = tableSize_;
+    }
 
     if (i == tableSize_)
     {
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
index d0251f5f21..2a407b44a5 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
@@ -33,21 +33,61 @@ License
 template<class T, class Key, class Hash>
 Foam::HashTable<T, Key, Hash>::HashTable(Istream& is, const label size)
 :
-    tableSize_(size),
-    table_(new hashedEntry*[tableSize_]),
+    HashTableName(),
     nElmts_(0),
+    tableSize_(canonicalSize(size)),
+    table_(new hashedEntry*[tableSize_]),
     endIter_(*this, NULL, 0),
     endConstIter_(*this, NULL, 0)
 {
-    for (label i=0; i<tableSize_; i++)
+    for (label hashIdx = 0; hashIdx < tableSize_; hashIdx++)
     {
-        table_[i] = 0;
+        table_[hashIdx] = 0;
     }
 
     operator>>(is, *this);
 }
 
 
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template<class T, class Key, class Hash>
+Foam::Ostream&
+Foam::HashTable<T, Key, Hash>::printInfo(Ostream& os) const
+{
+    label used = 0;
+    label maxChain = 0;
+    unsigned avgChain = 0;
+
+    for (label hashIdx = 0; hashIdx < tableSize_; ++hashIdx)
+    {
+        label count = 0;
+        for (hashedEntry* ep = table_[hashIdx]; ep; ep = ep->next_)
+        {
+            ++count;
+        }
+
+        if (count)
+        {
+            ++used;
+            avgChain += count;
+
+            if (maxChain < count)
+            {
+                maxChain = count;
+            }
+        }
+    }
+
+    os  << "HashTable<T,Key,Hash>"
+        << " elements:" << size() << " slots:" << used << "/" << tableSize_
+        << " chaining(avg/max):" << (used ? float(avgChain/used) : 0)
+        << "/" << maxChain << endl;
+
+    return os;
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -133,10 +173,13 @@ Foam::Istream& Foam::operator>>(Istream& is, HashTable<T, Key, Hash>& L)
         )
         {
             is.putBack(lastToken);
+
             Key key;
             is >> key;
+
             T element;
             is >> element;
+
             L.insert(key, element);
 
             is.fatalCheck
@@ -174,8 +217,8 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const HashTable<T, Key, Hash>& L)
     // Write contents
     for
     (
-        typename HashTable<T, Key, Hash>::const_iterator iter = L.begin();
-        iter != L.end();
+        typename HashTable<T, Key, Hash>::const_iterator iter = L.cbegin();
+        iter != L.cend();
         ++iter
     )
     {
diff --git a/src/OpenFOAM/containers/HashTables/Map/Map.H b/src/OpenFOAM/containers/HashTables/Map/Map.H
index e43283412d..e84e96899a 100644
--- a/src/OpenFOAM/containers/HashTables/Map/Map.H
+++ b/src/OpenFOAM/containers/HashTables/Map/Map.H
@@ -63,7 +63,7 @@ public:
     // Constructors
 
         //- Construct given initial size
-        Map(const label size = 100)
+        Map(const label size = 128)
         :
             HashTable<T, label, Hash<label> >(size)
         {}
diff --git a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
index cab0cf17ff..5d0b92b6de 100644
--- a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
+++ b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
@@ -58,7 +58,7 @@ public:
     // Constructors
 
         //- Construct given initial map size
-        PtrMap(const label size = 100)
+        PtrMap(const label size = 128)
         :
             HashPtrTable<T, label, Hash<label> >(size)
         {}
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
index 3ba659c83d..8d5362b89d 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
@@ -31,6 +31,33 @@ License
 #include "List.H"
 #include "IOstreams.H"
 
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template<class T, class Key, class Hash>
+Foam::label Foam::StaticHashTable<T, Key, Hash>::canonicalSize(const label size)
+{
+    if (size < 1)
+    {
+        return 0;
+    }
+
+    // enforce power of two
+    unsigned int goodSize = size;
+
+    if (goodSize & (goodSize - 1))
+    {
+        // brute-force is fast enough
+        goodSize = 1;
+        while (goodSize < unsigned(size))
+        {
+            goodSize <<= 1;
+        }
+    }
+
+    return goodSize;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct given initial table size
@@ -38,8 +65,8 @@ template<class T, class Key, class Hash>
 Foam::StaticHashTable<T, Key, Hash>::StaticHashTable(const label size)
 :
     StaticHashTableName(),
-    keys_(size),
-    objects_(size),
+    keys_(canonicalSize(size)),
+    objects_(keys_.size()),
     nElmts_(0),
     endIter_(*this, keys_.size(), 0),
     endConstIter_(*this, keys_.size(), 0)
@@ -75,7 +102,7 @@ Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
 template<class T, class Key, class Hash>
 Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
 (
-    const Xfer<StaticHashTable<T, Key, Hash> >& ht
+    const Xfer< StaticHashTable<T, Key, Hash> >& ht
 )
 :
     StaticHashTableName(),
@@ -101,14 +128,17 @@ Foam::StaticHashTable<T, Key, Hash>::~StaticHashTable()
 template<class T, class Key, class Hash>
 bool Foam::StaticHashTable<T, Key, Hash>::found(const Key& key) const
 {
-    label hashIdx = Hash()(key, keys_.size());
-    const List<Key>& localKeys = keys_[hashIdx];
-
-    forAll(localKeys, elemIdx)
+    if (nElmts_)
     {
-        if (key == localKeys[elemIdx])
+        const label hashIdx = hashKeyIndex(key);
+        const List<Key>& localKeys = keys_[hashIdx];
+
+        forAll(localKeys, elemIdx)
         {
-            return true;
+            if (key == localKeys[elemIdx])
+            {
+                return true;
+            }
         }
     }
 
@@ -131,14 +161,17 @@ Foam::StaticHashTable<T, Key, Hash>::find
     const Key& key
 )
 {
-    label hashIdx = Hash()(key, keys_.size());
-    const List<Key>& localKeys = keys_[hashIdx];
-
-    forAll(localKeys, elemIdx)
+    if (nElmts_)
     {
-        if (key == localKeys[elemIdx])
+        const label hashIdx = hashKeyIndex(key);
+        const List<Key>& localKeys = keys_[hashIdx];
+
+        forAll(localKeys, elemIdx)
         {
-            return iterator(*this, hashIdx, elemIdx);
+            if (key == localKeys[elemIdx])
+            {
+                return iterator(*this, hashIdx, elemIdx);
+            }
         }
     }
 
@@ -161,14 +194,17 @@ Foam::StaticHashTable<T, Key, Hash>::find
     const Key& key
 ) const
 {
-    label hashIdx = Hash()(key, keys_.size());
-    const List<Key>& localKeys = keys_[hashIdx];
-
-    forAll(localKeys, elemIdx)
+    if (nElmts_)
     {
-        if (key == localKeys[elemIdx])
+        const label hashIdx = hashKeyIndex(key);
+        const List<Key>& localKeys = keys_[hashIdx];
+
+        forAll(localKeys, elemIdx)
         {
-            return const_iterator(*this, hashIdx, elemIdx);
+            if (key == localKeys[elemIdx])
+            {
+                return const_iterator(*this, hashIdx, elemIdx);
+            }
         }
     }
 
@@ -180,7 +216,7 @@ Foam::StaticHashTable<T, Key, Hash>::find
     }
 #   endif
 
-    return end();
+    return cend();
 }
 
 
@@ -191,7 +227,7 @@ Foam::List<Key> Foam::StaticHashTable<T, Key, Hash>::toc() const
     List<Key> tofc(nElmts_);
     label i = 0;
 
-    for (const_iterator iter = begin(); iter != end(); ++iter)
+    for (const_iterator iter = cbegin(); iter != cend(); ++iter)
     {
         tofc[i++] = iter.key();
     }
@@ -208,7 +244,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::set
     const bool protect
 )
 {
-    label hashIdx = Hash()(key, keys_.size());
+    const label hashIdx = hashKeyIndex(key);
     List<Key>& localKeys = keys_[hashIdx];
 
     label existing = localKeys.size();
@@ -268,7 +304,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::erase(const iterator& cit)
         List<T>& localObjects = objects_[cit.hashIndex_];
 
         // Copy down
-        for (label i = cit.elementIndex_+1; i < localKeys.size(); i++)
+        for (label i = cit.elemIndex_+1; i < localKeys.size(); i++)
         {
             localKeys[i-1] = localKeys[i];
             localObjects[i-1] = localObjects[i];
@@ -279,8 +315,8 @@ bool Foam::StaticHashTable<T, Key, Hash>::erase(const iterator& cit)
         // adjust iterator after erase
         iterator& it = const_cast<iterator&>(cit);
 
-        it.elementIndex_--;
-        if (it.elementIndex_ < 0)
+        it.elemIndex_--;
+        if (it.elemIndex_ < 0)
         {
             // No previous element in the local list
 
@@ -291,7 +327,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::erase(const iterator& cit)
             if (it.hashIndex_ >= 0)
             {
                 // The last element in the local list
-                it.elementIndex_ = objects_[it.hashIndex_].size() - 1;
+                it.elemIndex_ = objects_[it.hashIndex_].size() - 1;
             }
             else
             {
@@ -299,7 +335,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::erase(const iterator& cit)
                 // - not end()
                 // - handled by operator++
                 it.hashIndex_ = -1;
-                it.elementIndex_ = 0;
+                it.elemIndex_ = 0;
             }
         }
 
@@ -369,8 +405,10 @@ Foam::label Foam::StaticHashTable<T, Key, Hash>::erase
 
 
 template<class T, class Key, class Hash>
-void Foam::StaticHashTable<T, Key, Hash>::resize(const label newSize)
+void Foam::StaticHashTable<T, Key, Hash>::resize(const label sz)
 {
+    label newSize = canonicalSize(sz);
+    
     if (newSize == keys_.size())
     {
 #       ifdef FULLDEBUG
@@ -388,7 +426,7 @@ void Foam::StaticHashTable<T, Key, Hash>::resize(const label newSize)
     {
         FatalErrorIn
         (
-            "StaticHashTable<T, Key, Hash>::StaticHashTable(const label size)"
+            "StaticHashTable<T, Key, Hash>::resize(const label)"
         )   << "Illegal size " << newSize << " for StaticHashTable."
             << " Minimum size is 1" << abort(FatalError);
     }
@@ -396,7 +434,7 @@ void Foam::StaticHashTable<T, Key, Hash>::resize(const label newSize)
 
     StaticHashTable<T, Key, Hash> newTable(newSize);
 
-    for (iterator iter = begin(); iter != end(); ++iter)
+    for (const_iterator iter = cbegin(); iter != cend(); ++iter)
     {
         newTable.insert(iter.key(), *iter);
     }
@@ -493,7 +531,7 @@ void Foam::StaticHashTable<T, Key, Hash>::operator=
     }
 
 
-    for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+    for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
         insert(iter.key(), *iter);
     }
@@ -506,22 +544,22 @@ bool Foam::StaticHashTable<T, Key, Hash>::operator==
 ) const
 {
     // Are all my elements in rhs?
-    for (const_iterator iter = begin(); iter != end(); ++iter)
+    for (const_iterator iter = cbegin(); iter != cend(); ++iter)
     {
         const_iterator fnd = rhs.find(iter.key());
 
-        if (fnd == rhs.end() || fnd() != iter())
+        if (fnd == rhs.cend() || fnd() != iter())
         {
             return false;
         }
     }
 
     // Are all rhs elements in me?
-    for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
+    for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
         const_iterator fnd = find(iter.key());
 
-        if (fnd == end() || fnd() != iter())
+        if (fnd == cend() || fnd() != iter())
         {
             return false;
         }
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
index 4513ea0245..25b5933e9d 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
@@ -32,7 +32,6 @@ Note
     Uses straight lists as underlying type.
     Is slower to insert than the standard HashTable, but should be more
     memory efficient and faster to access.
-    Explicitly does not have default size.
 
 SourceFiles
     StaticHashTableI.H
@@ -45,9 +44,10 @@ SourceFiles
 #define StaticHashTable_H
 
 #include "label.H"
+#include "uLabel.H"
 #include "word.H"
-#include "className.H"
 #include "Xfer.H"
+#include "className.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -99,6 +99,13 @@ class StaticHashTable
         //- The current number of elements in table
         label nElmts_;
 
+        //- Return a canonical (power-of-two) size
+        static label canonicalSize(const label);
+
+        //- Return the hash index of the Key within the current table size.
+        //  No checks for zero-sized tables.
+        inline label hashKeyIndex(const Key&) const;
+
         //- Assign a new hashed entry to a possibly already existing key
         bool set(const Key&, const T& newElmt, bool protect);
 
@@ -141,16 +148,16 @@ public:
     // Constructors
 
         //- Construct given initial table size
-        StaticHashTable(const label size = 100);
+        StaticHashTable(const label size = 128);
 
         //- Construct from Istream
-        StaticHashTable(Istream&, const label size = 100);
+        StaticHashTable(Istream&, const label size = 128);
 
         //- Construct as copy
         StaticHashTable(const StaticHashTable<T, Key, Hash>&);
 
         //- Construct by transferring the parameter contents
-        StaticHashTable(const Xfer<StaticHashTable<T, Key, Hash> >&);
+        StaticHashTable(const Xfer< StaticHashTable<T, Key, Hash> >&);
 
     // Destructor
 
@@ -181,6 +188,9 @@ public:
             //- Return the table of contents
             List<Key> toc() const;
 
+            //- Print information
+            Ostream& printInfo(Ostream&) const;
+
 
         // Edit
 
@@ -215,7 +225,7 @@ public:
             void transfer(StaticHashTable<T, Key, Hash>&);
 
             //- Transfer contents to the Xfer container
-            inline Xfer<StaticHashTable<T, Key, Hash> > xfer();
+            inline Xfer< StaticHashTable<T, Key, Hash> > xfer();
 
 
     // Member Operators
@@ -273,13 +283,13 @@ public:
             // Private data
 
                 //- Reference to the StaticHashTable this is an iterator for
-                TableRef curHashTable_;
+                TableRef hashTable_;
 
                 //- Current hash index
                 label hashIndex_;
 
                 //- Index of current element at hashIndex
-                label elementIndex_;
+                label elemIndex_;
 
         public:
 
@@ -288,9 +298,9 @@ public:
                 //- Construct from hash table, hash index and element index
                 inline Iterator
                 (
-                    TableRef curHashTable,
+                    TableRef,
                     label hashIndex_,
-                    label elementIndex_
+                    label elemIndex_
                 );
 
                 //- Construct from the non-const iterator
@@ -299,13 +309,13 @@ public:
 
             // Member operators
 
-                inline void operator=(const iterator& iter);
+                inline void operator=(const iterator&);
 
-                inline bool operator==(const iterator& iter) const;
-                inline bool operator==(const const_iterator& iter) const;
+                inline bool operator==(const iterator&) const;
+                inline bool operator==(const const_iterator&) const;
 
-                inline bool operator!=(const iterator& iter) const;
-                inline bool operator!=(const const_iterator& iter) const;
+                inline bool operator!=(const iterator&) const;
+                inline bool operator!=(const const_iterator&) const;
 
                 inline TRef operator*();
                 inline TRef operator()();
@@ -313,7 +323,7 @@ public:
                 inline Iterator& operator++();
                 inline Iterator operator++(int);
 
-                inline const Key& key();
+                inline const Key& key() const;
         };
 
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
index 5cd380357a..abd988a4df 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
@@ -29,6 +29,17 @@ License
 
 // * * * * * * * * * * * * * Private Member Classes * * * * * * * * * * * * //
 
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template<class T, class Key, class Hash>
+inline Foam::label
+Foam::StaticHashTable<T, Key, Hash>::hashKeyIndex(const Key& key) const
+{
+    // size is power of two - this is the modulus
+    return Hash()(key) & (keys_.size() - 1);
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -68,7 +79,7 @@ inline bool Foam::StaticHashTable<T, Key, Hash>::set
 
 
 template<class T, class Key, class Hash>
-inline Foam::Xfer<Foam::StaticHashTable<T, Key, Hash> >
+inline Foam::Xfer< Foam::StaticHashTable<T, Key, Hash> >
 Foam::StaticHashTable<T, Key, Hash>::xfer()
 {
     return xferMove(*this);
@@ -102,7 +113,7 @@ inline const T& Foam::StaticHashTable<T, Key, Hash>::operator[]
 {
     const_iterator iter = find(key);
 
-    if (iter == end())
+    if (iter == cend())
     {
         FatalErrorIn
         (
@@ -139,14 +150,14 @@ template<class T, class Key, class Hash>
 template<class TRef, class TableRef>
 inline Foam::StaticHashTable<T, Key, Hash>::Iterator<TRef, TableRef>::Iterator
 (
-    TableRef curHashTable,
+    TableRef hashTbl,
     label hashIndex,
-    label elementIndex
+    label elemIndex
 )
 :
-    curHashTable_(curHashTable),
+    hashTable_(hashTbl),
     hashIndex_(hashIndex),
-    elementIndex_(elementIndex)
+    elemIndex_(elemIndex)
 {}
 
 
@@ -157,9 +168,9 @@ inline Foam::StaticHashTable<T, Key, Hash>::Iterator<TRef, TableRef>::Iterator
     const iterator& iter
 )
 :
-    curHashTable_(iter.curHashTable_),
+    hashTable_(iter.hashTable_),
     hashIndex_(iter.hashIndex_),
-    elementIndex_(iter.elementIndex_)
+    elemIndex_(iter.elemIndex_)
 {}
 
 
@@ -172,7 +183,7 @@ Foam::StaticHashTable<T, Key, Hash>::Iterator<TRef, TableRef>::operator=
 )
 {
     this->hashIndex_ = iter.hashIndex_;
-    this->elementIndex_ = iter.elementIndex_;
+    this->elemIndex_ = iter.elemIndex_;
 }
 
 
@@ -184,7 +195,7 @@ Foam::StaticHashTable<T, Key, Hash>::Iterator<TRef, TableRef>::operator==
     const iterator& iter
 ) const
 {
-    return hashIndex_ == iter.hashIndex_ && elementIndex_ == iter.elementIndex_;
+    return hashIndex_ == iter.hashIndex_ && elemIndex_ == iter.elemIndex_;
 }
 
 
@@ -196,7 +207,7 @@ Foam::StaticHashTable<T, Key, Hash>::Iterator<TRef, TableRef>::operator==
     const const_iterator& iter
 ) const
 {
-    return hashIndex_ == iter.hashIndex_ && elementIndex_ == iter.elementIndex_;
+    return hashIndex_ == iter.hashIndex_ && elemIndex_ == iter.elemIndex_;
 }
 
 
@@ -229,7 +240,7 @@ template<class TRef, class TableRef>
 inline TRef
 Foam::StaticHashTable<T, Key, Hash>::Iterator<TRef, TableRef>::operator*()
 {
-    return curHashTable_.objects_[hashIndex_][elementIndex_];
+    return hashTable_.objects_[hashIndex_][elemIndex_];
 }
 
 
@@ -260,29 +271,29 @@ Foam::StaticHashTable<T, Key, Hash>::Iterator
     if (hashIndex_ >= 0)
     {
         // Try the next element on the local list
-        elementIndex_++;
+        elemIndex_++;
 
-        if (elementIndex_ < curHashTable_.objects_[hashIndex_].size())
+        if (elemIndex_ < hashTable_.objects_[hashIndex_].size())
         {
             return *this;
         }
     }
 
     // Step to the next table entry
-    elementIndex_ = 0;
+    elemIndex_ = 0;
 
     while
     (
-        ++hashIndex_ < curHashTable_.objects_.size()
-     && !curHashTable_.objects_[hashIndex_].size()
+        ++hashIndex_ < hashTable_.objects_.size()
+     && !hashTable_.objects_[hashIndex_].size()
     )
     {}
 
 
-    if (hashIndex_ >= curHashTable_.objects_.size())
+    if (hashIndex_ >= hashTable_.objects_.size())
     {
         // make end iterator
-        hashIndex_ = curHashTable_.keys_.size();
+        hashIndex_ = hashTable_.keys_.size();
     }
 
     return *this;
@@ -315,9 +326,9 @@ Foam::StaticHashTable<T, Key, Hash>::Iterator
 template<class T, class Key, class Hash>
 template<class TRef, class TableRef>
 inline const Key&
-Foam::StaticHashTable<T, Key, Hash>::Iterator<TRef, TableRef>::key()
+Foam::StaticHashTable<T, Key, Hash>::Iterator<TRef, TableRef>::key() const
 {
-    return curHashTable_.keys_[hashIndex_][elementIndex_];
+    return hashTable_.keys_[hashIndex_][elemIndex_];
 }
 
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C
index 064ce3c619..3939851fc5 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableIO.C
@@ -33,7 +33,7 @@ License
 template<class T, class Key, class Hash>
 Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
 (
-    Istream& is, 
+    Istream& is,
     const label size
 )
 :
@@ -57,6 +57,41 @@ Foam::StaticHashTable<T, Key, Hash>::StaticHashTable
 }
 
 
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template<class T, class Key, class Hash>
+Foam::Ostream&
+Foam::StaticHashTable<T, Key, Hash>::printInfo(Ostream& os) const
+{
+    label used = 0;
+    label maxChain = 0;
+    unsigned avgChain = 0;
+
+    // Find first non-empty entry
+    forAll(keys_, hashIdx)
+    {
+        const label count = keys_[hashIdx].size();
+        if (count)
+        {
+            ++used;
+            avgChain += count;
+
+            if (maxChain < count)
+            {
+                maxChain = count;
+            }
+        }
+    }
+
+    os  << "StaticHashTable<T,Key,Hash>"
+        << " elements:" << size() << " slots:" << used << "/" << keys_.size()
+        << " chaining(avg/max):" << (used ? float(avgChain/used) : 0)
+        << "/" << maxChain << endl;
+
+    return os;
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -142,10 +177,13 @@ Foam::Istream& Foam::operator>>(Istream& is, StaticHashTable<T, Key, Hash>& L)
         )
         {
             is.putBack(lastToken);
+
             Key key;
             is >> key;
+
             T element;
             is >> element;
+
             L.insert(key, element);
 
             is.fatalCheck
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
index 44e9878c72..9c8a22945a 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
@@ -38,6 +38,7 @@ SourceFiles
 #define LList_H
 
 #include "label.H"
+#include "uLabel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
index 448add5df3..feefd60c7c 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
@@ -38,6 +38,7 @@ SourceFiles
 #define UILList_H
 
 #include "label.H"
+#include "uLabel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index ba3423c8e2..848b797b2e 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -38,6 +38,7 @@ SourceFiles
 
 #include "bool.H"
 #include "label.H"
+#include "uLabel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index 0c67d7a56e..b5c957a537 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -38,6 +38,7 @@ SourceFiles
 
 #include "bool.H"
 #include "label.H"
+#include "uLabel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.C b/src/OpenFOAM/containers/Lists/FixedList/FixedList.C
index eec73d4143..735d897bb4 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.C
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.C
@@ -31,7 +31,7 @@ License
 
 // * * * * * * * * * * * * * * STL Member Functions  * * * * * * * * * * * * //
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 void Foam::FixedList<T, Size>::swap(FixedList<T, Size>& a)
 {
     List_ACCESS(T, (*this), vp);
@@ -47,7 +47,7 @@ void Foam::FixedList<T, Size>::swap(FixedList<T, Size>& a)
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 bool Foam::FixedList<T, Size>::operator==(const FixedList<T, Size>& a) const
 {
     bool equal = true;
@@ -63,20 +63,20 @@ bool Foam::FixedList<T, Size>::operator==(const FixedList<T, Size>& a) const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 bool Foam::FixedList<T, Size>::operator!=(const FixedList<T, Size>& a) const
 {
     return !operator==(a);
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 bool Foam::FixedList<T, Size>::operator<(const FixedList<T, Size>& a) const
 {
     for
     (
-        const_iterator vi = begin(), ai = a.begin();
-        vi < end() && ai < a.end();
+        const_iterator vi = cbegin(), ai = a.cbegin();
+        vi < cend() && ai < a.cend();
         vi++, ai++
     )
     {
@@ -101,21 +101,21 @@ bool Foam::FixedList<T, Size>::operator<(const FixedList<T, Size>& a) const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 bool Foam::FixedList<T, Size>::operator>(const FixedList<T, Size>& a) const
 {
     return a.operator<(*this);
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 bool Foam::FixedList<T, Size>::operator<=(const FixedList<T, Size>& a) const
 {
     return !operator>(a);
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 bool Foam::FixedList<T, Size>::operator>=(const FixedList<T, Size>& a) const
 {
     return !operator<(a);
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index 0079f13a02..6c64a92d03 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -38,9 +38,12 @@ SourceFiles
 #ifndef FixedList_H
 #define FixedList_H
 
+#include "bool.H"
 #include "label.H"
+#include "uLabel.H"
 #include "Hash.H"
 #include "autoPtr.H"
+#include "StaticAssert.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,12 +52,12 @@ namespace Foam
 
 // Forward declaration of friend functions and operators
 
-template<class T, label Size> class FixedList;
+template<class T, unsigned Size> class FixedList;
 
-template<class T, label Size>
+template<class T, unsigned Size>
 Istream& operator>>(Istream&, FixedList<T, Size>&);
 
-template<class T, label Size>
+template<class T, unsigned Size>
 Ostream& operator<<(Ostream&, const FixedList<T, Size>&);
 
 template<class T> class UList;
@@ -65,9 +68,12 @@ template<class T> class SLList;
                            Class FixedList Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class T, label Size>
+template<class T, unsigned Size>
 class FixedList
 {
+    //- Size must be positive (non-zero) and also fit as a signed value
+    StaticAssert(Size && Size <= INT_MAX);
+
     // Private data
 
         //- Vector of values of type T of size Size.
@@ -76,20 +82,19 @@ class FixedList
 
 public:
 
-    //- Hashing function class
-    //  Rotating hash from http://burtleburtle.net/bob/hash/doobs.html
-    template<class HashT=Hash<T> >
+    //- Hashing function class.
+    //  Use Hasher directly for contiguous data. Otherwise hash incrementally.
+    template< class HashT=Hash<T> >
     class Hash
-    :
-        public Foam::Hash<FixedList<T, Size> >
     {
     public:
-        inline Hash();
-        label operator()(const FixedList<T, Size>&) const;
-        label operator()
+        Hash()
+        {}
+
+        inline unsigned operator()
         (
             const FixedList<T, Size>&,
-            const label tableSize
+            unsigned seed = 0
         ) const;
     };
 
@@ -123,7 +128,7 @@ public:
         FixedList(Istream&);
 
         //- Clone
-        inline autoPtr<FixedList<T, Size> > clone() const;
+        inline autoPtr< FixedList<T, Size> > clone() const;
 
 
     // Member Functions
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index a800b04b1d..564742d491 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -26,47 +26,48 @@ License
 
 #include "UList.H"
 #include "SLList.H"
+#include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline Foam::FixedList<T, Size>::FixedList()
 {}
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline Foam::FixedList<T, Size>::FixedList(const T v[Size])
 {
-    for (register label i=0; i<Size; i++)
+    for (register unsigned i=0; i<Size; i++)
     {
         v_[i] = v[i];
     }
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline Foam::FixedList<T, Size>::FixedList(const T& t)
 {
-    for (register label i=0; i<Size; i++)
+    for (register unsigned i=0; i<Size; i++)
     {
         v_[i] = t;
     }
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline Foam::FixedList<T, Size>::FixedList(const UList<T>& lst)
 {
     checkSize(lst.size());
 
-    for (register label i=0; i<Size; i++)
+    for (register unsigned i=0; i<Size; i++)
     {
         v_[i] = lst[i];
     }
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline Foam::FixedList<T, Size>::FixedList(const SLList<T>& lst)
 {
     checkSize(lst.size());
@@ -84,41 +85,41 @@ inline Foam::FixedList<T, Size>::FixedList(const SLList<T>& lst)
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline Foam::FixedList<T, Size>::FixedList(const FixedList<T, Size>& lst)
 {
-    for (register label i=0; i<Size; i++)
+    for (register unsigned i=0; i<Size; i++)
     {
         v_[i] = lst[i];
     }
 }
 
 
-template<class T, Foam::label Size>
-inline Foam::autoPtr<Foam::FixedList<T, Size> >
+template<class T, unsigned Size>
+inline Foam::autoPtr< Foam::FixedList<T, Size> >
 Foam::FixedList<T, Size>::clone() const
 {
-    return autoPtr<FixedList<T, Size> >(new FixedList<T, Size>(*this));
+    return autoPtr< FixedList<T, Size> >(new FixedList<T, Size>(*this));
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline const Foam::FixedList<T, Size>& Foam::FixedList<T, Size>::null()
 {
     return *reinterpret_cast< FixedList<T, Size>* >(0);
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline Foam::label Foam::FixedList<T, Size>::fcIndex(const label i) const
 {
     return (i == Size-1 ? 0 : i+1);
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline Foam::label Foam::FixedList<T, Size>::rcIndex(const label i) const
 {
     return (i ? i-1 : Size-1);
@@ -126,51 +127,51 @@ inline Foam::label Foam::FixedList<T, Size>::rcIndex(const label i) const
 
 
 // Check start is within valid range (0 ... size-1).
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::checkStart(const label start) const
 {
-    if (start<0 || (start && start>=Size))
+    if (start < 0 || (start && unsigned(start) >= Size))
     {
         FatalErrorIn("FixedList<T, Size>::checkStart(const label)")
-            << "start " << start << " out of range 0 ... " << max(Size-1, 0)
+            << "start " << start << " out of range 0 ... " << (Size-1)
             << abort(FatalError);
     }
 }
 
 
 // Check size is within valid range (0 ... size).
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::checkSize(const label size) const
 {
-    if (size<0 || size>Size)
+    if (size < 0 || unsigned(size) > Size)
     {
         FatalErrorIn("FixedList<T, Size>::checkSize(const label)")
-            << "size " << size << " out of range 0 ... " << Size
+            << "size " << size << " out of range 0 ... " << (Size)
             << abort(FatalError);
     }
 }
 
 
 // Check index i is within valid range (0 ... size-1).
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::checkIndex(const label i) const
 {
     if (!Size)
     {
         FatalErrorIn("FixedList<T, Size>::checkIndex(const label)")
-            << "attempt to access element from zero sized list"
+            << "attempt to access element from zero-sized list"
             << abort(FatalError);
     }
-    else if (i<0 || i>=Size)
+    else if (i < 0 || i >= Size)
     {
         FatalErrorIn("FixedList<T, Size>::checkIndex(const label)")
-            << "index " << i << " out of range 0 ... " << Size-1
+            << "index " << i << " out of range 0 ... " << (Size-1)
             << abort(FatalError);
     }
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::resize(const label s)
 {
 #   ifdef FULLDEBUG
@@ -178,7 +179,7 @@ inline void Foam::FixedList<T, Size>::resize(const label s)
 #   endif
 }
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::setSize(const label s)
 {
 #   ifdef FULLDEBUG
@@ -186,17 +187,17 @@ inline void Foam::FixedList<T, Size>::setSize(const label s)
 #   endif
 }
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::transfer(const FixedList<T, Size>& lst)
 {
-    for (register label i=0; i<Size; i++)
+    for (register unsigned i=0; i<Size; i++)
     {
         v_[i] = lst[i];
     }
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline const T*
 Foam::FixedList<T, Size>::cdata() const
 {
@@ -204,7 +205,7 @@ Foam::FixedList<T, Size>::cdata() const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline T*
 Foam::FixedList<T, Size>::data()
 {
@@ -215,7 +216,7 @@ Foam::FixedList<T, Size>::data()
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 // element access
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline T& Foam::FixedList<T, Size>::operator[](const label i)
 {
 #   ifdef FULLDEBUG
@@ -226,7 +227,7 @@ inline T& Foam::FixedList<T, Size>::operator[](const label i)
 
 
 // const element access
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline const T& Foam::FixedList<T, Size>::operator[](const label i) const
 {
 #   ifdef FULLDEBUG
@@ -236,27 +237,27 @@ inline const T& Foam::FixedList<T, Size>::operator[](const label i) const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::operator=(const T lst[Size])
 {
-    for (register label i=0; i<Size; i++)
+    for (register unsigned i=0; i<Size; i++)
     {
         v_[i] = lst[i];
     }
 }
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::operator=(const UList<T>& lst)
 {
     checkSize(lst.size());
 
-    for (register label i=0; i<Size; i++)
+    for (register unsigned i=0; i<Size; i++)
     {
         v_[i] = lst[i];
     }
 }
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::operator=(const SLList<T>& lst)
 {
     checkSize(lst.size());
@@ -273,10 +274,10 @@ inline void Foam::FixedList<T, Size>::operator=(const SLList<T>& lst)
     }
 }
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::operator=(const T& t)
 {
-    for (register label i=0; i<Size; i++)
+    for (register unsigned i=0; i<Size; i++)
     {
         v_[i] = t;
     }
@@ -285,7 +286,7 @@ inline void Foam::FixedList<T, Size>::operator=(const T& t)
 
 // * * * * * * * * * * * * * * STL Member Functions  * * * * * * * * * * * * //
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::iterator
 Foam::FixedList<T, Size>::begin()
 {
@@ -293,7 +294,7 @@ Foam::FixedList<T, Size>::begin()
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::const_iterator
 Foam::FixedList<T, Size>::begin() const
 {
@@ -301,7 +302,7 @@ Foam::FixedList<T, Size>::begin() const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::const_iterator
 Foam::FixedList<T, Size>::cbegin() const
 {
@@ -309,7 +310,7 @@ Foam::FixedList<T, Size>::cbegin() const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::iterator
 Foam::FixedList<T, Size>::end()
 {
@@ -317,7 +318,7 @@ Foam::FixedList<T, Size>::end()
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::const_iterator
 Foam::FixedList<T, Size>::end() const
 {
@@ -325,7 +326,7 @@ Foam::FixedList<T, Size>::end() const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::const_iterator
 Foam::FixedList<T, Size>::cend() const
 {
@@ -333,7 +334,7 @@ Foam::FixedList<T, Size>::cend() const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::iterator
 Foam::FixedList<T, Size>::rbegin()
 {
@@ -341,7 +342,7 @@ Foam::FixedList<T, Size>::rbegin()
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::const_iterator
 Foam::FixedList<T, Size>::rbegin() const
 {
@@ -349,7 +350,7 @@ Foam::FixedList<T, Size>::rbegin() const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::const_iterator
 Foam::FixedList<T, Size>::crbegin() const
 {
@@ -357,7 +358,7 @@ Foam::FixedList<T, Size>::crbegin() const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::iterator
 Foam::FixedList<T, Size>::rend()
 {
@@ -365,7 +366,7 @@ Foam::FixedList<T, Size>::rend()
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::const_iterator
 Foam::FixedList<T, Size>::rend() const
 {
@@ -373,7 +374,7 @@ Foam::FixedList<T, Size>::rend() const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline typename Foam::FixedList<T, Size>::const_iterator
 Foam::FixedList<T, Size>::crend() const
 {
@@ -381,21 +382,21 @@ Foam::FixedList<T, Size>::crend() const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline Foam::label Foam::FixedList<T, Size>::size() const
 {
     return Size;
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline Foam::label Foam::FixedList<T, Size>::max_size() const
 {
     return Size;
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 inline bool Foam::FixedList<T, Size>::empty() const
 {
     return false;
@@ -403,42 +404,33 @@ inline bool Foam::FixedList<T, Size>::empty() const
 
 
 #ifndef __CINT__
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 template<class HashT>
-inline Foam::FixedList<T, Size>::Hash<HashT>::Hash()
-{}
-
-//- Rotating Hash. From http://burtleburtle.net/bob/hash/doobs.html
-template<class T, Foam::label Size>
-template<class HashT>
-inline Foam::label Foam::FixedList<T, Size>::Hash<HashT>::operator()
-(
-    const FixedList<T, Size>& lst
-) const
-{
-    static const label farbit(8*sizeof(label)-4);
-
-    label val = Size;
-
-    for (register int i=0; i<Size; i++)
-    {
-        val = (val<<4)^(val>>farbit)^HashT()(lst[i]);
-    }
-
-    return val;
-}
-
-template<class T, Foam::label Size>
-template<class HashT>
-inline Foam::label Foam::FixedList<T, Size>::Hash<HashT>::operator()
+inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
 (
     const FixedList<T, Size>& lst,
-    const label tableSize
+    unsigned seed
 ) const
 {
-    return mag(operator()(lst)) % tableSize;
-}
-#endif
+    if (contiguous<T>())
+    {
+        // hash directly
+        return Hasher(lst.v_, sizeof(lst.v_), seed);
+    }
+    else
+    {
+        // hash incrementally
+        unsigned val = seed;
 
+        for (register unsigned i=0; i<Size; i++)
+        {
+            val = HashT()(lst[i], val);
+        }
+
+        return val;
+    }
+}
+
+#endif  // __CINT__
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
index 49caad2a0a..aab7376e05 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListIO.C
@@ -32,14 +32,14 @@ License
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 Foam::FixedList<T, Size>::FixedList(Istream& is)
 {
     operator>>(is, *this);
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 Foam::Istream& Foam::operator>>(Foam::Istream& is, FixedList<T, Size>& L)
 {
     is.fatalCheck("operator>>(Istream&, FixedList<T, Size>&)");
@@ -86,7 +86,7 @@ Foam::Istream& Foam::operator>>(Foam::Istream& is, FixedList<T, Size>& L)
 
         if (listDelimiter == token::BEGIN_LIST)
         {
-            for (register label i=0; i<Size; i++)
+            for (register unsigned i=0; i<Size; i++)
             {
                 is >> L[i];
 
@@ -108,7 +108,7 @@ Foam::Istream& Foam::operator>>(Foam::Istream& is, FixedList<T, Size>& L)
                 "reading the single entry"
             );
 
-            for (register label i=0; i<Size; i++)
+            for (register unsigned i=0; i<Size; i++)
             {
                 L[i] = element;
             }
@@ -134,7 +134,7 @@ Foam::Istream& Foam::operator>>(Foam::Istream& is, FixedList<T, Size>& L)
 
 // * * * * * * * * * * * * * * * Ostream Operator *  * * * * * * * * * * * * //
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 void Foam::FixedList<T, Size>::writeEntry(Ostream& os) const
 {
     if
@@ -153,7 +153,7 @@ void Foam::FixedList<T, Size>::writeEntry(Ostream& os) const
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 void Foam::FixedList<T, Size>::writeEntry
 (
     const word& keyword,
@@ -166,7 +166,7 @@ void Foam::FixedList<T, Size>::writeEntry
 }
 
 
-template<class T, Foam::label Size>
+template<class T, unsigned Size>
 Foam::Ostream& Foam::operator<<(Ostream& os, const FixedList<T, Size>& L)
 {
     // Write list contents depending on data format
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 137f17e8ea..542f945184 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -205,7 +205,7 @@ Foam::List<T>::List(InputIterator first, InputIterator last)
 
 // Construct as copy of FixedList<T, Size>
 template<class T>
-template<Foam::label Size>
+template<unsigned Size>
 Foam::List<T>::List(const FixedList<T, Size>& lst)
 :
     UList<T>(NULL, Size)
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index 983b2be008..0c08eed8fe 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -59,7 +59,7 @@ template<class T> class List;
 
 template<class T> Istream& operator>>(Istream&, List<T>&);
 
-template<class T, label Size> class FixedList;
+template<class T, unsigned Size> class FixedList;
 template<class T> class PtrList;
 template<class T> class SLList;
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
@@ -117,7 +117,7 @@ public:
         List(InputIterator first, InputIterator last);
 
         //- Construct as copy of FixedList<T, Size>
-        template<label Size>
+        template<unsigned Size>
         List(const FixedList<T, Size>&);
 
         //- Construct as copy of PtrList<T>
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 5f71976aa9..af0f5cb5e0 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -76,9 +76,6 @@ Note
 SeeAlso
     Foam::DynamicList
 
-ToDo
-    Checks for bad template parameters (ie, nBits=0, nBits too large)?
-
 SourceFiles
     PackedListI.H
     PackedList.C
@@ -89,6 +86,7 @@ SourceFiles
 #define PackedList_H
 
 #include "labelList.H"
+#include "StaticAssert.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -120,6 +118,10 @@ class PackedList
     typedef unsigned int      StorageType;
     typedef List<StorageType> StorageList;
 
+    //- nBits must be positive (non-zero) and fit within the storage
+    //  For simplicity, assume 8-bit bytes
+    StaticAssert(nBits && nBits < (sizeof(StorageType) << 3));
+
     // Private data
 
         //- Number of nBits entries
@@ -148,9 +150,11 @@ public:
         //- Masking for all bits below the offset
         inline static unsigned int maskLower(unsigned offset);
 
-    // Forward declaration of iteratorBase
+    // Forward declaration of iterators
 
         class iteratorBase;
+        class iterator;
+        class const_iterator;
 
     // Constructors
 
@@ -328,7 +332,7 @@ public:
 
             // Member Operators
 
-                //- Compare positions
+                //- Compare values (not positions)
                 inline bool operator==(const iteratorBase&) const;
                 inline bool operator!=(const iteratorBase&) const;
 
@@ -355,7 +359,10 @@ public:
             public iteratorBase
         {
 
-            //- Should never violate const-ness!
+            //- Disallow copy constructor from const_iterator - violates const-ness!
+            iterator(const const_iterator&);
+
+            //- Disallow assignment from const_iterator - violates const-ness!
             void operator=(const const_iterator&);
 
         public:
@@ -375,6 +382,10 @@ public:
 
             // Member Operators
 
+                //- Compare positions (not values)
+                inline bool operator==(const iteratorBase&) const;
+                inline bool operator!=(const iteratorBase&) const;
+
                 //- Assign from iteratorBase, eg iter = packedlist[i]
                 //  An out-of-range iterator is assigned end()
                 inline iterator& operator=(const iteratorBase&);
@@ -420,17 +431,21 @@ public:
 
                 //- Construct from iterator base, eg iter(packedlist[i])
                 //  but also  "const_iterator iter = packedlist[i];"
-                //  An out-of-range iterator is assigned end()
+                //  An out-of-range iterator is assigned cend()
                 inline const_iterator(const iteratorBase&);
 
                 //- Construct from base list and position index
                 inline const_iterator(const PackedList*, const label);
 
-                //- Construct from non-const iterator
+                //- Construct from iterator
                 inline const_iterator(const iterator&);
 
             // Member operators
 
+                //- Compare positions (not values)
+                inline bool operator==(const iteratorBase&) const;
+                inline bool operator!=(const iteratorBase&) const;
+
                 //- Assign from iteratorBase or derived
                 //  eg, iter = packedlist[i] or even iter = list.begin()
                 inline const_iterator& operator=(const iteratorBase&);
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 929688ef24..3b76234c2c 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -176,7 +176,7 @@ inline bool Foam::PackedList<nBits>::iteratorBase::operator==
     const iteratorBase& iter
 ) const
 {
-    return this->index_ == iter.index_;
+    return this->get() == iter.get();
 }
 
 
@@ -186,7 +186,7 @@ inline bool Foam::PackedList<nBits>::iteratorBase::operator!=
     const iteratorBase& iter
 ) const
 {
-    return this->index_ != iter.index_;
+    return this->get() != iter.get();
 }
 
 
@@ -311,6 +311,48 @@ inline Foam::PackedList<nBits>::const_iterator::const_iterator
 {}
 
 
+template<unsigned nBits>
+inline bool Foam::PackedList<nBits>::iterator::operator==
+(
+    const iteratorBase& iter
+) const
+{
+    return this->index_ == iter.index_;
+}
+
+
+template<unsigned nBits>
+inline bool Foam::PackedList<nBits>::iterator::operator!=
+(
+    const iteratorBase& iter
+) const
+{
+    return this->index_ != iter.index_;
+}
+
+
+
+template<unsigned nBits>
+inline bool Foam::PackedList<nBits>::const_iterator::operator==
+(
+    const iteratorBase& iter
+) const
+{
+    return this->index_ == iter.index_;
+}
+
+
+template<unsigned nBits>
+inline bool Foam::PackedList<nBits>::const_iterator::operator!=
+(
+    const iteratorBase& iter
+) const
+{
+    return this->index_ != iter.index_;
+}
+
+
+
 template<unsigned nBits>
 inline typename Foam::PackedList<nBits>::iterator&
 Foam::PackedList<nBits>::iterator::operator=(const iteratorBase& iter)
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
index 0eb7a33c8f..60a378b053 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
@@ -53,9 +53,9 @@ inline Foam::SubList<T>::SubList
 {
 #   ifdef FULLDEBUG
 
-    // Artificially allowing the start of a zero-sized subList to be
+    // Artificially allow the start of a zero-sized subList to be
     // one past the end of the original list.
-    if (subSize > 0)
+    if (subSize)
     {
         list.checkStart(startIndex);
         list.checkSize(startIndex + subSize);
@@ -84,7 +84,7 @@ inline const Foam::SubList<T>& Foam::SubList<T>::null()
 template<class T>
 inline Foam::SubList<T>::operator const Foam::List<T>&() const
 {
-    return *reinterpret_cast<const List<T>*>(this);
+    return *reinterpret_cast< const List<T>* >(this);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 80bf066e19..6370f8e749 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -43,8 +43,9 @@ SourceFiles
 #ifndef UList_H
 #define UList_H
 
-#include "label.H"
 #include "bool.H"
+#include "label.H"
+#include "uLabel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/NamedEnum/NamedEnum.H b/src/OpenFOAM/containers/NamedEnum/NamedEnum.H
index faacbaff9b..5312c40e05 100644
--- a/src/OpenFOAM/containers/NamedEnum/NamedEnum.H
+++ b/src/OpenFOAM/containers/NamedEnum/NamedEnum.H
@@ -37,6 +37,7 @@ SourceFiles
 #define NamedEnum_H
 
 #include "HashTable.H"
+#include "StaticAssert.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -52,6 +53,9 @@ class NamedEnum
 :
     public HashTable<int>
 {
+    //- nEnum must be positive (non-zero)
+    StaticAssert(nEnum > 0);
+
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -99,7 +103,7 @@ public:
             return Enum(HashTable<int>::operator[](name));
         }
 
-        //- Return the name or the given enumeration element
+        //- Return the name of the given enumeration element
         const char* operator[](const Enum e) const
         {
             return names[e];
diff --git a/src/OpenFOAM/db/Callback/Callback.C b/src/OpenFOAM/db/Callback/Callback.C
index e937cc1f0c..dc80a76692 100644
--- a/src/OpenFOAM/db/Callback/Callback.C
+++ b/src/OpenFOAM/db/Callback/Callback.C
@@ -26,15 +26,10 @@ License
 
 #include "Callback.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CallbackType>
-Callback<CallbackType>::Callback(CallbackRegistry<CallbackType>& cbr)
+Foam::Callback<CallbackType>::Callback(CallbackRegistry<CallbackType>& cbr)
 :
     cbr_(cbr)
 {
@@ -43,7 +38,7 @@ Callback<CallbackType>::Callback(CallbackRegistry<CallbackType>& cbr)
 
 
 template<class CallbackType>
-Callback<CallbackType>::Callback(const Callback<CallbackType>& cb)
+Foam::Callback<CallbackType>::Callback(const Callback<CallbackType>& cb)
 :
     cbr_(cb.cbr_)
 {
@@ -54,7 +49,7 @@ Callback<CallbackType>::Callback(const Callback<CallbackType>& cb)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class CallbackType>
-Callback<CallbackType>::~Callback()
+Foam::Callback<CallbackType>::~Callback()
 {
     checkOut();
 }
@@ -63,7 +58,7 @@ Callback<CallbackType>::~Callback()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CallbackType>
-bool Callback<CallbackType>::checkIn()
+bool Foam::Callback<CallbackType>::checkIn()
 {
     if (!Callback<CallbackType>::link::registered())
     {
@@ -78,7 +73,7 @@ bool Callback<CallbackType>::checkIn()
 
 
 template<class CallbackType>
-bool Callback<CallbackType>::checkOut()
+bool Foam::Callback<CallbackType>::checkOut()
 {
     if (Callback<CallbackType>::link::registered())
     {
@@ -100,8 +95,4 @@ bool Callback<CallbackType>::checkOut()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index 0a54089b99..0368b02e2e 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -30,10 +30,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(IOobject, 0);
-}
+defineTypeNameAndDebug(Foam::IOobject, 0);
 
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index 5559a2295a..d2fc9a6ba1 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -353,11 +353,11 @@ public:
             //- Write the standard OpenFOAM file/dictionary banner
             //  Optionally without -*- C++ -*- editor hint (eg, for logs)
             template<class Stream>
-            static inline void writeBanner(Stream& os, bool noHint=false);
+            static inline Stream& writeBanner(Stream& os, bool noHint=false);
 
             //- Write the standard file section divider
             template<class Stream>
-            static inline void writeDivider(Stream& os);
+            static inline Stream& writeDivider(Stream& os);
 
             //- Write header
             bool writeHeader(Ostream&) const;
diff --git a/src/OpenFOAM/db/IOobject/IOobjectI.H b/src/OpenFOAM/db/IOobject/IOobjectI.H
index 2407507c86..71af2039f6 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectI.H
+++ b/src/OpenFOAM/db/IOobject/IOobjectI.H
@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Stream>
-inline void Foam::IOobject::writeBanner(Stream& os, bool noHint)
+inline Stream& Foam::IOobject::writeBanner(Stream& os, bool noHint)
 {
     static bool spacesSet(false);
     static char spaces[40];
@@ -68,14 +68,18 @@ inline void Foam::IOobject::writeBanner(Stream& os, bool noHint)
         "|   \\\\  /    A nd           | Web:      www.OpenFOAM.org                      |\n"
         "|    \\\\/     M anipulation  |                                                 |\n"
         "\\*---------------------------------------------------------------------------*/\n";
+
+    return os;
 }
 
 
 template<class Stream>
-inline void Foam::IOobject::writeDivider(Stream& os)
+inline Stream& Foam::IOobject::writeDivider(Stream& os)
 {
     os  <<
         "// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //\n";
+
+    return os;
 }
 
 
diff --git a/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C b/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
index 2f5bf1e946..2816b40d59 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
@@ -91,7 +91,7 @@ bool Foam::IOobject::readHeader(Istream& is)
             << "First token could not be read or is not the keyword 'FoamFile'"
             << nl << nl << "Check header is of the form:" << nl << endl;
 
-        writeHeader(Info);
+        writeHeader(SeriousError);
 
         return false;
     }
diff --git a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
index ff62a38096..8c3d8b9485 100644
--- a/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
+++ b/src/OpenFOAM/db/IOobject/IOobjectWriteHeader.C
@@ -43,8 +43,8 @@ bool Foam::IOobject::writeHeader(Ostream& os) const
         return false;
     }
 
-    writeBanner(os);
-    os  << "FoamFile\n{\n"
+    writeBanner(os)
+        << "FoamFile\n{\n"
         << "    version     " << os.version() << ";\n"
         << "    format      " << os.format() << ";\n"
         << "    class       " << type() << ";\n";
@@ -58,8 +58,7 @@ bool Foam::IOobject::writeHeader(Ostream& os) const
         << "    object      " << name() << ";\n"
         << "}" << nl;
 
-    writeDivider(os);
-    os  << endl;
+    writeDivider(os) << endl;
 
     return true;
 }
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.H b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
index 44cb6f1dc1..71c63f9d38 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.H
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
@@ -63,7 +63,7 @@ public:
     // Constructors
 
         //- Construct given an initial estimate for the number of entries
-        explicit IOobjectList(const label nIoObjects = 100);
+        explicit IOobjectList(const label nIoObjects = 128);
 
         //- Construct from objectRegistry and instance path
         IOobjectList
diff --git a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
index a8dc22b3ac..53e001b699 100644
--- a/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
+++ b/src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
@@ -35,10 +35,8 @@ Description
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(IOdictionary, 0);
-}
+defineTypeNameAndDebug(Foam::IOdictionary, 0);
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
index 83951b3871..68fe61ce2c 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
@@ -30,10 +30,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(IFstream, 0);
-}
+defineTypeNameAndDebug(Foam::IFstream, 0);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index f65f0eb636..27dc86436b 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -30,10 +30,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(OFstream, 0);
-}
+defineTypeNameAndDebug(Foam::OFstream, 0);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
index 56f94a688b..f2846f47f5 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
@@ -46,6 +46,7 @@ SourceFiles
 #include "char.H"
 #include "bool.H"
 #include "label.H"
+#include "uLabel.H"
 #include "scalar.H"
 #include "fileName.H"
 #include "InfoProxy.H"
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/chkStream.C b/src/OpenFOAM/db/IOstreams/Sstreams/chkStream.C
index 710a887d3a..af8476da9c 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/chkStream.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/chkStream.C
@@ -28,17 +28,11 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
-
 #include "token.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-bool checkStream(istream& is, const string& fnName)
+bool Foam::checkStream(istream& is, const string& fnName)
 {
     if (!is.good())
     {
@@ -50,7 +44,7 @@ bool checkStream(istream& is, const string& fnName)
 }
 
 
-bool checkStream(ostream& os, const string& fnName)
+bool Foam::checkStream(ostream& os, const string& fnName)
 {
     if (!os.good())
     {
@@ -62,8 +56,4 @@ bool checkStream(ostream& os, const string& fnName)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/readHexLabel.H b/src/OpenFOAM/db/IOstreams/Sstreams/readHexLabel.H
index 63f395b2a2..fffccc4525 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/readHexLabel.H
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/readHexLabel.H
@@ -36,8 +36,8 @@ SourceFiles
 #ifndef readHexLabel_H
 #define readHexLabel_H
 
-#include "ISstream.H"
 #include "label.H"
+#include "ISstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/state.C b/src/OpenFOAM/db/IOstreams/Sstreams/state.C
index ed2aba7b05..cff808bf40 100644
--- a/src/OpenFOAM/db/IOstreams/Sstreams/state.C
+++ b/src/OpenFOAM/db/IOstreams/Sstreams/state.C
@@ -29,19 +29,13 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
-
 #include "token.H"
 #include "int.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Print state of ostream.
 
-void state(ostream& to, const string& s)
+void Foam::state(ostream& to, const string& s)
 {
     state_value osState = state_value(to.rdstate());
 
@@ -82,7 +76,7 @@ void state(ostream& to, const string& s)
 
 
 //  Print state of istream.
-void state(istream& from, const string& s)
+void Foam::state(istream& from, const string& s)
 {
     state_value isState = state_value(from.rdstate());
 
@@ -126,8 +120,4 @@ void state(istream& from, const string& s)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index cf51ad8a09..2defc09d73 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -39,6 +39,7 @@ SourceFiles
 #define token_H
 
 #include "label.H"
+#include "uLabel.H"
 #include "scalar.H"
 #include "word.H"
 #include "InfoProxy.H"
diff --git a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H
index 610f54282a..01d574f8e8 100644
--- a/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H
+++ b/src/OpenFOAM/db/dlLibraryTable/dlLibraryTable.H
@@ -36,9 +36,9 @@ SourceFiles
 #ifndef dlLibraryTable_H
 #define dlLibraryTable_H
 
-#include "HashTable.H"
 #include "label.H"
-#include "pTraits.H"
+#include "Hash.H"
+#include "HashTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,31 +46,9 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class dlLibraryTable Declaration
+                       Class dlLibraryTable Declaration
 \*---------------------------------------------------------------------------*/
 
-//- A means of hashing pointer addresses
-template<>
-class Hash<void*>
-{
-
-public:
-
-    Hash()
-    {}
-
-    long operator()(const void* const& p) const
-    {
-        return long(p);
-    }
-
-    label operator()(const void* const& p, const label tableSize) const
-    {
-        return abs(operator()(p)) % tableSize;
-    }
-};
-
-
 class dlLibraryTable
 :
     public HashTable<fileName, void*, Hash<void*> >
diff --git a/src/OpenFOAM/db/error/StaticAssert.H b/src/OpenFOAM/db/error/StaticAssert.H
new file mode 100644
index 0000000000..93b1968952
--- /dev/null
+++ b/src/OpenFOAM/db/error/StaticAssert.H
@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::StaticAssertFailed
+
+Description
+    Macros and classes to provide static (compile-time) assertions.
+
+    Ideas from various sources
+    (http://www.ddj.com/cpp/184401547, http://www.boost.org)
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef StaticAssert_H
+#define StaticAssert_H
+
+namespace Foam
+{
+
+//- Forward declaration of StaticAssertionFailed.
+//  Leave as an incomplete class so that sizeof(..) fails
+template<bool Truth> class StaticAssertionFailed;
+
+/*---------------------------------------------------------------------------*\
+                    Class StaticAssertionFailed Declaration
+\*---------------------------------------------------------------------------*/
+
+//- Specialization for successful assertions
+template<>
+class StaticAssertionFailed<true>
+{};
+
+
+//- Helper class for handling static assertions
+template<unsigned Test>
+class StaticAssertionTest {};
+
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// internal use:
+// ~~~~~~~~~~~~~
+// paste together strings, even if an argument is itself a macro
+#define StaticAssertMacro(X,Y)  StaticAssertMacro1(X,Y)
+#define StaticAssertMacro1(X,Y) StaticAssertMacro2(X,Y)
+#define StaticAssertMacro2(X,Y) X##Y
+
+// external use:
+// ~~~~~~~~~~~~~
+/**
+ * @def StaticAssert(Test)
+ * Assert that some test is true at compile-time
+*/
+#define StaticAssert(Test)                                                   \
+    typedef ::Foam::StaticAssertionTest                                      \
+    <                                                                        \
+        sizeof( ::Foam::StaticAssertionFailed< ((Test) ? true : false) > )   \
+    > StaticAssertMacro(StaticAssertionTest, __LINE__)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/error/messageStream.H b/src/OpenFOAM/db/error/messageStream.H
index b4978911a7..20b0436327 100644
--- a/src/OpenFOAM/db/error/messageStream.H
+++ b/src/OpenFOAM/db/error/messageStream.H
@@ -47,8 +47,8 @@ SourceFiles
 #ifndef messageStream_H
 #define messageStream_H
 
-#include "string.H"
 #include "label.H"
+#include "string.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index ce67831457..6c701e1d85 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -82,12 +82,12 @@ public:
 
     // Constructors
 
-        //- Construct the time objectRegistry given an initial estimate 
+        //- Construct the time objectRegistry given an initial estimate
         //  for the number of entries
         explicit objectRegistry
         (
             const Time& db,
-            const label nIoObjects = 100
+            const label nIoObjects = 128
         );
 
         //- Construct a sub-registry given an IObject to describe the registry
@@ -95,7 +95,7 @@ public:
         explicit objectRegistry
         (
             const IOobject& io,
-            const label nIoObjects = 100
+            const label nIoObjects = 128
         );
 
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
index 5979ca5b9c..646c451317 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
@@ -26,15 +26,12 @@ License
 
 #include "objectRegistry.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-wordList objectRegistry::names() const
+Foam::wordList
+Foam::objectRegistry::names() const
 {
     wordList objectNames(size());
 
@@ -54,7 +51,8 @@ wordList objectRegistry::names() const
 
 
 template<class Type>
-HashTable<const Type*> objectRegistry::lookupClass() const
+Foam::HashTable<const Type*>
+Foam::objectRegistry::lookupClass() const
 {
     HashTable<const Type*> objectsOfClass(size());
 
@@ -75,7 +73,7 @@ HashTable<const Type*> objectRegistry::lookupClass() const
 
 
 template<class Type>
-bool objectRegistry::foundObject(const word& name) const
+bool Foam::objectRegistry::foundObject(const word& name) const
 {
     const_iterator iter = find(name);
 
@@ -107,7 +105,7 @@ bool objectRegistry::foundObject(const word& name) const
 
 
 template<class Type>
-const Type& objectRegistry::lookupObject(const word& name) const
+const Type& Foam::objectRegistry::lookupObject(const word& name) const
 {
     const_iterator iter = find(name);
 
@@ -154,8 +152,4 @@ const Type& objectRegistry::lookupObject(const word& name) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index 611dd5a923..1d4d407955 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Constructors & destructor for regIOobject.
-
 \*---------------------------------------------------------------------------*/
 
 #include "regIOobject.H"
@@ -107,6 +104,7 @@ Foam::regIOobject::~regIOobject()
     if (isPtr_)
     {
         delete isPtr_;
+        isPtr_ = NULL;
     }
 
     // Check out of objectRegistry if not owned by the registry
@@ -120,41 +118,38 @@ Foam::regIOobject::~regIOobject()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::regIOobject::checkIn()
+bool Foam::regIOobject::checkIn()
 {
     if (!registered_)
     {
-        // Attempt to register object with objectRegistry
-        if (!db().checkIn(*this))
+        // multiple checkin of same object is disallowed - this would mess up
+        // any mapping
+        registered_ = db().checkIn(*this);
+
+        // checkin on defaultRegion is allowed to fail, since subsetted meshes
+        // are created with the same name as their originating mesh
+        if (!registered_ && debug && name() != polyMesh::defaultRegion)
         {
-            // Disallow checkin of same object twice since would mess up
-            // any mapping.
-            // Check on defaultRegion is needed to prevent subsetted meshes
-            // (which are created with same name as their originating mesh)
-            // from upsetting this.
-            if (debug && name() != polyMesh::defaultRegion)
-            {
-                WarningIn("regIOobject::checkIn()")
-                    << "failed to register object " << objectPath()
+            WarningIn("regIOobject::checkIn()")
+                << "failed to register object " << objectPath()
                     << " the name already exists in the objectRegistry"
-                    << endl;
-            }
-        }
-        else
-        {
-            registered_ = true;
+                << endl;
         }
     }
+
+    return registered_;
 }
 
 
-void Foam::regIOobject::checkOut()
+bool Foam::regIOobject::checkOut()
 {
     if (registered_)
     {
-        db().checkOut(*this);
         registered_ = false;
+        return db().checkOut(*this);
     }
+
+    return false;
 }
 
 
@@ -166,8 +161,11 @@ void Foam::regIOobject::rename(const word& newName)
 
     IOobject::rename(newName);
 
-    // Re-register object with objectRegistry
-    checkIn();
+    if (registerObject())
+    {
+        // Re-register object with objectRegistry
+        checkIn();
+    }
 }
 
 
@@ -185,8 +183,11 @@ void Foam::regIOobject::operator=(const IOobject& io)
 
     IOobject::operator=(io);
 
-    // Re-register object with objectRegistry
-    checkIn();
+    if (registerObject())
+    {
+        // Re-register object with objectRegistry
+        checkIn();
+    }
 }
 
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H
index 80829fa864..6b50fd7842 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobject.H
@@ -49,7 +49,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class regIOobject Declaration
+                         Class regIOobject Declaration
 \*---------------------------------------------------------------------------*/
 
 class regIOobject
@@ -115,13 +115,13 @@ public:
 
         // Registration
 
-            //- Register object with registry
-            void checkIn();
+            //- Add object to registry
+            bool checkIn();
 
-            //- Check-out object from registry
-            void checkOut();
+            //- Remove object from registry
+            bool checkOut();
 
-            //- Is this object owned by the registry
+            //- Is this object owned by the registry?
             inline bool ownedByRegistry() const;
 
             //- Transfer ownership of this object to its registry
@@ -130,12 +130,12 @@ public:
             //- Transfer ownership of the given object pointer to its registry
             //  and return reference to object.
             template<class Type>
-            inline static Type& store(Type* tPtr);
+            inline static Type& store(Type*);
 
             //- Transfer ownership of the given object pointer to its registry
             //  and return reference to object.
             template<class Type>
-            inline static Type& store(autoPtr<Type>& atPtr);
+            inline static Type& store(autoPtr<Type>&);
 
             //- Release ownership of this object from its registry
             inline void release();
@@ -179,9 +179,9 @@ public:
             //- Write using given format, version and compression
             virtual bool writeObject
             (
-                IOstream::streamFormat fmt,
-                IOstream::versionNumber ver,
-                IOstream::compressionType cmp
+                IOstream::streamFormat,
+                IOstream::versionNumber,
+                IOstream::compressionType
             ) const;
 
             //- Write using setting from DB
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectI.H b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
index cef96647f7..467127e0aa 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectI.H
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectI.H
@@ -43,7 +43,7 @@ inline Type& Foam::regIOobject::store(Type* tPtr)
 {
     if (!tPtr)
     {
-        FatalErrorIn("Type& store(Type*)")
+        FatalErrorIn("Type& regIOobject::store(Type*)")
             << "object deallocated"
             << abort(FatalError);
     }
@@ -63,13 +63,13 @@ inline Type& Foam::regIOobject::store(autoPtr<Type>& atPtr)
     {
         FatalErrorIn
             (
-                "Type& store(autoPtr<Type>&)"
+                "Type& regIOobject::store(autoPtr<Type>&)"
             )   << "object deallocated"
                 << abort(FatalError);
     }
 
     tPtr->regIOobject::ownedByRegistry_ = true;
-    
+
     return *tPtr;
 }
 
diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
index 1ca027b247..dc3dcf1478 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
+++ b/src/OpenFOAM/db/regIOobject/regIOobjectWrite.C
@@ -34,12 +34,7 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-bool regIOobject::writeObject
+bool Foam::regIOobject::writeObject
 (
     IOstream::streamFormat fmt,
     IOstream::versionNumber ver,
@@ -91,7 +86,7 @@ bool regIOobject::writeObject
         // Try opening an OFstream for object
         OFstream os(objectPath(), fmt, ver, cmp);
 
-        // If this has failed, return (leave error handling to Ostream class)
+        // If any of these fail, return (leave error handling to Ostream class)
         if (!os.good())
         {
             return false;
@@ -108,7 +103,8 @@ bool regIOobject::writeObject
             return false;
         }
 
-        os  << "\n\n// ************************************************************************* //"
+        os  << "\n\n"
+            "// ************************************************************************* //"
             << endl;
 
         osGood = os.good();
@@ -130,7 +126,7 @@ bool regIOobject::writeObject
 }
 
 
-bool regIOobject::write() const
+bool Foam::regIOobject::write() const
 {
     return writeObject
     (
@@ -140,9 +136,4 @@ bool regIOobject::write() const
     );
 }
 
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index 59d8f1a516..8441d258a1 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -177,9 +177,9 @@ Field<Type>::Field(const typename Field<Type>::subField& sf)
 
 
 template<class Type>
-Field<Type>::Field(const UList<Type>& tl)
+Field<Type>::Field(const UList<Type>& list)
 :
-    List<Type>(tl)
+    List<Type>(list)
 {}
 
 
@@ -232,8 +232,7 @@ Field<Type>::Field
                     FatalIOErrorIn
                     (
                         "Field<Type>::Field"
-                        "(const word& keyword, "
-                        "const dictionary& dict, const label s)",
+                        "(const word& keyword, const dictionary&, const label)",
                         dict
                     )   << "size " << this->size()
                         << " is not equal to the given value of " << s
@@ -245,8 +244,7 @@ Field<Type>::Field
                 FatalIOErrorIn
                 (
                     "Field<Type>::Field"
-                    "(const word& keyword, "
-                    "const dictionary& dict, const label s)",
+                    "(const word& keyword, const dictionary&, const label)",
                     dict
                 )   << "expected keyword 'uniform' or 'nonuniform', found "
                     << firstToken.wordToken()
@@ -260,8 +258,7 @@ Field<Type>::Field
                 IOWarningIn
                 (
                     "Field<Type>::Field"
-                    "(const word& keyword, const dictionary& dict, "
-                    "const label s)",
+                    "(const word& keyword, const dictionary&, const label)",
                     dict
                 )   << "expected keyword 'uniform' or 'nonuniform', "
                        "assuming deprecated Field format from "
@@ -277,10 +274,9 @@ Field<Type>::Field
                 FatalIOErrorIn
                 (
                     "Field<Type>::Field"
-                    "(const word& keyword, "
-                    "const dictionary& dict, const label s)",
+                    "(const word& keyword, const dictionary&, const label)",
                     dict
-                )   << "extected keyword 'uniform' or 'nonuniform', found "
+                )   << "expected keyword 'uniform' or 'nonuniform', found "
                     << firstToken.info()
                     << exit(FatalIOError);
             }
@@ -371,7 +367,7 @@ void Field<Type>::map
 
     forAll(f, i)
     {
-        const labelList& localAddrs = mapAddressing[i];
+        const labelList&  localAddrs   = mapAddressing[i];
         const scalarList& localWeights = mapWeights[i];
 
         f[i] = pTraits<Type>::zero;
@@ -622,37 +618,37 @@ void Field<Type>::writeEntry(const word& keyword, Ostream& os) const
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class Type>
-void Field<Type>::operator=(const Field<Type>& f)
+void Field<Type>::operator=(const Field<Type>& rhs)
 {
-    if (this == &f)
+    if (this == &rhs)
     {
         FatalErrorIn("Field<Type>::operator=(const Field<Type>&)")
             << "attempted assignment to self"
             << abort(FatalError);
     }
 
-    List<Type>::operator=(f);
+    List<Type>::operator=(rhs);
 }
 
 
 template<class Type>
-void Field<Type>::operator=(const SubField<Type>& sf)
+void Field<Type>::operator=(const SubField<Type>& rhs)
 {
-    List<Type>::operator=(sf);
+    List<Type>::operator=(rhs);
 }
 
 
 template<class Type>
-void Field<Type>::operator=(const UList<Type>& ul)
+void Field<Type>::operator=(const UList<Type>& rhs)
 {
-    List<Type>::operator=(ul);
+    List<Type>::operator=(rhs);
 }
 
 
 template<class Type>
-void Field<Type>::operator=(const tmp<Field>& tf)
+void Field<Type>::operator=(const tmp<Field>& rhs)
 {
-    if (this == &(tf()))
+    if (this == &(rhs()))
     {
         FatalErrorIn("Field<Type>::operator=(const tmp<Field>&)")
             << "attempted assignment to self"
@@ -660,7 +656,7 @@ void Field<Type>::operator=(const tmp<Field>& tf)
     }
 
     // This is dodgy stuff, don't try it at home.
-    Field* fieldPtr = tf.ptr();
+    Field* fieldPtr = rhs.ptr();
     List<Type>::transfer(*fieldPtr);
     delete fieldPtr;
 }
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 78078a01c8..e56e463371 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -120,7 +120,7 @@ public:
         //- Construct given size and initial value
         Field(const label, const Type&);
 
-        //- Construct as copy of a UList<Type>
+        //- Construct as copy of a UList\<Type\>
         explicit Field(const UList<Type>&);
 
         //- Construct by transferring the List contents
diff --git a/src/OpenFOAM/fields/Fields/Field/SubField.H b/src/OpenFOAM/fields/Fields/Field/SubField.H
index c237a19d70..a9930d177d 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubField.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubField.H
@@ -40,7 +40,6 @@ SourceFiles
 #ifndef SubField_H
 #define SubField_H
 
-#include "Field.H"
 #include "SubList.H"
 #include "Field.H"
 
@@ -49,6 +48,10 @@ SourceFiles
 namespace Foam
 {
 
+//- Pre-declare SubField and related Field type
+template<class Type> class Field;
+template<class Type> class SubField;
+
 /*---------------------------------------------------------------------------*\
                            Class SubField Declaration
 \*---------------------------------------------------------------------------*/
@@ -68,20 +71,20 @@ public:
 
     // Constructors
 
-        //- Construct from UnallocatedField and SubField size
-        inline SubField
-        (
-            const SubList<Type>& slist
-        );
+        //- Construct from a SubList
+        inline SubField(const SubList<Type>&);
 
-        //- Construct from UnallocatedField and SubField size
+        //- Construct from a UList\<Type\>, using the entire size
+        explicit inline SubField(const UList<Type>&);
+
+        //- Construct from a UList\<Type\> with a given size
         inline SubField
         (
             const UList<Type>& list,
             const label subSize
         );
 
-        //- Construct from UnallocatedField, start and end indices
+        //- Construct from a UList\<Type\> with a given size and start index
         inline SubField
         (
             const UList<Type>& list,
@@ -90,10 +93,7 @@ public:
         );
 
         //- Construct as copy
-        inline SubField
-        (
-            const SubField<Type>& sfield
-        );
+        inline SubField(const SubField<Type>&);
 
 
     // Member functions
@@ -110,10 +110,10 @@ public:
 
     // Member operators
 
-        //- Assignment from UList operator. Takes linear time.
+        //- Assignment via UList operator. Takes linear time.
         inline void operator=(const SubField<Type>&);
 
-        //- Allow cast to a const Field<Type>&
+        //- Allow cast to a const Field\<Type\>&
         inline operator const Field<Type>&() const;
 };
 
diff --git a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
index 53de564475..ae9e016ec4 100644
--- a/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
+++ b/src/OpenFOAM/fields/Fields/Field/SubFieldI.H
@@ -29,12 +29,23 @@ License
 template<class Type>
 inline Foam::SubField<Type>::SubField
 (
-    const SubList<Type>& slist
+    const SubList<Type>& list
 )
 :
-    SubList<Type>(slist)
+    SubList<Type>(list)
 {}
 
+
+template<class Type>
+inline Foam::SubField<Type>::SubField
+(
+    const UList<Type>& list
+)
+:
+    SubList<Type>(list, list.size())
+{}
+
+
 template<class Type>
 inline Foam::SubField<Type>::SubField
 (
@@ -108,7 +119,7 @@ inline void Foam::SubField<Type>::operator=(const SubField<Type>& rhs)
 template<class Type>
 inline Foam::SubField<Type>::operator const Foam::Field<Type>&() const
 {
-    return *(reinterpret_cast<const Field<Type>*>(this));
+    return *reinterpret_cast< const Field<Type>* >(this);
 }
 
 
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelField.H b/src/OpenFOAM/fields/Fields/labelField/labelField.H
index c479588387..0431f5c1da 100644
--- a/src/OpenFOAM/fields/Fields/labelField/labelField.H
+++ b/src/OpenFOAM/fields/Fields/labelField/labelField.H
@@ -36,8 +36,8 @@ SourceFiles
 #ifndef labelField_H
 #define labelField_H
 
-#include "Field.H"
 #include "label.H"
+#include "Field.H"
 
 #define TEMPLATE
 #include "FieldFunctionsM.H"
diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraint.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraint.H
index d8407de9f2..c2796f4600 100644
--- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraint.H
+++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointConstraint/pointConstraint.H
@@ -41,10 +41,11 @@ SourceFiles
 #ifndef pointConstraint_H
 #define pointConstraint_H
 
-#include "Tuple2.H"
 #include "label.H"
+#include "uLabel.H"
 #include "vector.H"
 #include "tensor.H"
+#include "Tuple2.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 47d9ce4830..4a45b56f45 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -285,9 +285,9 @@ Foam::argList::argList
     // Print the banner once only for parallel runs
     if (Pstream::master() && bannerEnabled)
     {
-        IOobject::writeBanner(Info, true);
-        Info<< "Build  : " << Foam::FOAMbuild << nl
-            << "Exec   : " << argListString.c_str() << nl            
+        IOobject::writeBanner(Info, true)
+            << "Build  : " << Foam::FOAMbuild << nl
+            << "Exec   : " << argListString.c_str() << nl
             << "Date   : " << dateString.c_str() << nl
             << "Time   : " << timeString.c_str() << nl
             << "Host   : " << hostName() << nl
diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H
index b96e886c4b..fd623fdb20 100644
--- a/src/OpenFOAM/matrices/Matrix/Matrix.H
+++ b/src/OpenFOAM/matrices/Matrix/Matrix.H
@@ -39,9 +39,10 @@ SourceFiles
 #ifndef Matrix_H
 #define Matrix_H
 
-#include "List.H"
-#include "label.H"
 #include "bool.H"
+#include "label.H"
+#include "uLabel.H"
+#include "List.H"
 #include "autoPtr.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C b/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
index 42cf2e34c9..0fd9bf0a5d 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
+++ b/src/OpenFOAM/meshes/ProcessorTopology/commSchedule.C
@@ -32,14 +32,9 @@ License
 #include "OStringStream.H"
 #include "Pstream.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-defineTypeNameAndDebug(commSchedule, 0);
-
-}
+defineTypeNameAndDebug(Foam::commSchedule, 0);
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/bandCompression/bandCompression.C b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
index bebfcb64fb..81ac2032eb 100644
--- a/src/OpenFOAM/meshes/bandCompression/bandCompression.C
+++ b/src/OpenFOAM/meshes/bandCompression/bandCompression.C
@@ -35,11 +35,8 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
 // Constructor from components
-labelList bandCompression(const labelListList& cellCellAddressing)
+Foam::labelList Foam::bandCompression(const labelListList& cellCellAddressing)
 {
     labelList newOrder(cellCellAddressing.size());
 
@@ -106,8 +103,4 @@ labelList bandCompression(const labelListList& cellCellAddressing)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.C b/src/OpenFOAM/meshes/lduMesh/lduMesh.C
index 135b74c6ab..e04397686b 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduMesh.C
+++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.C
@@ -29,10 +29,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(lduMesh, 0);
-}
+defineTypeNameAndDebug(Foam::lduMesh, 0);
+
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.C b/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.C
index b56a79cf4b..ab18b49661 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellIOList.C
@@ -36,7 +36,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTemplateTypeNameAndDebugWithName(cellIOList, "cellList", 0);
+    defineTemplateTypeNameAndDebugWithName(cellIOList, "cellList", 0);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
index dc11cad05d..b2f02e37be 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.H
@@ -78,7 +78,6 @@ SourceFiles
 #ifndef cellMatcher_H
 #define cellMatcher_H
 
-#include "label.H"
 #include "labelList.H"
 #include "faceList.H"
 #include "boolList.H"
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeEqual.C b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeEqual.C
index f4e03cc5ae..30756f3408 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeEqual.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeEqual.C
@@ -31,12 +31,7 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-bool operator==(const cellShape& a, const cellShape& b)
+bool Foam::operator==(const cellShape& a, const cellShape& b)
 {
     // Basic rule: we assume that the sequence of labels in each list
     // will be circular in the same order (but not necessarily in the
@@ -180,8 +175,4 @@ bool operator==(const cellShape& a, const cellShape& b)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H b/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
index 6db2a7b016..7767fab30e 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
@@ -56,7 +56,7 @@ public:
     // Constructors
 
         //- Construct given initial map size
-        EdgeMap(label size = 100)
+        EdgeMap(const label size = 128)
         :
             HashTable<T, edge, Hash<edge> >(size)
         {}
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edge.H b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
index b0bb1f4e64..78cbc140db 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edge.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
@@ -133,14 +133,37 @@ public:
 };
 
 
-//- Hash<edge> specialisation
-//  Simple commutative hash.
+//- Hash specialization for hashing edges - a commutative hash value.
+//  Hash incrementally.
 template<>
-inline label Hash<edge>::operator()(const edge& e) const
+inline unsigned Hash<edge>::operator()(const edge& e, unsigned seed) const
 {
-    return e[0]*e[1] + e[0]+e[1];
+    unsigned val = seed;
+
+    if (e[0] < e[1])
+    {
+        val = Hash<label>()(e[0], val);
+        val = Hash<label>()(e[1], val);
+    }
+    else
+    {
+        val = Hash<label>()(e[1], val);
+        val = Hash<label>()(e[0], val);
+    }
+
+    return val;
 }
 
+
+//- Hash specialization for hashing edges - a commutative hash value.
+//  Hash incrementally.
+template<>
+inline unsigned Hash<edge>::operator()(const edge& e) const
+{
+    return Hash<edge>()(e, 0);
+}
+
+
 template<>
 inline bool contiguous<edge>()  {return true;}
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
index f534447d63..dea584a5f3 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
@@ -27,17 +27,13 @@ License
 #include "face.H"
 #include "scalarField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 // Calculate area in contact given displacement of vertices relative to
 // the face plane. Positive displacement is above the face (no contact);
 // negative is in contact
-scalar face::areaInContact
+Foam::scalar Foam::face::areaInContact
 (
     const pointField& meshPoints,
     const scalarField& v
@@ -162,8 +158,4 @@ scalar face::areaInContact
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceContactSphere.C b/src/OpenFOAM/meshes/meshShapes/face/faceContactSphere.C
index 8355352c22..35b67e2578 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceContactSphere.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceContactSphere.C
@@ -24,17 +24,14 @@ License
 
 Description
     Return location of contact sphere on the face
-    
+
 \*---------------------------------------------------------------------------*/
 
 #include "face.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-scalar face::contactSphereDiameter
+Foam::scalar Foam::face::contactSphereDiameter
 (
     const point& p,
     const vector& n,
@@ -44,15 +41,12 @@ scalar face::contactSphereDiameter
     scalar magN = Foam::mag(n);
 
     vector n1 = n/(magN + SMALL);
-
     vector n2 = normal(meshPoints);
+
     n2 /= Foam::mag(n2) + SMALL;
 
     return 2*((centre(meshPoints) - p) & n2)/((n1 & n2) - 1.0);
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C b/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
index 55ca87baf2..b514af7749 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
@@ -34,9 +34,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
 // Return potential intersection with face with a ray starting
 // at p, direction n (does not need to be normalized)
 // Does face-center decomposition and returns triangle intersection
@@ -46,7 +43,7 @@ namespace Foam
 // face plane and the ray and the distance is the distance between the
 // intersection point and the nearest point on the face
 
-pointHit face::ray
+Foam::pointHit Foam::face::ray
 (
     const point& p,
     const vector& n,
@@ -76,7 +73,7 @@ pointHit face::ray
         nextPoint = meshPoints[f[fcIndex(pI)]];
 
         // Note: for best accuracy, centre point always comes last
-        // 
+        //
         pointHit curHit = triPointRef
         (
             meshPoints[f[pI]],
@@ -133,7 +130,7 @@ pointHit face::ray
 }
 
 
-pointHit face::intersection
+Foam::pointHit Foam::face::intersection
 (
     const point& p,
     const vector& q,
@@ -179,7 +176,7 @@ pointHit face::intersection
 }
 
 
-pointHit face::nearestPoint
+Foam::pointHit Foam::face::nearestPoint
 (
     const point& p,
     const pointField& meshPoints
@@ -200,7 +197,7 @@ pointHit face::nearestPoint
         nextPoint = meshPoints[f[fcIndex(pI)]];
 
         // Note: for best accuracy, centre point always comes last
-        // 
+        //
         triPointRef tri
         (
             meshPoints[f[pI]],
@@ -232,8 +229,4 @@ pointHit face::nearestPoint
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.C b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.C
index 6f20e4aef9..cc7cf978bd 100644
--- a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.C
+++ b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.C
@@ -30,14 +30,10 @@ Description
 #include "cellShape.H"
 #include "cellModeller.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-cellShape tetCell::tetCellShape() const
+Foam::cellShape Foam::tetCell::tetCellShape() const
 {
     static const cellModel* tetModelPtr_ = NULL;
 
@@ -52,8 +48,4 @@ cellShape tetCell::tetCellShape() const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 90512b712b..83beae84fe 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -164,14 +164,31 @@ public:
 };
 
 
-//- Hash<triFace> specialisation
-//  Simple commutative hash.
+//- Hash specialization for hashing triFace - a commutative hash value.
+//  Hash incrementally.
 template<>
-inline label Hash<triFace>::operator()(const triFace& t) const
+inline unsigned Hash<triFace>::operator()(const triFace& t, unsigned seed) const
 {
-    return (t[0]*t[1]*t[2] + t[0]+t[1]+t[2]);
+    // Fortunately we don't need this very often
+    const uLabel t0(t[0]);
+    const uLabel t1(t[1]);
+    const uLabel t2(t[2]);
+
+    const uLabel val = (t0*t1*t2 + t0+t1+t2);
+
+    return Hash<uLabel>()(val, seed);
 }
 
+
+//- Hash specialization for hashing triFace - a commutative hash value.
+//  Hash incrementally.
+template<>
+inline unsigned Hash<triFace>::operator()(const triFace& t) const
+{
+    return Hash<triFace>::operator()(t, 0);
+}
+
+
 template<>
 inline bool contiguous<triFace>()  {return true;}
 
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
index 9ea759a260..6c60ef9a7c 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
@@ -133,7 +133,7 @@ inline Foam::pointField Foam::triFace::points(const pointField& points) const
 
 inline Foam::face Foam::triFace::triFaceFace() const
 {
-    face f(3);
+    Foam::face f(3);
 
     f[0] = operator[](0);
     f[1] = operator[](1);
diff --git a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
index 05b0af286d..11be3c3b86 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
@@ -29,14 +29,9 @@ License
 #include "facePointPatch.H"
 #include "globalPointPatch.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-pointBoundaryMesh::pointBoundaryMesh
+Foam::pointBoundaryMesh::pointBoundaryMesh
 (
     const pointMesh& m,
     const polyBoundaryMesh& basicBdry
@@ -61,7 +56,7 @@ pointBoundaryMesh::pointBoundaryMesh
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void pointBoundaryMesh::calcGeometry()
+void Foam::pointBoundaryMesh::calcGeometry()
 {
     forAll(*this, patchi)
     {
@@ -75,7 +70,8 @@ void pointBoundaryMesh::calcGeometry()
 }
 
 
-const globalPointPatch& pointBoundaryMesh::globalPatch() const
+const Foam::globalPointPatch&
+Foam::pointBoundaryMesh::globalPatch() const
 {
     const pointPatchList& patches = *this;
 
@@ -99,7 +95,7 @@ const globalPointPatch& pointBoundaryMesh::globalPatch() const
 }
 
 
-void pointBoundaryMesh::movePoints(const pointField& p)
+void Foam::pointBoundaryMesh::movePoints(const pointField& p)
 {
     pointPatchList& patches = *this;
 
@@ -115,7 +111,7 @@ void pointBoundaryMesh::movePoints(const pointField& p)
 }
 
 
-void pointBoundaryMesh::updateMesh()
+void Foam::pointBoundaryMesh::updateMesh()
 {
     pointPatchList& patches = *this;
 
@@ -131,8 +127,4 @@ void pointBoundaryMesh::updateMesh()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.C
index dba72e8121..4310183c4a 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/basic/coupled/coupledPointPatch.C
@@ -29,27 +29,20 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(coupledPointPatch, 0);
+defineTypeNameAndDebug(Foam::coupledPointPatch, 0);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-coupledPointPatch::coupledPointPatch(const pointBoundaryMesh& bm)
+Foam::coupledPointPatch::coupledPointPatch(const pointBoundaryMesh& bm)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-coupledPointPatch::~coupledPointPatch()
+Foam::coupledPointPatch::~coupledPointPatch()
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.C
index 3dcdb80b08..ca9cbf95f8 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/pointPatch/pointPatch.C
@@ -28,9 +28,6 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(pointPatch, 0);
-}
+defineTypeNameAndDebug(Foam::pointPatch, 0);
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 121b2a643e..e53330b6a4 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -40,10 +40,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(globalMeshData, 0);
-}
+defineTypeNameAndDebug(Foam::globalMeshData, 0);
 
 // Geometric matching tolerance. Factor of mesh bounding box.
 const Foam::scalar Foam::globalMeshData::matchTol_ = 1E-8;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index ca11a21ec9..0d8b6b97e8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -32,10 +32,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(polyBoundaryMesh, 0);
-}
+defineTypeNameAndDebug(Foam::polyBoundaryMesh, 0);
+
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index e0b4c0536c..1947c12647 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -39,10 +39,8 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(polyMesh, 0);
-}
+defineTypeNameAndDebug(Foam::polyMesh, 0);
+
 
 Foam::word Foam::polyMesh::defaultRegion = "region0";
 Foam::word Foam::polyMesh::meshSubDir = "polyMesh";
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index aeb783d909..f471fe1b6e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -31,10 +31,7 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
-{
-    defineTypeNameAndDebug(coupledPolyPatch, 0);
-}
+defineTypeNameAndDebug(Foam::coupledPolyPatch, 0);
 
 Foam::scalar Foam::coupledPolyPatch::matchTol = 1E-3;
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
index 28d03a710c..079a5b6c61 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.C
@@ -30,10 +30,9 @@ License
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-namespace Foam
-{
-    defineTypeNameAndDebug(primitiveMesh, 0);
-}
+
+defineTypeNameAndDebug(Foam::primitiveMesh, 0);
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
index 6beb5fe4bd..191ee7f5e8 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCells.C
@@ -26,14 +26,10 @@ License
 
 #include "primitiveMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void primitiveMesh::calcCellCells() const
+void Foam::primitiveMesh::calcCellCells() const
 {
     // Loop through faceCells and mark up neighbours
 
@@ -102,7 +98,7 @@ void primitiveMesh::calcCellCells() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const labelListList& primitiveMesh::cellCells() const
+const Foam::labelListList& Foam::primitiveMesh::cellCells() const
 {
     if (!ccPtr_)
     {
@@ -113,7 +109,7 @@ const labelListList& primitiveMesh::cellCells() const
 }
 
 
-const labelList& primitiveMesh::cellCells
+const Foam::labelList& Foam::primitiveMesh::cellCells
 (
     const label cellI,
     DynamicList<label>& storage
@@ -153,14 +149,10 @@ const labelList& primitiveMesh::cellCells
 }
 
 
-const labelList& primitiveMesh::cellCells(const label cellI) const
+const Foam::labelList& Foam::primitiveMesh::cellCells(const label cellI) const
 {
     return cellCells(cellI, labels_);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
index 1ac7a9b872..c00aece2d0 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellCentresAndVols.C
@@ -30,14 +30,9 @@ Description
 
 #include "primitiveMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void primitiveMesh::calcCellCentresAndVols() const
+void Foam::primitiveMesh::calcCellCentresAndVols() const
 {
     if (debug)
     {
@@ -75,7 +70,7 @@ void primitiveMesh::calcCellCentresAndVols() const
 }
 
 
-void primitiveMesh::makeCellCentresAndVols
+void Foam::primitiveMesh::makeCellCentresAndVols
 (
     const vectorField& fCtrs,
     const vectorField& fAreas,
@@ -152,7 +147,7 @@ void primitiveMesh::makeCellCentresAndVols
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const vectorField& primitiveMesh::cellCentres() const
+const Foam::vectorField& Foam::primitiveMesh::cellCentres() const
 {
     if (!cellCentresPtr_)
     {
@@ -163,7 +158,7 @@ const vectorField& primitiveMesh::cellCentres() const
 }
 
 
-const scalarField& primitiveMesh::cellVolumes() const
+const Foam::scalarField& Foam::primitiveMesh::cellVolumes() const
 {
     if (!cellVolumesPtr_)
     {
@@ -174,8 +169,4 @@ const scalarField& primitiveMesh::cellVolumes() const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
index 2bb84ea398..37331b47c9 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
@@ -26,14 +26,9 @@ License
 
 #include "primitiveMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void primitiveMesh::calcCells
+void Foam::primitiveMesh::calcCells
 (
     cellList& cellFaceAddr,
     const unallocLabelList& own,
@@ -102,7 +97,7 @@ void primitiveMesh::calcCells
 }
 
 
-void primitiveMesh::calcCells() const
+void Foam::primitiveMesh::calcCells() const
 {
     // Loop through faceCells and mark up neighbours
 
@@ -139,7 +134,7 @@ void primitiveMesh::calcCells() const
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const cellList& primitiveMesh::cells() const
+const Foam::cellList& Foam::primitiveMesh::cells() const
 {
     if (!cfPtr_)
     {
@@ -150,8 +145,4 @@ const cellList& primitiveMesh::cells() const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index e73d1d078d..13d5f52e9e 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
@@ -30,22 +30,18 @@ License
 #include "mathematicalConstants.H"
 #include "SortableList.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-scalar primitiveMesh::closedThreshold_  = 1.0e-6;
-scalar primitiveMesh::aspectThreshold_  = 1000;
-scalar primitiveMesh::nonOrthThreshold_ = 70;    // deg
-scalar primitiveMesh::skewThreshold_    = 4;
+Foam::scalar Foam::primitiveMesh::closedThreshold_  = 1.0e-6;
+Foam::scalar Foam::primitiveMesh::aspectThreshold_  = 1000;
+Foam::scalar Foam::primitiveMesh::nonOrthThreshold_ = 70;    // deg
+Foam::scalar Foam::primitiveMesh::skewThreshold_    = 4;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-bool primitiveMesh::checkClosedBoundary(const bool report) const
+bool Foam::primitiveMesh::checkClosedBoundary(const bool report) const
 {
     if (debug)
     {
@@ -97,7 +93,7 @@ bool primitiveMesh::checkClosedBoundary(const bool report) const
 }
 
 
-bool primitiveMesh::checkClosedCells
+bool Foam::primitiveMesh::checkClosedCells
 (
     const bool report,
     labelHashSet* setPtr,
@@ -266,7 +262,7 @@ bool primitiveMesh::checkClosedCells
 }
 
 
-bool primitiveMesh::checkFaceAreas
+bool Foam::primitiveMesh::checkFaceAreas
 (
     const bool report,
     labelHashSet* setPtr
@@ -325,7 +321,7 @@ bool primitiveMesh::checkFaceAreas
 }
 
 
-bool primitiveMesh::checkCellVolumes
+bool Foam::primitiveMesh::checkCellVolumes
 (
     const bool report,
     labelHashSet* setPtr
@@ -392,7 +388,7 @@ bool primitiveMesh::checkCellVolumes
 }
 
 
-bool primitiveMesh::checkFaceOrthogonality
+bool Foam::primitiveMesh::checkFaceOrthogonality
 (
     const bool report,
     labelHashSet* setPtr
@@ -512,7 +508,7 @@ bool primitiveMesh::checkFaceOrthogonality
 }
 
 
-bool primitiveMesh::checkFacePyramids
+bool Foam::primitiveMesh::checkFacePyramids
 (
     const bool report,
     const scalar minPyrVol,
@@ -596,7 +592,7 @@ bool primitiveMesh::checkFacePyramids
 }
 
 
-bool primitiveMesh::checkFaceSkewness
+bool Foam::primitiveMesh::checkFaceSkewness
 (
     const bool report,
     labelHashSet* setPtr
@@ -740,7 +736,7 @@ bool primitiveMesh::checkFaceSkewness
 }
 
 
-bool primitiveMesh::checkPoints
+bool Foam::primitiveMesh::checkPoints
 (
     const bool report,
     labelHashSet* setPtr
@@ -818,7 +814,7 @@ bool primitiveMesh::checkPoints
 // E.g. maxDeg = 10 allows for angles < 190 (or 10 degrees concavity)
 // (if truly concave and points not visible from face centre the face-pyramid
 //  check in checkMesh will fail)
-bool primitiveMesh::checkFaceAngles
+bool Foam::primitiveMesh::checkFaceAngles
 (
     const bool report,
     const scalar maxDeg,
@@ -946,7 +942,7 @@ bool primitiveMesh::checkFaceAngles
 // Check warpage of faces. Is calculated as the difference between areas of
 // individual triangles and the overall area of the face (which ifself is
 // is the average of the areas of the individual triangles).
-bool primitiveMesh::checkFaceFlatness
+bool Foam::primitiveMesh::checkFaceFlatness
 (
     const bool report,
     const scalar warnFlatness,
@@ -1076,7 +1072,7 @@ bool primitiveMesh::checkFaceFlatness
 // - are only in a singe non-empty direction.
 // Empty direction info is passed in as a vector of labels (synchronised)
 // which are 1 if the direction is non-empty, 0 if it is.
-bool primitiveMesh::checkEdgeAlignment
+bool Foam::primitiveMesh::checkEdgeAlignment
 (
     const bool report,
     const Vector<label>& directions,
@@ -1211,7 +1207,7 @@ bool primitiveMesh::checkEdgeAlignment
 }
 
 
-bool primitiveMesh::checkUpperTriangular
+bool Foam::primitiveMesh::checkUpperTriangular
 (
     const bool report,
     labelHashSet* setPtr
@@ -1376,7 +1372,7 @@ bool primitiveMesh::checkUpperTriangular
 }
 
 
-bool primitiveMesh::checkCellsZipUp
+bool Foam::primitiveMesh::checkCellsZipUp
 (
     const bool report,
     labelHashSet* setPtr
@@ -1477,7 +1473,7 @@ bool primitiveMesh::checkCellsZipUp
 
 
 // Vertices of face within point range and unique.
-bool primitiveMesh::checkFaceVertices
+bool Foam::primitiveMesh::checkFaceVertices
 (
     const bool report,
     labelHashSet* setPtr
@@ -1553,7 +1549,7 @@ bool primitiveMesh::checkFaceVertices
 
 
 // Check if all points on face are shared between faces.
-bool primitiveMesh::checkDuplicateFaces
+bool Foam::primitiveMesh::checkDuplicateFaces
 (
     const label faceI,
     const Map<label>& nCommonPoints,
@@ -1595,7 +1591,7 @@ bool primitiveMesh::checkDuplicateFaces
 
 
 // Check that shared points are in consecutive order.
-bool primitiveMesh::checkCommonOrder
+bool Foam::primitiveMesh::checkCommonOrder
 (
     const label faceI,
     const Map<label>& nCommonPoints,
@@ -1758,7 +1754,7 @@ bool primitiveMesh::checkCommonOrder
 
 // Checks common vertices between faces. If more than 2 they should be
 // consecutive on both faces.
-bool primitiveMesh::checkFaceFaces
+bool Foam::primitiveMesh::checkFaceFaces
 (
     const bool report,
     labelHashSet* setPtr
@@ -1868,7 +1864,7 @@ bool primitiveMesh::checkFaceFaces
 
 
 // Checks cells with 1 or less internal faces. Give numerical problems.
-bool primitiveMesh::checkCellDeterminant
+bool Foam::primitiveMesh::checkCellDeterminant
 (
     const bool report,    // report,
     labelHashSet* setPtr  // setPtr
@@ -1990,7 +1986,7 @@ bool primitiveMesh::checkCellDeterminant
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool primitiveMesh::checkTopology(const bool report) const
+bool Foam::primitiveMesh::checkTopology(const bool report) const
 {
     label noFailedChecks = 0;
 
@@ -2023,7 +2019,7 @@ bool primitiveMesh::checkTopology(const bool report) const
 }
 
 
-bool primitiveMesh::checkGeometry(const bool report) const
+bool Foam::primitiveMesh::checkGeometry(const bool report) const
 {
     label noFailedChecks = 0;
 
@@ -2056,7 +2052,7 @@ bool primitiveMesh::checkGeometry(const bool report) const
 }
 
 
-bool primitiveMesh::checkMesh(const bool report) const
+bool Foam::primitiveMesh::checkMesh(const bool report) const
 {
     if (debug)
     {
@@ -2088,44 +2084,40 @@ bool primitiveMesh::checkMesh(const bool report) const
 }
 
 
-scalar primitiveMesh::setClosedThreshold(const scalar ct)
+Foam::scalar Foam::primitiveMesh::setClosedThreshold(const scalar val)
 {
-    scalar oldClosedThreshold = closedThreshold_;
-    closedThreshold_ = ct;
+    scalar prev = closedThreshold_;
+    closedThreshold_ = val;
 
-    return oldClosedThreshold;
+    return prev;
 }
 
 
-scalar primitiveMesh::setAspectThreshold(const scalar at)
+Foam::scalar Foam::primitiveMesh::setAspectThreshold(const scalar val)
 {
-    scalar oldAspectThreshold = aspectThreshold_;
-    aspectThreshold_ = at;
+    scalar prev = aspectThreshold_;
+    aspectThreshold_ = val;
 
-    return oldAspectThreshold;
+    return prev;
 }
 
 
-scalar primitiveMesh::setNonOrthThreshold(const scalar nt)
+Foam::scalar Foam::primitiveMesh::setNonOrthThreshold(const scalar val)
 {
-    scalar oldNonOrthThreshold = nonOrthThreshold_;
-    nonOrthThreshold_ = nt;
+    scalar prev = nonOrthThreshold_;
+    nonOrthThreshold_ = val;
 
-    return oldNonOrthThreshold;
+    return prev;
 }
 
 
-scalar primitiveMesh::setSkewThreshold(const scalar st)
+Foam::scalar Foam::primitiveMesh::setSkewThreshold(const scalar val)
 {
-    scalar oldSkewThreshold = skewThreshold_;
-    skewThreshold_ = st;
+    scalar prev = skewThreshold_;
+    skewThreshold_ = val;
 
-    return oldSkewThreshold;
+    return prev;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
index 634272a50d..d5633e96b9 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshClear.C
@@ -27,14 +27,10 @@ License
 #include "primitiveMesh.H"
 #include "demandDrivenData.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void primitiveMesh::printAllocated() const
+void Foam::primitiveMesh::printAllocated() const
 {
     Pout<< "primitiveMesh allocated :" << endl;
 
@@ -98,7 +94,7 @@ void primitiveMesh::printAllocated() const
     {
         Pout<< "    Point-point" << endl;
     }
-    
+
     if (cpPtr_)
     {
         Pout<< "    Cell-point" << endl;
@@ -128,7 +124,7 @@ void primitiveMesh::printAllocated() const
 }
 
 
-void primitiveMesh::clearGeom()
+void Foam::primitiveMesh::clearGeom()
 {
     if (debug)
     {
@@ -144,7 +140,7 @@ void primitiveMesh::clearGeom()
 }
 
 
-void primitiveMesh::clearAddressing()
+void Foam::primitiveMesh::clearAddressing()
 {
     if (debug)
     {
@@ -173,15 +169,11 @@ void primitiveMesh::clearAddressing()
 }
 
 
-void primitiveMesh::clearOut()
+void Foam::primitiveMesh::clearOut()
 {
     clearGeom();
     clearAddressing();
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
index 960f42d7b6..bb6a6ab4b9 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeCells.C
@@ -27,14 +27,10 @@ License
 #include "primitiveMesh.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const labelListList& primitiveMesh::edgeCells() const
+const Foam::labelListList& Foam::primitiveMesh::edgeCells() const
 {
     if (!ecPtr_)
     {
@@ -59,7 +55,7 @@ const labelListList& primitiveMesh::edgeCells() const
 }
 
 
-const labelList& primitiveMesh::edgeCells
+const Foam::labelList& Foam::primitiveMesh::edgeCells
 (
     const label edgeI,
     DynamicList<label>& storage
@@ -129,14 +125,10 @@ const labelList& primitiveMesh::edgeCells
 }
 
 
-const labelList& primitiveMesh::edgeCells(const label edgeI) const
+const Foam::labelList& Foam::primitiveMesh::edgeCells(const label edgeI) const
 {
     return edgeCells(edgeI, labels_);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
index 65ed9c0b5f..026dd0935c 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdgeFaces.C
@@ -27,14 +27,9 @@ License
 #include "primitiveMesh.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const labelListList& primitiveMesh::edgeFaces() const
+const Foam::labelListList& Foam::primitiveMesh::edgeFaces() const
 {
     if (!efPtr_)
     {
@@ -60,7 +55,7 @@ const labelListList& primitiveMesh::edgeFaces() const
 }
 
 
-const labelList& primitiveMesh::edgeFaces
+const Foam::labelList& Foam::primitiveMesh::edgeFaces
 (
     const label edgeI,
     DynamicList<label>& storage
@@ -106,14 +101,10 @@ const labelList& primitiveMesh::edgeFaces
 }
 
 
-const labelList& primitiveMesh::edgeFaces(const label edgeI) const
+const Foam::labelList& Foam::primitiveMesh::edgeFaces(const label edgeI) const
 {
     return edgeFaces(edgeI, labels_);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
index 9ed1aff21e..f349c442a0 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C
@@ -33,14 +33,10 @@ Description
 
 #include "primitiveMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void primitiveMesh::calcFaceCentresAndAreas() const
+void Foam::primitiveMesh::calcFaceCentresAndAreas() const
 {
     if (debug)
     {
@@ -75,7 +71,7 @@ void primitiveMesh::calcFaceCentresAndAreas() const
 }
 
 
-void primitiveMesh::makeFaceCentresAndAreas
+void Foam::primitiveMesh::makeFaceCentresAndAreas
 (
     const pointField& p,
     vectorField& fCtrs,
@@ -132,7 +128,7 @@ void primitiveMesh::makeFaceCentresAndAreas
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const vectorField& primitiveMesh::faceCentres() const
+const Foam::vectorField& Foam::primitiveMesh::faceCentres() const
 {
     if (!faceCentresPtr_)
     {
@@ -143,7 +139,7 @@ const vectorField& primitiveMesh::faceCentres() const
 }
 
 
-const vectorField& primitiveMesh::faceAreas() const
+const Foam::vectorField& Foam::primitiveMesh::faceAreas() const
 {
     if (!faceAreasPtr_)
     {
@@ -154,8 +150,4 @@ const vectorField& primitiveMesh::faceAreas() const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
index ab21415ae5..990554795a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFindCell.C
@@ -27,15 +27,11 @@ License
 #include "primitiveMesh.H"
 #include "cell.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 // Is the point in the cell bounding box
-bool primitiveMesh::pointInCellBB(const point& p, label celli) const
+bool Foam::primitiveMesh::pointInCellBB(const point& p, label celli) const
 {
     const pointField& points = this->points();
     const faceList& f = faces();
@@ -67,7 +63,7 @@ bool primitiveMesh::pointInCellBB(const point& p, label celli) const
 
 
 // Is the point in the cell
-bool primitiveMesh::pointInCell(const point& p, label celli) const
+bool Foam::primitiveMesh::pointInCell(const point& p, label celli) const
 {
     const labelList& f = cells()[celli];
     const labelList& owner = this->faceOwner();
@@ -93,7 +89,7 @@ bool primitiveMesh::pointInCell(const point& p, label celli) const
 
 
 // Find the cell with the nearest cell centre
-label primitiveMesh::findNearestCell(const point& location) const
+Foam::label Foam::primitiveMesh::findNearestCell(const point& location) const
 {
     const vectorField& centres = cellCentres();
 
@@ -116,7 +112,7 @@ label primitiveMesh::findNearestCell(const point& location) const
 
 
 // Find cell enclosing this location
-label primitiveMesh::findCell(const point& location) const
+Foam::label Foam::primitiveMesh::findCell(const point& location) const
 {
     if (nCells() == 0)
     {
@@ -160,8 +156,4 @@ label primitiveMesh::findCell(const point& location) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C
index 317e38d14b..0d196c52c2 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshPointFaces.C
@@ -27,14 +27,10 @@ License
 #include "primitiveMesh.H"
 #include "ListOps.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const labelListList& primitiveMesh::pointFaces() const
+const Foam::labelListList& Foam::primitiveMesh::pointFaces() const
 {
     if (!pfPtr_)
     {
@@ -52,8 +48,4 @@ const labelListList& primitiveMesh::pointFaces() const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
index 080ee1cd75..ef48f93ba0 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/patchZones.C
@@ -28,22 +28,17 @@ Description
 
 #include "patchZones.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(patchZones, 0);
+defineTypeNameAndDebug(Foam::patchZones, 0);
 
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 // Gets labels of changed faces and propagates them to the edges. Returns
 // labels of edges changed.
-labelList patchZones::faceToEdge
+Foam::labelList Foam::patchZones::faceToEdge
 (
     const labelList& changedFaces,
     labelList& edgeRegion
@@ -78,7 +73,7 @@ labelList patchZones::faceToEdge
 
 
 // Reverse of faceToEdge: gets edges and returns faces
-labelList patchZones::edgeToFace(const labelList& changedEdges)
+Foam::labelList Foam::patchZones::edgeToFace(const labelList& changedEdges)
 {
     labelList changedFaces(pp_.size(), -1);
     label changedI = 0;
@@ -109,7 +104,7 @@ labelList patchZones::edgeToFace(const labelList& changedEdges)
 
 
 // Finds area, starting at faceI, delimited by borderEdge
-void patchZones::markZone(label faceI)
+void Foam::patchZones::markZone(label faceI)
 {
     // List of faces whose faceZone has been set.
     labelList changedFaces(1, faceI);
@@ -155,7 +150,11 @@ void patchZones::markZone(label faceI)
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct from components
-Foam::patchZones::patchZones(const primitivePatch& pp, const boolList& borderEdge)
+Foam::patchZones::patchZones
+(
+    const primitivePatch& pp,
+    const boolList& borderEdge
+)
 :
     labelList(pp.size(), -1),
     pp_(pp),
@@ -178,7 +177,7 @@ Foam::patchZones::patchZones(const primitivePatch& pp, const boolList& borderEdg
 
     label faceI = 0;
 
-    while(true)
+    while (true)
     {
         // Find first non-visited face
         for (; faceI < pp_.size(); faceI++)
@@ -204,8 +203,4 @@ Foam::patchZones::patchZones(const primitivePatch& pp, const boolList& borderEdg
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H
index 67927c217a..efa5c883ba 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitivePatch/walkPatch.H
@@ -36,7 +36,6 @@ SourceFiles
 #ifndef walkPatch_H
 #define walkPatch_H
 
-#include "label.H"
 #include "labelList.H"
 #include "primitivePatch.H"
 
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C
index 60fa3ed5de..db91365f83 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.C
@@ -31,10 +31,6 @@ Description
 #include "triPointRef.H"
 #include "scalarField.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -45,7 +41,7 @@ namespace Foam
 // - triangle circumcentre
 // - edge mids
 template<class Point, class PointRef>
-pointHit tetrahedron<Point, PointRef>::containmentSphere
+Foam::pointHit Foam::tetrahedron<Point, PointRef>::containmentSphere
 (
     const scalar tol
 ) const
@@ -250,14 +246,17 @@ pointHit tetrahedron<Point, PointRef>::containmentSphere
 
 
 template<class Point, class PointRef>
-void tetrahedron<Point, PointRef>::gradNiSquared(scalarField& buffer) const
+void Foam::tetrahedron<Point, PointRef>::gradNiSquared
+(
+    scalarField& buffer
+) const
 {
     // Change of sign between face area vector and gradient
     // does not matter because of square
 
     // Warning: Added a mag to produce positive coefficients even if
     // the tetrahedron is twisted inside out.  This is pretty
-    // dangerous, but essential for mesh motion.  
+    // dangerous, but essential for mesh motion.
     scalar magVol = Foam::mag(mag());
 
     buffer[0] = (1.0/9.0)*magSqr(Sa())/magVol;
@@ -268,15 +267,17 @@ void tetrahedron<Point, PointRef>::gradNiSquared(scalarField& buffer) const
 
 
 template<class Point, class PointRef>
-void tetrahedron<Point, PointRef>::gradNiDotGradNj(scalarField& buffer) const
+void Foam::tetrahedron<Point, PointRef>::gradNiDotGradNj
+(
+    scalarField& buffer
+) const
 {
     // Warning. Ordering of edges needs to be the same for a tetrahedron
     // class, a tetrahedron cell shape model and a tetCell
-    // 
 
     // Warning: Added a mag to produce positive coefficients even if
     // the tetrahedron is twisted inside out.  This is pretty
-    // dangerous, but essential for mesh motion.  
+    // dangerous, but essential for mesh motion.
 
     // Double change of sign between face area vector and gradient
 
@@ -296,7 +297,10 @@ void tetrahedron<Point, PointRef>::gradNiDotGradNj(scalarField& buffer) const
 
 
 template<class Point, class PointRef>
-void tetrahedron<Point, PointRef>::gradNiGradNi(tensorField& buffer) const
+void Foam::tetrahedron<Point, PointRef>::gradNiGradNi
+(
+    tensorField& buffer
+) const
 {
     // Change of sign between face area vector and gradient
     // does not matter because of square
@@ -311,11 +315,13 @@ void tetrahedron<Point, PointRef>::gradNiGradNi(tensorField& buffer) const
 
 
 template<class Point, class PointRef>
-void tetrahedron<Point, PointRef>::gradNiGradNj(tensorField& buffer) const
+void Foam::tetrahedron<Point, PointRef>::gradNiGradNj
+(
+    tensorField& buffer
+) const
 {
     // Warning. Ordering of edges needs to be the same for a tetrahedron
     // class, a tetrahedron cell shape model and a tetCell
-    // 
 
     // Double change of sign between face area vector and gradient
 
@@ -333,8 +339,5 @@ void tetrahedron<Point, PointRef>::gradNiGradNj(tensorField& buffer) const
     buffer[5] = (1.0/9.0)*(sd * sc)/magVol;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
index 035551a240..b356353c7a 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
@@ -26,9 +26,11 @@ Class
     Foam::DiagTensor
 
 Description
-    Templated 3D DiagTensor derived from VectorSpace adding construction from
-    3 components, element access using xx(), yy() and zz() member functions and
-    the inner-product (dot-product) and outer-product operators.
+    Templated 3D DiagTensor derived from VectorSpace.
+
+    Adding construction from 3 components, element access using xx(), yy()
+    and zz() member functions and the inner-product (dot-product) and
+    outer-product operators.
 
 SourceFiles
     DiagTensorI.H
diff --git a/src/OpenFOAM/primitives/diagTensor/diagTensor.C b/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/diagTensor/diagTensor.C
rename to src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.C
diff --git a/src/OpenFOAM/primitives/diagTensor/diagTensor.H b/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.H
similarity index 97%
rename from src/OpenFOAM/primitives/diagTensor/diagTensor.H
rename to src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.H
index 0a23ab1bf6..99d8cf4986 100644
--- a/src/OpenFOAM/primitives/diagTensor/diagTensor.H
+++ b/src/OpenFOAM/primitives/DiagTensor/diagTensor/diagTensor.H
@@ -26,7 +26,7 @@ Typedef
     Foam::diagTensor
 
 Description
-    3D diagTensor obtained from generic Vector
+    A scalar version of the templated DiagTensor
 
 SourceFiles
     diagTensor.C
diff --git a/src/OpenFOAM/primitives/Pair/Pair.H b/src/OpenFOAM/primitives/Pair/Pair.H
index fe92c64c7a..e0514b63b8 100644
--- a/src/OpenFOAM/primitives/Pair/Pair.H
+++ b/src/OpenFOAM/primitives/Pair/Pair.H
@@ -59,7 +59,7 @@ public:
 
     // Constructors
 
-        //- Null constructor for lists
+        //- Null constructor
         inline Pair()
         {}
 
@@ -135,6 +135,27 @@ public:
         }
 
 
+        //- compare Pairs
+        //  -  0: different
+        //  - +1: identical
+        //  - -1: same pair, but reversed order
+        static inline int compare(const Pair<Type>& a, const Pair<Type>& b)
+        {
+            if (a[0] == b[0] && a[1] == b[1])
+            {
+                return 1;
+            }
+            else if (a[0] == b[1] && a[1] == b[0])
+            {
+                return -1;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+
+
     // Friend Operators
 
         friend bool operator==(const Pair<Type>& a, const Pair<Type>& b)
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.C b/src/OpenFOAM/primitives/Scalar/Scalar.C
index 86087309cb..cdd94c7b15 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.C
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.C
@@ -34,8 +34,8 @@ namespace Foam
 const char* const pTraits<Scalar>::typeName = "scalar";
 const Scalar pTraits<Scalar>::zero = 0.0;
 const Scalar pTraits<Scalar>::one = 1.0;
-const Scalar pTraits<Scalar>::max = ScalarVGREAT;
 const Scalar pTraits<Scalar>::min = -ScalarVGREAT;
+const Scalar pTraits<Scalar>::max = ScalarVGREAT;
 
 const char* pTraits<Scalar>::componentNames[] = { "x" };
 
@@ -47,11 +47,11 @@ pTraits<Scalar>::pTraits(Istream& is)
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-word name(const Scalar s)
+word name(const Scalar val)
 {
-    std::ostringstream osBuffer;
-    osBuffer << s;
-    return osBuffer.str();
+    std::ostringstream buf;
+    buf << val;
+    return buf.str();
 }
 
 
diff --git a/src/OpenFOAM/primitives/Scalar/doubleFloat.H b/src/OpenFOAM/primitives/Scalar/doubleFloat.H
index c68aa725f9..cec1d83377 100644
--- a/src/OpenFOAM/primitives/Scalar/doubleFloat.H
+++ b/src/OpenFOAM/primitives/Scalar/doubleFloat.H
@@ -27,8 +27,8 @@ License
 #ifndef doubleFloat_H
 #define doubleFloat_H
 
-#include "products.H"
 #include "label.H"
+#include "products.H"
 
 #include <cmath>
 
diff --git a/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.C b/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.C
rename to src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C
diff --git a/src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/labelSphericalTensor/labelSphericalTensor.H
rename to src/OpenFOAM/primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.H
diff --git a/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.C b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.C
rename to src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.C
diff --git a/src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/sphericalTensor/sphericalTensor.H
rename to src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H
diff --git a/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.C b/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C
similarity index 100%
rename from src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.C
rename to src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C
diff --git a/src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.H b/src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H
similarity index 100%
rename from src/OpenFOAM/primitives/sphericalTensor2D/sphericalTensor2D.H
rename to src/OpenFOAM/primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.H
diff --git a/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.C b/src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.C
rename to src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C
diff --git a/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.H
similarity index 98%
rename from src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H
rename to src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.H
index 771c7b16bd..c79704484c 100644
--- a/src/OpenFOAM/primitives/labelSymmTensor/labelSymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/labelSymmTensor/labelSymmTensor.H
@@ -26,7 +26,7 @@ Typedef
     Foam::labelSymmTensor
 
 Description
-    SymmTensor or labels.
+    SymmTensor of labels.
 
 SourceFiles
     labelSymmTensor.C
diff --git a/src/OpenFOAM/primitives/symmTensor/symmTensor.C b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/symmTensor/symmTensor.C
rename to src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.C
diff --git a/src/OpenFOAM/primitives/symmTensor/symmTensor.H b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.H
similarity index 98%
rename from src/OpenFOAM/primitives/symmTensor/symmTensor.H
rename to src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.H
index eb5f02ec84..815c010547 100644
--- a/src/OpenFOAM/primitives/symmTensor/symmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/symmTensor/symmTensor.H
@@ -26,7 +26,7 @@ Typedef
     Foam::symmTensor
 
 Description
-    SymmTensor or scalars.
+    SymmTensor of scalars.
 
 SourceFiles
     symmTensor.C
diff --git a/src/OpenFOAM/primitives/labelTensor/labelTensor.C b/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/labelTensor/labelTensor.C
rename to src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.C
diff --git a/src/OpenFOAM/primitives/labelTensor/labelTensor.H b/src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.H
similarity index 100%
rename from src/OpenFOAM/primitives/labelTensor/labelTensor.H
rename to src/OpenFOAM/primitives/Tensor/labelTensor/labelTensor.H
diff --git a/src/OpenFOAM/primitives/tensor/tensor.C b/src/OpenFOAM/primitives/Tensor/tensor/tensor.C
similarity index 100%
rename from src/OpenFOAM/primitives/tensor/tensor.C
rename to src/OpenFOAM/primitives/Tensor/tensor/tensor.C
diff --git a/src/OpenFOAM/primitives/tensor/tensor.H b/src/OpenFOAM/primitives/Tensor/tensor/tensor.H
similarity index 99%
rename from src/OpenFOAM/primitives/tensor/tensor.H
rename to src/OpenFOAM/primitives/Tensor/tensor/tensor.H
index 42223abf6a..297b8b47b9 100644
--- a/src/OpenFOAM/primitives/tensor/tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/tensor/tensor.H
@@ -26,7 +26,7 @@ Typedef
     Foam::tensor
 
 Description
-    Tensor or scalars.
+    Tensor of scalars.
 
 SourceFiles
     tensor.C
diff --git a/src/OpenFOAM/primitives/tensor2D/tensor2D.C b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
similarity index 100%
rename from src/OpenFOAM/primitives/tensor2D/tensor2D.C
rename to src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.C
diff --git a/src/OpenFOAM/primitives/tensor2D/tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.H
similarity index 100%
rename from src/OpenFOAM/primitives/tensor2D/tensor2D.H
rename to src/OpenFOAM/primitives/Tensor2D/tensor2D/tensor2D.H
diff --git a/src/OpenFOAM/primitives/complexVector/complexVector.C b/src/OpenFOAM/primitives/Vector/complexVector/complexVector.C
similarity index 100%
rename from src/OpenFOAM/primitives/complexVector/complexVector.C
rename to src/OpenFOAM/primitives/Vector/complexVector/complexVector.C
diff --git a/src/OpenFOAM/primitives/complexVector/complexVector.H b/src/OpenFOAM/primitives/Vector/complexVector/complexVector.H
similarity index 100%
rename from src/OpenFOAM/primitives/complexVector/complexVector.H
rename to src/OpenFOAM/primitives/Vector/complexVector/complexVector.H
diff --git a/src/OpenFOAM/primitives/complexVector/complexVectorI.H b/src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H
similarity index 100%
rename from src/OpenFOAM/primitives/complexVector/complexVectorI.H
rename to src/OpenFOAM/primitives/Vector/complexVector/complexVectorI.H
diff --git a/src/OpenFOAM/primitives/labelVector/labelVector.C b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
similarity index 97%
rename from src/OpenFOAM/primitives/labelVector/labelVector.C
rename to src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
index 4849dc4f3d..d5fcdf8fe1 100644
--- a/src/OpenFOAM/primitives/labelVector/labelVector.C
+++ b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.C
@@ -22,14 +22,10 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Vector of labels.
-
 \*---------------------------------------------------------------------------*/
 
 #include "labelVector.H"
 
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<>
diff --git a/src/OpenFOAM/primitives/labelVector/labelVector.H b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.H
similarity index 97%
rename from src/OpenFOAM/primitives/labelVector/labelVector.H
rename to src/OpenFOAM/primitives/Vector/labelVector/labelVector.H
index d8a7c7c0d5..2cbbebad79 100644
--- a/src/OpenFOAM/primitives/labelVector/labelVector.H
+++ b/src/OpenFOAM/primitives/Vector/labelVector/labelVector.H
@@ -26,7 +26,7 @@ Typedef
     Foam::labelVector
 
 Description
-    labelVector obtained from generic Vector
+    Vector of labels.
 
 SourceFiles
     labelVector.C
diff --git a/src/OpenFOAM/primitives/vector/vector.C b/src/OpenFOAM/primitives/Vector/vector/vector.C
similarity index 100%
rename from src/OpenFOAM/primitives/vector/vector.C
rename to src/OpenFOAM/primitives/Vector/vector/vector.C
diff --git a/src/OpenFOAM/primitives/vector/vector.H b/src/OpenFOAM/primitives/Vector/vector/vector.H
similarity index 97%
rename from src/OpenFOAM/primitives/vector/vector.H
rename to src/OpenFOAM/primitives/Vector/vector/vector.H
index 5c736eb9ae..2bfac28c4b 100644
--- a/src/OpenFOAM/primitives/vector/vector.H
+++ b/src/OpenFOAM/primitives/Vector/vector/vector.H
@@ -26,7 +26,7 @@ Typedef
     Foam::vector
 
 Description
-    vector obtained from generic Vector
+    A scalar version of the templated Vector
 
 SourceFiles
     vector.C
diff --git a/src/OpenFOAM/primitives/vector2D/vector2D.C b/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.C
similarity index 100%
rename from src/OpenFOAM/primitives/vector2D/vector2D.C
rename to src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.C
diff --git a/src/OpenFOAM/primitives/vector2D/vector2D.H b/src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.H
similarity index 100%
rename from src/OpenFOAM/primitives/vector2D/vector2D.H
rename to src/OpenFOAM/primitives/Vector2D/vector2D/vector2D.H
diff --git a/src/OpenFOAM/primitives/char/charIO.C b/src/OpenFOAM/primitives/char/charIO.C
index 28d3ab12d3..ca3c9a95cf 100644
--- a/src/OpenFOAM/primitives/char/charIO.C
+++ b/src/OpenFOAM/primitives/char/charIO.C
@@ -39,7 +39,7 @@ Description
 Foam::Istream& Foam::operator>>(Istream& is, char& c)
 {
     is.read(c);
-    is.check("Istream& operator>>(Istream& is, char& c)");
+    is.check("Istream& operator>>(Istream&, char&)");
     return is;
 }
 
diff --git a/src/OpenFOAM/primitives/contiguous/contiguous.H b/src/OpenFOAM/primitives/contiguous/contiguous.H
index 3c272839a0..ee38d8eb10 100644
--- a/src/OpenFOAM/primitives/contiguous/contiguous.H
+++ b/src/OpenFOAM/primitives/contiguous/contiguous.H
@@ -29,15 +29,13 @@ Description
     Template function to specify if the data of a type are contiguous.
 
     The default function specifies that data are not contiguous.
-    This is specialised for the types (e.g. primitives) with contiguous data.
+    This is specialised for the types (eg, primitives) with contiguous data.
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef contiguous_H
 #define contiguous_H
 
-#include "label.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -46,7 +44,7 @@ namespace Foam
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Forward declaration of friend functions and operators
-template<class T, label Size> class FixedList;
+template<class T, unsigned Size> class FixedList;
 template<class T> class Pair;
 
 
diff --git a/src/OpenFOAM/primitives/hashes/Hash/Hash.H b/src/OpenFOAM/primitives/hashes/Hash/Hash.H
index ab8aa07a3b..dd16517dfe 100644
--- a/src/OpenFOAM/primitives/hashes/Hash/Hash.H
+++ b/src/OpenFOAM/primitives/hashes/Hash/Hash.H
@@ -27,7 +27,7 @@ Class
 
 Description
     Hash function class for primitives.  All non-primitives used to hash
-    entries on hash tables need a specialised version of this class.
+    entries on hash tables likely need a specialized version of this class.
 
 \*---------------------------------------------------------------------------*/
 
@@ -35,6 +35,9 @@ Description
 #define Hash_H
 
 #include "label.H"
+#include "uLabel.H"
+#include "Hasher.H"
+#include "pTraits.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -42,27 +45,81 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class Hash Declaration
+                            Class Hash Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class PrimitiveType>
 class Hash
 {
-
 public:
 
     Hash()
     {}
 
-    label operator()(const PrimitiveType& p) const
+    unsigned operator()(const PrimitiveType& p, unsigned seed) const
     {
-        return label(p);
+        return Hasher(&p, sizeof(p), seed);
     }
 
-    label operator()(const PrimitiveType& p, const label tableSize) const
+    unsigned operator()(const PrimitiveType& p) const
     {
-        return mag(operator()(p)) % tableSize;
+        return Hasher(&p, sizeof(p));
     }
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Hash specialization for hashing pointer addresses.
+//  Treat a pointer like a long.
+//  This should work for both 32-bit and 64-bit pointers.
+template<>
+class Hash<void*>
+{
+public:
+
+    Hash()
+    {}
+
+    unsigned operator()(const void* const& p, unsigned seed) const
+    {
+        return Hash<long>()(long(p), seed);
+    }
+
+    unsigned operator()(const void* const& p) const
+    {
+        return Hash<long>()(long(p));
+    }
+
+};
+
+
+//- Hash specialization for hashing labels
+template<>
+class Hash<Foam::label>
+{
+public:
+
+    Hash()
+    {}
+
+    //- Incrementally hash a label.
+    //  This will necessarily return a different value than the
+    //  non-incremental version.
+    unsigned operator()(const label& p, unsigned seed) const
+    {
+        return Hasher(&p, sizeof(label), seed);
+    }
+
+    //- Return the unsigned representation of a label.
+    //  This helps if people have relied on the hash value corresponding to
+    //  the natural order.
+    unsigned operator()(const label& p) const
+    {
+        return p;
+    }
+
 };
 
 
diff --git a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
new file mode 100644
index 0000000000..cfc832dde9
--- /dev/null
+++ b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C
@@ -0,0 +1,606 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Description
+    Hashing functions, mostly from Bob Jenkins
+\*---------------------------------------------------------------------------*/
+
+#include "Hasher.H"
+#include "HasherInt.H"
+
+#if defined (__GLIBC__)
+#  include <endian.h>
+#endif
+
+// Left-rotate a 32-bit value and carry by nBits
+#define bitRotateLeft(x, nBits)  (((x) << (nBits)) | ((x) >> (32 - (nBits))))
+
+
+// ----------------------------------------------------------------------------
+// lookup3.c, by Bob Jenkins, May 2006, Public Domain.
+//
+// These are functions for producing 32-bit hashes for hash table lookup.
+// hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
+// are externally useful functions.  Routines to test the hash are included
+// if SELF_TEST is defined.  You can use this free for any purpose.  It's in
+// the public domain.  It has no warranty.
+//
+// You probably want to use hashlittle().  hashlittle() and hashbig()
+// hash byte arrays.  hashlittle() is is faster than hashbig() on
+// little-endian machines.  Intel and AMD are little-endian machines.
+// On second thought, you probably want hashlittle2(), which is identical to
+// hashlittle() except it returns two 32-bit hashes for the price of one.
+// You could implement hashbig2() if you wanted but I haven't bothered here.
+//
+// If you want to find a hash of, say, exactly 7 integers, do
+//   a = i1;  b = i2;  c = i3;
+//   mix(a,b,c);
+//   a += i4; b += i5; c += i6;
+//   mix(a,b,c);
+//   a += i7;
+//   final(a,b,c);
+// then use c as the hash value.  If you have a variable length array of
+// 4-byte integers to hash, use hashword().  If you have a byte array (like
+// a character string), use hashlittle().  If you have several byte arrays, or
+// a mix of things, see the comments above hashlittle().
+//
+// Why is this so big?  I read 12 bytes at a time into 3 4-byte integers,
+// then mix those integers.  This is fast (you can do a lot more thorough
+// mixing with 12*3 instructions on 3 integers than you can with 3 instructions
+// on 1 byte), but shoehorning those bytes into integers efficiently is messy.
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// mix -- mix 3 32-bit values reversibly.
+//
+// This is reversible, so any information in (a,b,c) before mix_hash() is
+// still in (a,b,c) after mix_hash().
+//
+// If four pairs of (a,b,c) inputs are run through mix_hash(), or through
+// mix_hash() in reverse, there are at least 32 bits of the output that
+// are sometimes the same for one pair and different for another pair.
+// This was tested for:
+// * pairs that differed by one bit, by two bits, in any combination
+//   of top bits of (a,b,c), or in any combination of bottom bits of
+//   (a,b,c).
+// * "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
+//   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
+//   is commonly produced by subtraction) look like a single 1-bit
+//   difference.
+// * the base values were pseudorandom, all zero but one bit set, or
+//   all zero plus a counter that starts at zero.
+//
+// Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
+// satisfy this are
+//     4  6  8 16 19  4
+//     9 15  3 18 27 15
+//    14  9  3  7 17  3
+// Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
+// for "differ" defined as + with a one-bit base and a two-bit delta.  I
+// used http://burtleburtle.net/bob/hash/avalanche.html to choose
+// the operations, constants, and arrangements of the variables.
+//
+// This does not achieve avalanche.  There are input bits of (a,b,c)
+// that fail to affect some output bits of (a,b,c), especially of a.  The
+// most thoroughly mixed value is c, but it doesn't really even achieve
+// avalanche in c.
+//
+// This allows some parallelism.  Read-after-writes are good at doubling
+// the number of bits affected, so the goal of mixing pulls in the opposite
+// direction as the goal of parallelism.  I did what I could.  Rotates
+// seem to cost as much as shifts on every machine I could lay my hands
+// on, and rotates are much kinder to the top and bottom bits, so I used
+// rotates.
+// ----------------------------------------------------------------------------
+
+#define bitMixer(a, b, c)                                                     \
+    {                                                                         \
+        a -= c; a ^= bitRotateLeft(c, 4); c += b;                             \
+        b -= a; b ^= bitRotateLeft(a, 6); a += c;                             \
+        c -= b; c ^= bitRotateLeft(b, 8); b += a;                             \
+        a -= c; a ^= bitRotateLeft(c,16); c += b;                             \
+        b -= a; b ^= bitRotateLeft(a,19); a += c;                             \
+        c -= b; c ^= bitRotateLeft(b, 4); b += a;                             \
+    }
+
+
+// ----------------------------------------------------------------------------
+// final -- final mixing of 3 32-bit values (a,b,c) into c
+//
+// Pairs of (a,b,c) values differing in only a few bits will usually
+// produce values of c that look totally different.  This was tested for
+// * pairs that differed by one bit, by two bits, in any combination
+//   of top bits of (a,b,c), or in any combination of bottom bits of
+//   (a,b,c).
+// * "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
+//   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
+//   is commonly produced by subtraction) look like a single 1-bit
+//   difference.
+// * the base values were pseudorandom, all zero but one bit set, or
+//   all zero plus a counter that starts at zero.
+//
+// These constants passed:
+//  14 11 25 16 4 14 24
+//  12 14 25 16 4 14 24
+// and these came close:
+//   4  8 15 26 3 22 24
+//  10  8 15 26 3 22 24
+//  11  8 15 26 3 22 24
+// ----------------------------------------------------------------------------
+
+#define bitMixerFinal(a, b, c)                                                \
+    {                                                                         \
+        c ^= b; c -= bitRotateLeft(b, 14);                                    \
+        a ^= c; a -= bitRotateLeft(c, 11);                                    \
+        b ^= a; b -= bitRotateLeft(a, 25);                                    \
+        c ^= b; c -= bitRotateLeft(b, 16);                                    \
+        a ^= c; a -= bitRotateLeft(c, 4);                                     \
+        b ^= a; b -= bitRotateLeft(a, 14);                                    \
+        c ^= b; c -= bitRotateLeft(b, 24);                                    \
+    }
+
+
+// * * * * * * * * * * * * * * Static Functions  * * * * * * * * * * * * * * //
+
+// ----------------------------------------------------------------------------
+// hashlittle() -- hash a variable-length key into a 32-bit value
+//   k       : the key (the unaligned variable-length array of bytes)
+//   length  : the length of the key, counting by bytes
+//   initval : can be any 4-byte value
+// Returns a 32-bit value.  Every bit of the key affects every bit of
+// the return value.  Two keys differing by one or two bits will have
+// totally different hash values.
+//
+// The best hash table sizes are powers of 2.  There is no need to do
+// mod a prime (mod is sooo slow!).  If you need less than 32 bits,
+// use a bitmask.  For example, if you need only 10 bits, do
+//   h = (h & hashmask(10));
+// In which case, the hash table should have hashsize(10) elements.
+//
+// If you are hashing n strings (uint8_t **)k, do it like this:
+//   for (i=0, h=0; i<n; ++i) h = hashlittle( k[i], len[i], h);
+//
+// By Bob Jenkins, 2006.  bob_jenkins@burtleburtle.net.  You may use this
+// code any way you wish, private, educational, or commercial.  It's free.
+//
+// Use for hash table lookup, or anything where one collision in 2^^32 is
+// acceptable.  Do NOT use for cryptographic purposes.
+// ----------------------------------------------------------------------------
+
+//- specialized little-endian code
+#if !defined (__BYTE_ORDER) || (__BYTE_ORDER == __LITTLE_ENDIAN)
+static unsigned jenkins_hashlittle
+(
+    const void *key,
+    size_t length,
+    unsigned initval
+)
+{
+    uint32_t a, b, c;
+    union { const void *ptr; size_t i; } u; // to cast key to (size_t) happily
+
+    // Set up the internal state
+    a = b = c = 0xdeadbeef + static_cast<uint32_t>(length) + initval;
+
+    u.ptr = key;
+    if ((u.i & 0x3) == 0)
+    {
+        // 32-bit chunks
+        const uint32_t *k = reinterpret_cast<const uint32_t*>(key);
+
+        // all but last block: aligned reads and affect 32 bits of (a,b,c)
+        while (length > 12)
+        {
+            a += k[0];
+            b += k[1];
+            c += k[2];
+            bitMixer(a,b,c);
+            length -= 12;
+            k += 3;
+        }
+
+        // handle the last (probably partial) block byte-wise
+        const uint8_t *k8 = reinterpret_cast<const uint8_t*>(k);
+        switch (length)
+        {
+            case 12: c += k[2]; b += k[1]; a += k[0]; break;
+            case 11: c += static_cast<uint32_t>(k8[10]) << 16; // fall through
+            case 10: c += static_cast<uint32_t>(k8[9])  << 8;  // fall through
+            case 9 : c += k8[8];                               // fall through
+            case 8 : b += k[1]; a += k[0]; break;
+            case 7 : b += static_cast<uint32_t>(k8[6]) << 16;  // fall through
+            case 6 : b += static_cast<uint32_t>(k8[5]) << 8;   // fall through
+            case 5 : b += k8[4];                               // fall through
+            case 4 : a += k[0]; break;
+            case 3 : a += static_cast<uint32_t>(k8[2]) << 16;  // fall through
+            case 2 : a += static_cast<uint32_t>(k8[1]) << 8;   // fall through
+            case 1 : a += k8[0]; break;
+            case 0 : return c;  // zero-length requires no mixing
+        }
+    }
+    else if ((u.i & 0x1) == 0)
+    {
+        // 16-bit chunks
+        const uint16_t *k = reinterpret_cast<const uint16_t*>(key);
+
+        // all but last block: aligned reads and different mixing
+        while (length > 12)
+        {
+            a += k[0] + (static_cast<uint32_t>(k[1]) << 16);
+            b += k[2] + (static_cast<uint32_t>(k[3]) << 16);
+            c += k[4] + (static_cast<uint32_t>(k[5]) << 16);
+            bitMixer(a,b,c);
+            length -= 12;
+            k += 6;
+        }
+
+        // handle the last (probably partial) block
+        const uint8_t *k8 = reinterpret_cast<const uint8_t*>(k);
+        switch (length)
+        {
+            case 12:
+                c += k[4] + (static_cast<uint32_t>(k[5]) << 16);
+                b += k[2] + (static_cast<uint32_t>(k[3]) << 16);
+                a += k[0] + (static_cast<uint32_t>(k[1]) << 16);
+                break;
+            case 11:
+                c += static_cast<uint32_t>(k8[10]) << 16;
+                // fall through
+            case 10:
+                c += k[4];
+                b += k[2] + (static_cast<uint32_t>(k[3]) << 16);
+                a += k[0] + (static_cast<uint32_t>(k[1]) << 16);
+                break;
+            case 9 :
+                c += k8[8];
+                // fall through
+            case 8 :
+                b += k[2] + (static_cast<uint32_t>(k[3]) << 16);
+                a += k[0] + (static_cast<uint32_t>(k[1]) << 16);
+                break;
+            case 7 :
+                b += static_cast<uint32_t>(k8[6]) << 16;
+                // fall through
+            case 6 :
+                b += k[2];
+                a += k[0] + (static_cast<uint32_t>(k[1]) << 16);
+                break;
+            case 5 :
+                b += k8[4];
+                // fall through
+            case 4 :
+                a += k[0] + (static_cast<uint32_t>(k[1]) << 16);
+                break;
+            case 3 :
+                a += static_cast<uint32_t>(k8[2]) << 16;
+                // fall through
+            case 2 :
+                a += k[0];
+                break;
+            case 1 :
+                a += k8[0];
+                break;
+            case 0 : return c;     // zero-length requires no mixing
+        }
+    }
+    else
+    {
+        const uint8_t *k = reinterpret_cast<const uint8_t*>(key);
+
+        // all but the last block: affect some 32 bits of (a,b,c)
+        while (length > 12)
+        {
+            a += k[0];
+            a += static_cast<uint32_t>(k[1]) << 8;
+            a += static_cast<uint32_t>(k[2]) << 16;
+            a += static_cast<uint32_t>(k[3]) << 24;
+            b += k[4];
+            b += static_cast<uint32_t>(k[5]) << 8;
+            b += static_cast<uint32_t>(k[6]) << 16;
+            b += static_cast<uint32_t>(k[7]) << 24;
+            c += k[8];
+            c += static_cast<uint32_t>(k[9])  << 8;
+            c += static_cast<uint32_t>(k[10]) << 16;
+            c += static_cast<uint32_t>(k[11]) << 24;
+
+            bitMixer(a,b,c);
+            length -= 12;
+            k += 12;
+        }
+
+        // last block: affect all 32 bits of (c)
+        switch (length) // most case statements fall through
+        {
+            case 12: c += static_cast<uint32_t>(k[11]) << 24;
+            case 11: c += static_cast<uint32_t>(k[10]) << 16;
+            case 10: c += static_cast<uint32_t>(k[9]) << 8;
+            case 9 : c += k[8];
+
+            case 8 : b += static_cast<uint32_t>(k[7]) << 24;
+            case 7 : b += static_cast<uint32_t>(k[6]) << 16;
+            case 6 : b += static_cast<uint32_t>(k[5]) << 8;
+            case 5 : b += k[4];
+
+            case 4 : a += static_cast<uint32_t>(k[3]) << 24;
+            case 3 : a += static_cast<uint32_t>(k[2]) << 16;
+            case 2 : a += static_cast<uint32_t>(k[1]) << 8;
+            case 1 : a += k[0];
+                break;
+
+            case 0 : return c;
+        }
+    }
+
+    bitMixerFinal(a,b,c);
+    return c;
+}
+#endif
+
+
+
+
+// ----------------------------------------------------------------------------
+// hashbig():
+// This is the same as hashword() on big-endian machines.  It is different
+// from hashlittle() on all machines.  hashbig() takes advantage of
+// big-endian byte ordering.
+// ----------------------------------------------------------------------------
+// specialized big-endian code
+#if !defined (__BYTE_ORDER) || (__BYTE_ORDER == __BIG_ENDIAN)
+static unsigned jenkins_hashbig
+(
+    const void *key,
+    size_t length,
+    unsigned initval
+)
+{
+    uint32_t a, b, c;
+    union { const void *ptr; size_t i; } u; // to cast key to (size_t) happily
+
+    // Set up the internal state
+    a = b = c = 0xdeadbeef + static_cast<uint32_t>(length) + initval;
+
+    u.ptr = key;
+    if ((u.i & 0x3) == 0)
+    {
+        // 32-bit chunks
+        const uint32_t *k = reinterpret_cast<const uint32_t*>(key);
+
+        // all but last block: aligned reads and affect 32 bits of (a,b,c)
+        while (length > 12)
+        {
+            a += k[0];
+            b += k[1];
+            c += k[2];
+            bitMixer(a,b,c);
+            length -= 12;
+            k += 3;
+        }
+
+        // handle the last (probably partial) block byte-wise
+        const uint8_t *k8 = reinterpret_cast<const uint8_t*>(k);
+
+        switch (length) // most the case statements fall through
+        {
+            case 12: c += k[2]; b += k[1]; a += k[0]; break;
+            case 11: c += static_cast<uint32_t>(k8[10]) << 8; // fall through
+            case 10: c += static_cast<uint32_t>(k8[9]) << 16; // fall through
+            case 9 : c += static_cast<uint32_t>(k8[8]) << 24; // fall through
+            case 8 : b += k[1]; a += k[0]; break;
+            case 7 : b += static_cast<uint32_t>(k8[6]) << 8;  // fall through
+            case 6 : b += static_cast<uint32_t>(k8[5]) << 16; // fall through
+            case 5 : b += static_cast<uint32_t>(k8[4]) << 24; // fall through
+            case 4 : a += k[0]; break;
+            case 3 : a += static_cast<uint32_t>(k8[2]) << 8;  // fall through
+            case 2 : a += static_cast<uint32_t>(k8[1]) << 16; // fall through
+            case 1 : a += static_cast<uint32_t>(k8[0]) << 24; break;
+            case 0 : return c;
+        }
+    }
+    else
+    {
+        // need to read the key one byte at a time
+        const uint8_t *k = reinterpret_cast<const uint8_t*>(key);
+
+        // all but the last block: affect some 32 bits of (a,b,c)
+        while (length > 12)
+        {
+            a += static_cast<uint32_t>(k[0]) << 24;
+            a += static_cast<uint32_t>(k[1]) << 16;
+            a += static_cast<uint32_t>(k[2]) << 8;
+            a += static_cast<uint32_t>(k[3]);
+            b += static_cast<uint32_t>(k[4]) << 24;
+            b += static_cast<uint32_t>(k[5]) << 16;
+            b += static_cast<uint32_t>(k[6]) << 8;
+            b += static_cast<uint32_t>(k[7]);
+            c += static_cast<uint32_t>(k[8]) << 24;
+            c += static_cast<uint32_t>(k[9]) << 16;
+            c += static_cast<uint32_t>(k[10]) << 8;
+            c += static_cast<uint32_t>(k[11]);
+
+            bitMixer(a,b,c);
+            length -= 12;
+            k += 12;
+        }
+
+        // last block: affect all 32 bits of (c)
+        switch (length) // the case statements fall through
+        {
+            case 12: c += k[11];
+            case 11: c += static_cast<uint32_t>(k[10]) << 8;
+            case 10: c += static_cast<uint32_t>(k[9]) << 16;
+            case 9 : c += static_cast<uint32_t>(k[8]) << 24;
+            case 8 : b += k[7];
+            case 7 : b += static_cast<uint32_t>(k[6]) << 8;
+            case 6 : b += static_cast<uint32_t>(k[5]) << 16;
+            case 5 : b += static_cast<uint32_t>(k[4]) << 24;
+            case 4 : a += k[3];
+            case 3 : a += static_cast<uint32_t>(k[2]) << 8;
+            case 2 : a += static_cast<uint32_t>(k[1]) << 16;
+            case 1 : a += static_cast<uint32_t>(k[0]) << 24;
+                break;
+            case 0 : return c;
+        }
+    }
+
+    bitMixerFinal(a,b,c);
+    return c;
+}
+#endif
+
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+
+unsigned Foam::Hasher
+(
+    const void *key,
+    size_t length,
+    unsigned initval
+)
+{
+#ifdef __BYTE_ORDER
+# if (__BYTE_ORDER == __BIG_ENDIAN)
+    return jenkins_hashbig(key, length, initval);
+# else
+    return jenkins_hashlittle(key, length, initval);
+# endif
+#else
+    // endian-ness not known at compile-time: runtime endian test
+    const short endianTest = 0x0100;
+
+    // yields 0x01 for big endian
+    if (*(reinterpret_cast<const char *>(&endianTest)))
+    {
+        return jenkins_hashbig(key, length, initval);
+    }
+    else
+    {
+        return jenkins_hashlittle(key, length, initval);
+    }
+#endif
+}
+
+
+// ----------------------------------------------------------------------------
+//  This works on all machines.  To be useful, it requires
+//  -- that the key be an array of uint32_t's, and
+//  -- that the length be the number of uint32_t's in the key
+//
+//  The function hashword() is identical to hashlittle() on little-endian
+//  machines, and identical to hashbig() on big-endian machines,
+//  except that the length has to be measured in uint32_ts rather than in
+//  bytes.  hashlittle() is more complicated than hashword() only because
+//  hashlittle() has to dance around fitting the key bytes into registers.
+// ----------------------------------------------------------------------------
+unsigned Foam::HasherInt
+(
+    const uint32_t *k,
+    size_t length,
+    unsigned seed
+)
+{
+    uint32_t a, b, c;
+
+    // Set up the internal state
+    a = b = c = 0xdeadbeef + (static_cast<uint32_t>(length) << 2) + seed;
+
+    // handle most of the key
+    while (length > 3)
+    {
+        a += k[0];
+        b += k[1];
+        c += k[2];
+        bitMixer(a,b,c);
+        length -= 3;
+        k += 3;
+    }
+
+    // handle the last 3 uint32_t's
+    switch (length)  // all case statements fall through
+    {
+        case 3 : c += k[2];
+        case 2 : b += k[1];
+        case 1 : a += k[0];
+            bitMixerFinal(a,b,c);
+        case 0 :  // case 0: nothing left to add
+            break;
+    }
+
+    return c;
+}
+
+
+// ----------------------------------------------------------------------------
+// hashword2() -- same as hashword(), but take two seeds and return two
+// 32-bit values.  pc and pb must both be non-null, and *pc and *pb must
+// both be initialized with seeds.  If you pass in (*pb)==0, the output
+// (*pc) will be the same as the return value from hashword().
+// ----------------------------------------------------------------------------
+unsigned Foam::HasherDual
+(
+    const uint32_t *k,
+    size_t length,
+    unsigned& hash1,  // IN: seed OUT: primary hash value
+    unsigned& hash2   // IN: more seed OUT: secondary hash value
+)
+{
+    uint32_t a, b, c;
+
+    // Set up the internal state
+    a = b = c = 0xdeadbeef + (static_cast<uint32_t>(length) << 2) + hash1;
+    c += hash2;
+
+    // handle most of the key
+    while (length > 3)
+    {
+        a += k[0];
+        b += k[1];
+        c += k[2];
+        bitMixer(a,b,c);
+        length -= 3;
+        k += 3;
+    }
+
+    // handle the last 3 uint32_t's
+    switch (length)  // all case statements fall through
+    {
+        case 3 : c += k[2];
+        case 2 : b += k[1];
+        case 1 : a += k[0];
+            bitMixerFinal(a,b,c);
+        case 0 :  // case 0: nothing left to add
+            break;
+    }
+
+    // report the result
+    hash1 = c;
+    hash2 = b;
+
+    // return primary hash value
+    return c;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.H b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.H
new file mode 100644
index 0000000000..a794a47b27
--- /dev/null
+++ b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.H
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+InNamespace
+    Foam
+
+Description
+    Misc. hashing functions, mostly from Bob Jenkins.
+
+    The Jenkins hashing function(s) is similar in speed to Paul Hsieh's
+    SuperFast hash, but is public domain, supports incremental hashing
+    and has been reported to have better characteristics.
+    It is also what postgresql seems to be using.
+
+SeeAlso
+    http://burtleburtle.net/bob/c/lookup3.c
+    and HasherInt.H for a specialized version
+
+SourceFiles
+    Hasher.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Hasher_H
+#define Hasher_H
+
+#include <cstddef>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    //- Bob Jenkins's 96-bit mixer hashing function (lookup3)
+    //  @param[in] data - a character stream
+    //  @param[in] len  - the number of bytes
+    //  @param[in] seed - the previous hash, or an arbitrary value
+    unsigned Hasher(const void* data, size_t len, unsigned seed = 0);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/hashes/Hasher/HasherInt.H b/src/OpenFOAM/primitives/hashes/Hasher/HasherInt.H
new file mode 100644
index 0000000000..a0a0ede597
--- /dev/null
+++ b/src/OpenFOAM/primitives/hashes/Hasher/HasherInt.H
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+InNamespace
+    Foam
+
+Description
+    Optimized hashing functions.
+
+SeeAlso
+    Hasher.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef HasherInt_H
+#define HasherInt_H
+
+#include "Hasher.H"
+
+#include <cstddef>
+#include <stdint.h>    // C++0x uses <cstdint>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+    //- An optimized version of Hasher
+    //  @param[in] data - an array of uint32_t values
+    //  @param[in] len  - the number of values (not bytes)
+    //  @param[in] seed - the previous hash, or an arbitrary value
+    unsigned HasherInt(const uint32_t*, size_t length, unsigned seed = 0);
+
+    //- An optimized version of Hasher, returning dual hash values
+    //  @param[in] data - an array of uint32_t values
+    //  @param[in] len  - the number of values (not bytes)
+    //  @param[in] hash1 - the previous hash, or an arbitrary value
+    //    on output, the primary hash value
+    //  @param[in] hash1 - the previous hash, or an arbitrary value
+    //    on output, the secondary hash value
+    unsigned HasherDual
+    (
+        const uint32_t*,
+        size_t len,
+        unsigned& hash1,
+        unsigned& hash2
+    );
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.H b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.H
index e2be6300a8..808dffa321 100644
--- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.H
+++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.H
@@ -114,7 +114,7 @@ public:
     // Constructors
 
         //- Construct null
-	inline SHA1();
+        inline SHA1();
 
         //- Construct and append initial std::string
         explicit inline SHA1(const std::string&);
@@ -124,24 +124,24 @@ public:
 
     // Member Functions
 
-	//- Reset the hashed data before appending more
-	void clear();
+        //- Reset the hashed data before appending more
+        void clear();
 
-	//- Append data for processing
-	inline SHA1& append(const char* data, size_t len);
+        //- Append data for processing
+        inline SHA1& append(const char* data, size_t len);
 
-	//- Append string for processing
+        //- Append string for processing
         inline SHA1& append(const std::string&);
 
-	//- Append string for processing
-	inline SHA1& append(const char* str);
+        //- Append string for processing
+        inline SHA1& append(const char* str);
 
-	//- Finalized the calculations (normally not needed directly).
+        //- Finalized the calculations (normally not needed directly).
         //  Returns false if no bytes were passed for processing
-	bool finalize();
+        bool finalize();
 
         //- Calculate current digest from appended data.
-	SHA1Digest digest() const;
+        SHA1Digest digest() const;
 
 
     // Member Operators
diff --git a/src/OpenFOAM/primitives/int/int.H b/src/OpenFOAM/primitives/ints/int/int.H
similarity index 100%
rename from src/OpenFOAM/primitives/int/int.H
rename to src/OpenFOAM/primitives/ints/int/int.H
diff --git a/src/OpenFOAM/primitives/int/intIO.C b/src/OpenFOAM/primitives/ints/int/intIO.C
similarity index 100%
rename from src/OpenFOAM/primitives/int/intIO.C
rename to src/OpenFOAM/primitives/ints/int/intIO.C
diff --git a/src/OpenFOAM/primitives/label/label.C b/src/OpenFOAM/primitives/ints/label/label.C
similarity index 92%
rename from src/OpenFOAM/primitives/label/label.C
rename to src/OpenFOAM/primitives/ints/label/label.C
index 38217bd6b2..dc960b7817 100644
--- a/src/OpenFOAM/primitives/label/label.C
+++ b/src/OpenFOAM/primitives/ints/label/label.C
@@ -37,8 +37,8 @@ namespace Foam
 const char* const pTraits<label>::typeName = "label";
 const label pTraits<label>::zero = 0;
 const label pTraits<label>::one = 1;
-const label pTraits<label>::max = labelMax;
 const label pTraits<label>::min = labelMin;
+const label pTraits<label>::max = labelMax;
 
 const char* pTraits<label>::componentNames[] = { "x" };
 
@@ -59,6 +59,15 @@ label pow(label a, label b)
         ans *= a;
     }
 
+#   ifdef FULLDEBUG
+    if (b < 0)
+    {
+        FatalErrorIn("pow(label a, label b)")
+            << "negative value for b is not supported"
+            << abort(FatalError);
+    }
+#   endif
+
     return ans;
 }
 
@@ -73,7 +82,7 @@ label factorial(label n)
     };
 
 #   ifdef FULLDEBUG
-    if (n>12 && n<0)
+    if (n > 12 && n < 0)
     {
         FatalErrorIn("factorial(label n)")
             << "n value out of range"
diff --git a/src/OpenFOAM/primitives/label/label.H b/src/OpenFOAM/primitives/ints/label/label.H
similarity index 89%
rename from src/OpenFOAM/primitives/label/label.H
rename to src/OpenFOAM/primitives/ints/label/label.H
index d1697a5538..cd15e9ea8b 100644
--- a/src/OpenFOAM/primitives/label/label.H
+++ b/src/OpenFOAM/primitives/ints/label/label.H
@@ -26,7 +26,8 @@ Typedef
     Foam::label
 
 Description
-    A label is an int/long/long long depending on the range wanted.
+    A label is an int/long/long long depending on the range desired.
+
     A readLabel function is defined so that label can be constructed from
     Istream.
 
@@ -42,24 +43,27 @@ Description
 
 
 #if FOAM_LABEL64
-#    define WANTEDRANGE 9000000000000000000
+#    define FOAM_LABEL_MAX 9000000000000000000
 #else
-#    define WANTEDRANGE 2000000000
+#    define FOAM_LABEL_MAX 2000000000
 #endif
 
 
-#if INT_MAX > WANTEDRANGE
+#if INT_MAX > FOAM_LABEL_MAX
 
 // Define label as an int
 
-#include "int.H"
+# undef  FOAM_LABEL_MAX
+# define FOAM_LABEL_MAX INT_MAX
+
+# include "int.H"
 
 namespace Foam
 {
     typedef int label;
 
-    static const label labelMax = INT_MAX;
     static const label labelMin = INT_MIN;
+    static const label labelMax = INT_MAX;
 
     inline label readLabel(Istream& is)
     {
@@ -69,19 +73,21 @@ namespace Foam
 } // End namespace Foam
 
 
-#elif LONG_MAX > WANTEDRANGE
-
+#elif LONG_MAX > FOAM_LABEL_MAX
 // Define label as a long
 
-#include "int.H"
-#include "long.H"
+# undef  FOAM_LABEL_MAX
+# define FOAM_LABEL_MAX LONG_MAX
+
+# include "int.H"
+# include "long.H"
 
 namespace Foam
 {
     typedef long label;
 
-    static const label labelMax = LONG_MAX;
     static const label labelMin = LONG_MIN;
+    static const label labelMax = LONG_MAX;
 
     inline label readLabel(Istream& is)
     {
@@ -91,20 +97,23 @@ namespace Foam
 } // End namespace Foam
 
 
-#elif LLONG_MAX > WANTEDRANGE
+#elif LLONG_MAX > FOAM_LABEL_MAX
 
 // Define label as a long long
 
-#include "int.H"
-#include "long.H"
-#include "longLong.H"
+# undef  FOAM_LABEL_MAX
+# define FOAM_LABEL_MAX LLONG_MAX
+
+# include "int.H"
+# include "long.H"
+# include "longLong.H"
 
 namespace Foam
 {
     typedef long long label;
 
-    static const label labelMax = LLONG_MAX;
     static const label labelMin = LLONG_MIN;
+    static const label labelMax = LLONG_MAX;
 
     inline label readLabel(Istream& is)
     {
@@ -124,7 +133,7 @@ namespace Foam
 namespace Foam
 {
 
-// template specialisation for pTraits<label>
+//- template specialization for pTraits<label>
 template<>
 class pTraits<label>
 {
@@ -150,8 +159,8 @@ public:
         static const char* componentNames[];
         static const label zero;
         static const label one;
-        static const label max;
         static const label min;
+        static const label max;
 
     // Constructors
 
diff --git a/src/OpenFOAM/primitives/long/long.H b/src/OpenFOAM/primitives/ints/long/long.H
similarity index 99%
rename from src/OpenFOAM/primitives/long/long.H
rename to src/OpenFOAM/primitives/ints/long/long.H
index fbcbfc93f6..c2f12c5059 100644
--- a/src/OpenFOAM/primitives/long/long.H
+++ b/src/OpenFOAM/primitives/ints/long/long.H
@@ -26,7 +26,7 @@ Primitive
     long
 
 Description
-    A long int
+    A long integer
 
 SourceFiles
     longIO.C
diff --git a/src/OpenFOAM/primitives/long/longIO.C b/src/OpenFOAM/primitives/ints/long/longIO.C
similarity index 100%
rename from src/OpenFOAM/primitives/long/longIO.C
rename to src/OpenFOAM/primitives/ints/long/longIO.C
diff --git a/src/OpenFOAM/primitives/longLong/longLong.H b/src/OpenFOAM/primitives/ints/longLong/longLong.H
similarity index 98%
rename from src/OpenFOAM/primitives/longLong/longLong.H
rename to src/OpenFOAM/primitives/ints/longLong/longLong.H
index 3466bfc863..f9fc6999d0 100644
--- a/src/OpenFOAM/primitives/longLong/longLong.H
+++ b/src/OpenFOAM/primitives/ints/longLong/longLong.H
@@ -26,7 +26,7 @@ Primitive
     long long
 
 Description
-    A long long (64 bits)
+    A long long (64 bits on many systems)
 
 SourceFiles
     longLongIO.C
diff --git a/src/OpenFOAM/primitives/longLong/longLongIO.C b/src/OpenFOAM/primitives/ints/longLong/longLongIO.C
similarity index 100%
rename from src/OpenFOAM/primitives/longLong/longLongIO.C
rename to src/OpenFOAM/primitives/ints/longLong/longLongIO.C
diff --git a/src/OpenFOAM/primitives/uLabel/uLabel.C b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
similarity index 100%
rename from src/OpenFOAM/primitives/uLabel/uLabel.C
rename to src/OpenFOAM/primitives/ints/uLabel/uLabel.C
index b005ed9fba..de0a82c412 100644
--- a/src/OpenFOAM/primitives/uLabel/uLabel.C
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.C
@@ -37,8 +37,8 @@ namespace Foam
 const char* const pTraits<uLabel>::typeName = "uLabel";
 const uLabel pTraits<uLabel>::zero = 0;
 const uLabel pTraits<uLabel>::one = 1;
-const uLabel pTraits<uLabel>::max = uLabelMax;
 const uLabel pTraits<uLabel>::min = uLabelMin;
+const uLabel pTraits<uLabel>::max = uLabelMax;
 
 const char* pTraits<uLabel>::componentNames[] = { "x" };
 
diff --git a/src/OpenFOAM/primitives/uLabel/uLabel.H b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
similarity index 86%
rename from src/OpenFOAM/primitives/uLabel/uLabel.H
rename to src/OpenFOAM/primitives/ints/uLabel/uLabel.H
index cba8fa56ae..2851ee75dd 100644
--- a/src/OpenFOAM/primitives/uLabel/uLabel.H
+++ b/src/OpenFOAM/primitives/ints/uLabel/uLabel.H
@@ -26,7 +26,10 @@ Typedef
     Foam::uLabel
 
 Description
-    A uLabel is an unsigned label. See label.H.
+    A uLabel is an unsigned label.
+
+SeeAlso
+    label.H
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,24 +43,27 @@ Description
 
 
 #if FOAM_LABEL64
-#    define WANTEDURANGE 18000000000000000000
+#    define FOAM_ULABEL_MAX 18000000000000000000
 #else
-#    define WANTEDURANGE 4000000000
+#    define FOAM_ULABEL_MAX 4000000000
 #endif
 
 
-#if UINT_MAX > WANTEDURANGE
+#if UINT_MAX > FOAM_ULABEL_MAX
 
 // Define uLabel as an unsigned int
 
-#include "uint.H"
+# undef  FOAM_ULABEL_MAX
+# define FOAM_ULABEL_MAX UINT_MAX
+
+# include "uint.H"
 
 namespace Foam
 {
     typedef unsigned int uLabel;
 
-    static const uLabel uLabelMax = UINT_MAX;
     static const uLabel uLabelMin = 0;
+    static const uLabel uLabelMax = UINT_MAX;
 
     inline uLabel readULabel(Istream& is)
     {
@@ -67,19 +73,22 @@ namespace Foam
 } // End namespace Foam
 
 
-#elif ULONG_MAX > WANTEDURANGE
+#elif ULONG_MAX > FOAM_ULABEL_MAX
 
 // Define uLabel as an unsigned long
 
-#include "uint.H"
-#include "ulong.H"
+# undef  FOAM_ULABEL_MAX
+# define FOAM_ULABEL_MAX ULONG_MAX
+
+# include "uint.H"
+# include "ulong.H"
 
 namespace Foam
 {
     typedef unsigned long uLabel;
 
-    static const uLabel uLabelMax = ULONG_MAX;
     static const uLabel uLabelMin = 0;
+    static const uLabel uLabelMax = ULONG_MAX;
 
     inline uLabel readULabel(Istream& is)
     {
@@ -89,11 +98,13 @@ namespace Foam
 } // End namespace Foam
 
 
-#elif ULLONG_MAX > WANTEDURANGE
+#elif ULLONG_MAX > FOAM_ULABEL_MAX
 
 // Define uLabel as an unsigned long long
 
-#error "Not implemented yet"
+# undef  FOAM_ULABEL_MAX
+
+# error "Not implemented yet"
 
 #endif
 
@@ -106,7 +117,7 @@ namespace Foam
 namespace Foam
 {
 
-// template specialisation for pTraits<label>
+//- template specialization for pTraits<uLabel>
 template<>
 class pTraits<uLabel>
 {
diff --git a/src/OpenFOAM/primitives/uint/uint.H b/src/OpenFOAM/primitives/ints/uint/uint.H
similarity index 98%
rename from src/OpenFOAM/primitives/uint/uint.H
rename to src/OpenFOAM/primitives/ints/uint/uint.H
index 5233c56e53..e411e1be3b 100644
--- a/src/OpenFOAM/primitives/uint/uint.H
+++ b/src/OpenFOAM/primitives/ints/uint/uint.H
@@ -26,7 +26,7 @@ Primitive
     uint
 
 Description
-    System uinteger
+    System unsigned integer
 
 SourceFiles
     uintIO.C
diff --git a/src/OpenFOAM/primitives/uint/uintIO.C b/src/OpenFOAM/primitives/ints/uint/uintIO.C
similarity index 100%
rename from src/OpenFOAM/primitives/uint/uintIO.C
rename to src/OpenFOAM/primitives/ints/uint/uintIO.C
diff --git a/src/OpenFOAM/primitives/ulong/ulong.H b/src/OpenFOAM/primitives/ints/ulong/ulong.H
similarity index 96%
rename from src/OpenFOAM/primitives/ulong/ulong.H
rename to src/OpenFOAM/primitives/ints/ulong/ulong.H
index 5cc09b9420..1fbe741837 100644
--- a/src/OpenFOAM/primitives/ulong/ulong.H
+++ b/src/OpenFOAM/primitives/ints/ulong/ulong.H
@@ -26,7 +26,7 @@ Primitive
     ulong
 
 Description
-    System ulong
+    System unsigned long
 
 SourceFiles
     ulongIO.C
@@ -48,7 +48,7 @@ class Ostream;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Return a string representation of an ulong
+//- Return a string representation of a ulong
 word name(const unsigned long);
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/ulong/ulongIO.C b/src/OpenFOAM/primitives/ints/ulong/ulongIO.C
similarity index 87%
rename from src/OpenFOAM/primitives/ulong/ulongIO.C
rename to src/OpenFOAM/primitives/ints/ulong/ulongIO.C
index e8045f45fc..58d6900e11 100644
--- a/src/OpenFOAM/primitives/ulong/ulongIO.C
+++ b/src/OpenFOAM/primitives/ints/ulong/ulongIO.C
@@ -23,10 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    Reads an ulong from an input stream, for a given version
-    number and File format. If an ascii File is being read,
-    then the line numbers are counted and an erroneous read
-    ised.
+    Reads a ulong from an input stream.
 
 \*---------------------------------------------------------------------------*/
 
@@ -48,7 +45,7 @@ Foam::word Foam::name(const unsigned long val)
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-Foam::Istream& Foam::operator>>(Istream& is, unsigned long& i)
+Foam::Istream& Foam::operator>>(Istream& is, unsigned long& val)
 {
     token t(is);
 
@@ -60,7 +57,7 @@ Foam::Istream& Foam::operator>>(Istream& is, unsigned long& i)
 
     if (t.isLabel())
     {
-        i = static_cast<unsigned long>(t.labelToken());
+        val = static_cast<unsigned long>(t.labelToken());
     }
     else
     {
@@ -88,9 +85,9 @@ unsigned long Foam::readUlong(Istream& is)
 }
 
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const unsigned long i)
+Foam::Ostream& Foam::operator<<(Ostream& os, const unsigned long val)
 {
-    os.write(label(i));
+    os.write(label(val));
     os.check("Ostream& operator<<(Ostream&, const unsigned long)");
     return os;
 }
diff --git a/src/OpenFOAM/primitives/random/random.c b/src/OpenFOAM/primitives/random/random.c
index 71273fc485..5421390cf0 100644
--- a/src/OpenFOAM/primitives/random/random.c
+++ b/src/OpenFOAM/primitives/random/random.c
@@ -248,7 +248,7 @@ initstate(seed, arg_state, n)
 	if (n < BREAK_0) {
 		(void)fprintf(stderr,
 		    "random: not enough state (%d bytes); ignored.\n", n);
-		return(0);
+		return 0;
 	}
 	if (n < BREAK_1) {
 		rand_type = TYPE_0;
diff --git a/src/OpenFOAM/primitives/strings/string/string.H b/src/OpenFOAM/primitives/strings/string/string.H
index 714c72a335..247b031d6c 100644
--- a/src/OpenFOAM/primitives/strings/string/string.H
+++ b/src/OpenFOAM/primitives/strings/string/string.H
@@ -47,6 +47,7 @@ SourceFiles
 #define string_H
 
 #include "char.H"
+#include "Hasher.H"
 
 #include <string>
 #include <cstring>
@@ -85,13 +86,14 @@ public:
         static const string null;
 
 
-    //- Hashing function class
+    //- Hashing function class, shared by all the derived classes
     class hash
     {
     public:
-        inline hash();
-        inline size_type operator()(const string&) const;
-        inline size_type operator()(const string&, const size_type) const;
+        hash()
+        {}
+
+        inline unsigned operator()(const string&, unsigned seed = 0) const;
     };
 
 
diff --git a/src/OpenFOAM/primitives/strings/string/stringI.H b/src/OpenFOAM/primitives/strings/string/stringI.H
index 38f8c80aa0..c609351b9c 100644
--- a/src/OpenFOAM/primitives/strings/string/stringI.H
+++ b/src/OpenFOAM/primitives/strings/string/stringI.H
@@ -133,7 +133,7 @@ inline bool Foam::string::meta(const string& str, const char quote)
 
 
 template<class String>
-inline Foam::string 
+inline Foam::string
 Foam::string::quotemeta(const string& str, const char quote)
 {
     if (!quote)
@@ -196,34 +196,13 @@ inline Foam::string Foam::string::operator()(const size_type n) const
 }
 
 
-inline Foam::string::hash::hash()
-{}
-
-
-inline Foam::string::size_type Foam::string::hash::operator()
-(
-    const string& key
-) const
-{
-    register size_type hashVal = 0;
-
-    for (string::const_iterator iter=key.begin(); iter!=key.end(); ++iter)
-    {
-        hashVal = hashVal<<1 ^ *iter;
-    }
-
-    return hashVal;
-}
-
-
-inline Foam::string::size_type Foam::string::hash::operator()
+inline unsigned Foam::string::hash::operator()
 (
     const string& key,
-    const size_type tableSize
+    unsigned seed
 ) const
 {
-    return ::abs(operator()(key)) % tableSize;
+    return Hasher(key.data(), key.size(), seed);
 }
 
-
 // ************************************************************************* //
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 87bf249ad4..5273914def 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -864,7 +864,7 @@ void Foam::fvMeshDistribute::findCouples
 {
     // Store domain neighbour as map so we can easily look for pair
     // with same face+proc.
-    HashTable<label, labelPair, labelPairHash> map(domainFace.size());
+    HashTable<label, labelPair, labelPair::Hash<> > map(domainFace.size());
 
     forAll(domainFace, bFaceI)
     {
@@ -884,8 +884,8 @@ void Foam::fvMeshDistribute::findCouples
         {
             labelPair myData(sourceFace[bFaceI], sourceProc[bFaceI]);
 
-            HashTable<label, labelPair, labelPairHash>::const_iterator iter =
-                map.find(myData);
+            HashTable<label, labelPair, labelPair::Hash<> >::const_iterator
+                iter = map.find(myData);
 
             if (iter != map.end())
             {
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index 40db9f8b17..c35bd4584c 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -106,24 +106,6 @@ class fvMeshDistribute
             }
         };
 
-        // Hash labelPair. Note non-commutative since p[0] is face, p[1] is
-        // processor.
-        class labelPairHash
-        {
-        public:
-
-            labelPairHash()
-            {}
-
-            label operator()(const labelPair& p, const uLabel tableSize) const
-            {
-                uLabel p0 = static_cast<uLabel>(p[0]);
-                uLabel p1 = static_cast<uLabel>(p[1]);
-                uLabel key = p0*p0+p0+p1;
-                return key % tableSize;
-            }
-        };
-
 
     // Private Member Functions
 
@@ -287,7 +269,7 @@ class fvMeshDistribute
             void addProcPatches
             (
                 const labelList&, // processor that neighbour is on
-                labelList& procPatchID              
+                labelList& procPatchID
             );
 
             //- Get boundary faces to be repatched. Is -1 or new patchID
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
index 8b00bb93d6..f7dd0161cb 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
@@ -51,13 +51,13 @@ namespace Foam
     defineTypeNameAndDebug(hexRef8, 0);
 
     //- Reduction class. If x and y are not equal assign value.
-    template< int value >
+    template<int value>
     class ifEqEqOp
     {
         public:
-        void operator()( label& x, const label& y ) const
+        void operator()(label& x, const label& y) const
         {
-            x = (x==y) ? x:value;
+            x = (x==y) ? x : value;
         }
     };
 }
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index ab9709e993..8b689d0d66 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,11 +29,265 @@ License
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "fvMatrices.H"
-#include "PackedList.H"
 #include "syncTools.H"
-
 #include "faceSet.H"
 
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::MRFZone::setMRFFaces
+(
+    labelList& faceType,
+    const labelList& excludedPatchIDs
+)
+{
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // Knock out coupled patches
+    forAll(patches, patchi)
+    {
+        if (patches[patchi].coupled())
+        {
+            const polyPatch& pp = patches[patchi];
+
+            forAll(pp, j)
+            {
+                label faceI = pp.start()+j;
+
+                if (faceType[faceI] == 1)
+                {
+                    faceType[faceI] = 2;
+                }
+            }
+        }
+    }
+
+    // All explicitly provided exclusions
+    forAll(excludedPatchIDs, i)
+    {
+        const polyPatch& pp = patches[excludedPatchIDs[i]];
+
+        forAll(pp, j)
+        {
+            label faceI = pp.start()+j;
+
+            if (faceType[faceI] == 1)
+            {
+                faceType[faceI] = 2;
+            }
+        }
+    }
+
+    // Collect into lists per patch.
+    internalFaces_.setSize(mesh_.nFaces());
+    label nInternal = 0;
+
+    for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+    {
+        if (faceType[faceI] == 1)
+        {
+            internalFaces_[nInternal++] = faceI;
+        }
+    }
+    internalFaces_.setSize(nInternal);
+
+    labelList nIncludedFaces(patches.size(), 0);
+    labelList nExcludedFaces(patches.size(), 0);
+
+    forAll(patches, patchi)
+    {
+        const polyPatch& pp = patches[patchi];
+
+        forAll(pp, patchFacei)
+        {
+            label faceI = pp.start()+patchFacei;
+
+            if (faceType[faceI] == 1)
+            {
+                nIncludedFaces[patchi]++;
+            }
+            else if (faceType[faceI] == 2)
+            {
+                nExcludedFaces[patchi]++;
+            }
+        }
+    }
+
+    includedFaces_.setSize(patches.size());
+    excludedFaces_.setSize(patches.size());
+    forAll(nIncludedFaces, patchi)
+    {
+        includedFaces_[patchi].setSize(nIncludedFaces[patchi]);
+        excludedFaces_[patchi].setSize(nExcludedFaces[patchi]);
+    }
+    nIncludedFaces = 0;
+    nExcludedFaces = 0;
+
+    forAll(patches, patchi)
+    {
+        const polyPatch& pp = patches[patchi];
+
+        forAll(pp, patchFacei)
+        {
+            label faceI = pp.start()+patchFacei;
+
+            if (faceType[faceI] == 1)
+            {
+                includedFaces_[patchi][nIncludedFaces[patchi]++] = patchFacei;
+            }
+            else if (faceType[faceI] == 2)
+            {
+                excludedFaces_[patchi][nExcludedFaces[patchi]++] = patchFacei;
+            }
+        }
+    }
+
+    //if (debug)
+    //{
+    //    faceSet internalFaces(mesh_, "internalFaces", internalFaces_);
+    //    Pout<< "Writing internal faces in MRF zone to faceSet "
+    //        << internalFaces.name() << endl;
+    //    internalFaces.write();
+    //}
+    //{
+    //    faceSet MRFFaces(mesh_, "includedFaces", 100);
+    //    forAll(includedFaces_, patchi)
+    //    {
+    //        forAll(includedFaces_[patchi], i)
+    //        {
+    //            label patchFacei = includedFaces_[patchi][i];
+    //            MRFFaces.insert(patches[patchi].start()+patchFacei);
+    //        }
+    //    }
+    //    Pout<< "Writing patch faces in MRF zone to faceSet "
+    //        << MRFFaces.name() << endl;
+    //    MRFFaces.write();
+    //}
+    //{
+    //    faceSet excludedFaces(mesh_, "excludedFaces", 100);
+    //    forAll(excludedFaces_, patchi)
+    //    {
+    //        forAll(excludedFaces_[patchi], i)
+    //        {
+    //            label patchFacei = excludedFaces_[patchi][i];
+    //            excludedFaces.insert(patches[patchi].start()+patchFacei);
+    //        }
+    //    }
+    //    Pout<< "Writing faces in MRF zone with special handling to faceSet "
+    //        << excludedFaces.name() << endl;
+    //    excludedFaces.write();
+    //}
+}
+
+
+void Foam::MRFZone::setMRFFaces()
+{
+    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
+
+    // Type per face:
+    //  0:not in zone
+    //  1:moving with frame
+    //  2:other
+    labelList faceType(mesh_.nFaces(), 0);
+
+    bool faceZoneFound = (faceZoneID_ != -1);
+    reduce(faceZoneFound, orOp<bool>());
+
+    if (faceZoneFound)
+    {
+        // Explicitly provided faces.
+        if (faceZoneID_ != -1)
+        {
+            const labelList& zoneFaces = mesh_.faceZones()[faceZoneID_];
+
+            forAll(zoneFaces, i)
+            {
+                faceType[zoneFaces[i]] = 1;
+            }
+
+            if (allPatchesMove_)
+            {
+                // Explicitly provided patches that do not move
+                setMRFFaces(faceType, patchLabels_);
+            }
+            else
+            {
+                setMRFFaces(faceType, labelList(0));
+            }
+        }
+    }
+    else
+    {
+        // Determine faces in cell zone
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // (without constructing cells)
+
+        const labelList& own = mesh_.faceOwner();
+        const labelList& nei = mesh_.faceNeighbour();
+
+        // Cells in zone
+        boolList zoneCell(mesh_.nCells(), false);
+
+        if (cellZoneID_ != -1)
+        {
+            const labelList& cellLabels = mesh_.cellZones()[cellZoneID_];
+            forAll(cellLabels, i)
+            {
+                zoneCell[cellLabels[i]] = true;
+            }
+        }
+
+
+        label nZoneFaces = 0;
+
+        for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
+        {
+            if (zoneCell[own[faceI]] || zoneCell[nei[faceI]])
+            {
+                faceType[faceI] = 1;
+                nZoneFaces++;
+            }
+        }
+        forAll(patches, patchI)
+        {
+            const polyPatch& pp = patches[patchI];
+
+            if (!isA<emptyPolyPatch>(pp))
+            {
+                forAll(pp, i)
+                {
+                    label faceI = pp.start()+i;
+
+                    if (zoneCell[own[faceI]])
+                    {
+                        faceType[faceI] = 1;
+                        nZoneFaces++;
+                    }
+                }
+            }
+        }
+        syncTools::syncFaceList(mesh_, faceType, maxEqOp<label>(), false);
+
+
+        Info<< nl
+            << "MRFZone " << name_ << " : did not find a faceZone; using "
+            << returnReduce(nZoneFaces, sumOp<label>())
+            << " faces from the cellZone instead." << endl;
+
+
+        if (allPatchesMove_)
+        {
+            // Explicitly provided excluded patches
+            setMRFFaces(faceType, patchLabels_);
+        }
+        else
+        {
+            setMRFFaces(faceType, labelList(0));
+        }
+    }    
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::MRFZone::MRFZone(const fvMesh& mesh, Istream& is)
@@ -43,8 +297,13 @@ Foam::MRFZone::MRFZone(const fvMesh& mesh, Istream& is)
     dict_(is),
     cellZoneID_(mesh_.cellZones().findZoneID(name_)),
     faceZoneID_(mesh_.faceZones().findZoneID(name_)),
-    outsideFaces_(0),
-    patchNames_(dict_.lookup("patches")),
+    allPatchesMove_(dict_.found("nonRotatingPatches")),
+    patchNames_
+    (
+        allPatchesMove_
+      ? dict_.lookup("nonRotatingPatches")
+      : dict_.lookup("patches")
+    ),
     origin_(dict_.lookup("origin")),
     axis_(dict_.lookup("axis")),
     omega_(dict_.lookup("omega")),
@@ -55,83 +314,6 @@ Foam::MRFZone::MRFZone(const fvMesh& mesh, Istream& is)
     axis_ = axis_/mag(axis_);
     Omega_ = omega_*axis_;
 
-    bool cellZoneFound = (cellZoneID_ != -1);
-    reduce(cellZoneFound, orOp<bool>());
-
-    if (!cellZoneFound)
-    {
-        FatalErrorIn
-        (
-            "Foam::MRFZone::MRFZone(const fvMesh& , const dictionary&)"
-        )   << "cannot find MRF cellZone " << name_
-            << exit(FatalError);
-    }
-
-    bool faceZoneFound = (faceZoneID_ != -1);
-    reduce(faceZoneFound, orOp<bool>());
-
-    if (!faceZoneFound)
-    {
-        // Determine faces in cell zone
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        // (does not construct cells)
-
-        const labelList& own = mesh_.faceOwner();
-        const labelList& nei = mesh_.faceNeighbour();
-
-        // Cells in zone
-        PackedBoolList zoneCell(mesh_.nCells());
-
-        if (cellZoneID_ != -1)
-        {
-            const labelList& cellLabels = mesh_.cellZones()[cellZoneID_];
-            forAll(cellLabels, i)
-            {
-                zoneCell[cellLabels[i]] = 1u;
-            }
-        }
-
-
-        // Faces in zone
-        PackedBoolList zoneFacesSet(mesh_.nFaces());
-
-        for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
-        {
-            if
-            (
-                zoneCell.get(own[faceI]) == 1u
-             || zoneCell.get(nei[faceI]) == 1u
-            )
-            {
-                zoneFacesSet[faceI] = 1u;
-            }
-        }
-        syncTools::syncFaceList(mesh_, zoneFacesSet, orEqOp<unsigned int>());
-
-
-        // Transfer to labelList
-        label n = zoneFacesSet.count();
-        outsideFaces_.setSize(n);
-        n = 0;
-        forAll(zoneFacesSet, faceI)
-        {
-            if (zoneFacesSet.get(faceI) == 1u)
-            {
-                outsideFaces_[n++] = faceI;
-            }
-        }
-
-        Info<< nl
-            << "MRFZone " << name_ << " : did not find a faceZone; using "
-            << returnReduce(outsideFaces_.size(), sumOp<label>())
-            << " faces internal to cellZone instead." << endl;
-
-
-        // Flag use of outsideFaces
-        faceZoneID_ = -2;
-    }
-
-
     patchLabels_.setSize(patchNames_.size());
 
     forAll(patchNames_, i)
@@ -142,11 +324,26 @@ Foam::MRFZone::MRFZone(const fvMesh& mesh, Istream& is)
         {
             FatalErrorIn
             (
-                "Foam::MRFZone::MRFZone(const fvMesh& , const dictionary&)"
+                "Foam::MRFZone::MRFZone(const fvMesh&, Istream&)"
             )   << "cannot find MRF patch " << patchNames_[i]
                 << exit(FatalError);
         }
     }
+
+
+    bool cellZoneFound = (cellZoneID_ != -1);
+    reduce(cellZoneFound, orOp<bool>());
+
+    if (!cellZoneFound)
+    {
+        FatalErrorIn
+        (
+            "Foam::MRFZone::MRFZone(const fvMesh&, Istream&)"
+        )   << "cannot find MRF cellZone " << name_
+            << exit(FatalError);
+    }
+
+    setMRFFaces();
 }
 
 
@@ -174,48 +371,42 @@ void Foam::MRFZone::addCoriolis(fvVectorMatrix& UEqn) const
 
 void Foam::MRFZone::relativeFlux(surfaceScalarField& phi) const
 {
-    if (faceZoneID_ == -1)
-    {
-        return;
-    }
-
     const surfaceVectorField& Cf = mesh_.Cf();
     const surfaceVectorField& Sf = mesh_.Sf();
 
     const vector& origin = origin_.value();
     const vector& Omega = Omega_.value();
 
-    // Use either zone faces or outsideFaces_
-    const labelList& faces =
-    (
-        faceZoneID_ == -2
-      ? outsideFaces_
-      : mesh_.faceZones()[faceZoneID_]
-    );
-
-    forAll(faces, i)
+    // Internal faces
+    forAll(internalFaces_, i)
     {
-        label facei = faces[i];
+        label facei = internalFaces_[i];
+        phi[facei] -= (Omega ^ (Cf[facei] - origin)) & Sf[facei];
+    }
 
-        if (facei < mesh_.nInternalFaces())
+    // Included patches
+    forAll(includedFaces_, patchi)
+    {
+        forAll(includedFaces_[patchi], i)
         {
-            phi[facei] -= (Omega ^ (Cf[facei] - origin)) & Sf[facei];
+            label patchFacei = includedFaces_[patchi][i];
+
+            phi.boundaryField()[patchi][patchFacei] = 0.0;
         }
-        else
+    }
+
+    // Excluded patches
+    forAll(excludedFaces_, patchi)
+    {
+        forAll(excludedFaces_[patchi], i)
         {
-            label patchi = mesh_.boundaryMesh().whichPatch(facei);
-            label patchFacei = mesh_.boundaryMesh()[patchi].whichFace(facei);
+            label patchFacei = excludedFaces_[patchi][i];
 
             phi.boundaryField()[patchi][patchFacei] -=
                 (Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin))
               & Sf.boundaryField()[patchi][patchFacei];
         }
     }
-
-    forAll(patchLabels_, i)
-    {
-        phi.boundaryField()[patchLabels_[i]] = 0.0;
-    }
 }
 
 
@@ -224,10 +415,21 @@ void Foam::MRFZone::correctBoundaryVelocity(volVectorField& U) const
     const vector& origin = origin_.value();
     const vector& Omega = Omega_.value();
 
-    forAll(patchLabels_, i)
+    // Included patches
+    forAll(includedFaces_, patchi)
     {
-        U.boundaryField()[patchLabels_[i]] ==
-            (Omega ^ (mesh_.Cf().boundaryField()[patchLabels_[i]] - origin));
+        const vectorField& patchC = mesh_.Cf().boundaryField()[patchi];
+
+        vectorField pfld(U.boundaryField()[patchi]);
+
+        forAll(includedFaces_[patchi], i)
+        {
+            label patchFacei = includedFaces_[patchi][i];
+
+            pfld[patchFacei] = (Omega ^ (patchC[patchFacei] - origin));
+        }
+
+        U.boundaryField()[patchi] == pfld;
     }
 }
 
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
index 7c489ed25b..5926e87f10 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -75,16 +75,24 @@ class MRFZone
         label cellZoneID_;
 
         //- label of face zone with faces on outside of cell zone.
-        //  If -2 determines outside faces itself
         label faceZoneID_;
 
-        //- outside faces (only if faceZoneID = -2)
-        labelList outsideFaces_;
-
+        //- Do patches move with frame (true) or are explicitly provided (false,
+        //  old behaviour)
+        Switch allPatchesMove_;
 
         const wordList patchNames_;
         labelList patchLabels_;
 
+        //- Internal faces that are part of MRF
+        labelList internalFaces_;
+
+        //- Outside faces (per patch) that move with the MRF
+        labelListList includedFaces_;
+
+        //- Excluded faces (per patch) that do not move with the MRF
+        labelListList excludedFaces_;
+
         const dimensionedVector origin_;
         dimensionedVector axis_;
         const dimensionedScalar omega_;
@@ -93,6 +101,17 @@ class MRFZone
 
     // Private Member Functions
 
+        //- Divide faces in frame according to patch
+        void setMRFFaces
+        (
+            labelList& faceType,
+            const labelList& excludedPatchIDs
+        );
+
+        //- Divide faces in frame according to patch
+        void setMRFFaces();
+
+
         //- Disallow default bitwise copy construct
         MRFZone(const MRFZone&);
 
@@ -136,6 +155,13 @@ public:
 
     // Member Functions
 
+        //- Update the mesh corresponding to given map
+        void updateMesh(const mapPolyMesh& mpm)
+        {
+            // Only updates face addressing
+            setMRFFaces();
+        }
+
         //- Add the Coriolis force contribution to the momentum equation
         void addCoriolis(fvVectorMatrix& UEqn) const;
 
diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H
index d39c55d4bf..9f09a9efea 100644
--- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H
+++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.H
@@ -49,9 +49,9 @@ namespace Foam
 //  but which is not on a cyclic, symmetry or processor patch.
 void setRefCell
 (
-    const volScalarField& field,
-    const dictionary& dict,
-    label& refCelli,
+    const volScalarField&,
+    const dictionary&,
+    label& refCellI,
     scalar& refValue,
     bool forceReference = false
 );
diff --git a/src/finiteVolume/fvMesh/fvMeshGeometry.C b/src/finiteVolume/fvMesh/fvMeshGeometry.C
index 638d244530..7844ebade1 100644
--- a/src/finiteVolume/fvMesh/fvMeshGeometry.C
+++ b/src/finiteVolume/fvMesh/fvMeshGeometry.C
@@ -31,6 +31,7 @@ License
 #include "slicedVolFields.H"
 #include "slicedSurfaceFields.H"
 #include "SubField.H"
+#include "cyclicFvPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -146,6 +147,27 @@ void fvMesh::makeC() const
         cellCentres(),
         faceCentres()
     );
+
+
+    // Need to correct for cyclics transformation since absolute quantity.
+    // Ok on processor patches since hold opposite cell centre (no
+    // transformation)
+    slicedVolVectorField& C = *CPtr_;
+
+    forAll(C.boundaryField(), patchi)
+    {
+        if (isA<cyclicFvPatchVectorField>(C.boundaryField()[patchi]))
+        {
+            // Note: cyclic is not slice but proper field
+            C.boundaryField()[patchi] == static_cast<const vectorField&>
+            (
+                static_cast<const List<vector>&>
+                (
+                    boundary_[patchi].patchSlice(faceCentres())
+                )
+            );
+        }
+    }
 }
 
 
diff --git a/src/meshTools/indexedOctree/labelBits.H b/src/meshTools/indexedOctree/labelBits.H
index 60756a4fc3..28847b6baa 100644
--- a/src/meshTools/indexedOctree/labelBits.H
+++ b/src/meshTools/indexedOctree/labelBits.H
@@ -26,7 +26,7 @@ Class
     Foam::labelBits
 
 Description
-    A 29bits label and 3bits packed into single label
+    A 29bits label and 3bits direction packed into single label
 
 SourceFiles
 
@@ -36,6 +36,7 @@ SourceFiles
 #define labelBits_H
 
 #include "label.H"
+#include "uLabel.H"
 #include "direction.H"
 #include "error.H"
 
@@ -134,7 +135,7 @@ public:
         {
             return is >> lb.data_;
         }
-        
+
         friend inline Ostream& operator<<(Ostream& os, const labelBits& lb)
         {
             return os << lb.data_;
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
index e45d47eb26..f9f34b9c05 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict
+++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict
@@ -45,7 +45,7 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     fieldAverage1
     {
         // Type of functionObject
@@ -54,23 +54,24 @@ functions
         // Where to load it from (if not already in solver)
         functionObjectLibs ("libfieldAverage.so");
 
-        // Fields to be  averaged - runTime modifiable
+        // Fields to be averaged - runTime modifiable
         fields
         (
             U
             {
-                mean            on;
-                prime2Mean      on;
-                base            time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
+
             p
             {
-                mean            on;
-                prime2Mean      on;
-                base            time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 // ************************************************************************* //
diff --git a/src/triSurface/tools/labelPair/labelPairLookup.H b/src/triSurface/tools/labelPair/labelPairLookup.H
index 566c2c1870..dc9d56834d 100644
--- a/src/triSurface/tools/labelPair/labelPairLookup.H
+++ b/src/triSurface/tools/labelPair/labelPairLookup.H
@@ -26,26 +26,31 @@ Typedef
     Foam::labelPairLookup
 
 Description
-    Hash for two labels to other label. Used for e.g. for face1, face2 to
-    shared edge.
+    A HashTable for two labels to another label.
+    Used for e.g. for face1, face2 to shared edge.
 
-    Note: do NOT use edge! Our two faces are non commutative, first face is
-    from surface1, second face is from surface2.
+Note
+    The hash table is based on a FixedList and not edge, since an edge
+    hashes commutatively!
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef labelPairLookup_H
 #define labelPairLookup_H
 
+#include "FixedList.H"
 #include "HashTable.H"
-#include "edge.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef HashTable<label, FixedList<label, 2>, FixedList<label, 2>::Hash<> >
-        labelPairLookup;
+    typedef HashTable
+    <
+       label,
+       FixedList<label, 2>,
+       FixedList<label, 2>::Hash<>
+    > labelPairLookup;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/LES/Allwmake b/src/turbulenceModels/LES/Allwmake
index d83439a913..a80c71ab57 100755
--- a/src/turbulenceModels/LES/Allwmake
+++ b/src/turbulenceModels/LES/Allwmake
@@ -2,7 +2,7 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmakeLnInclude -f ../incompressible/LES -sf
+wmakeLnInclude -f ../incompressible/LES
 
 wmake libso LESfilters
 wmake libso LESdeltas
diff --git a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
index 0028a30b5b..1082636303 100644
--- a/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
+++ b/tutorials/Lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
index 2b862843f0..5c3b671271 100644
--- a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
+++ b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
     Info<< "end" << endl;
 
-    return(0);
+    return 0;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
index 0d13ac7ba5..bc4e09f514 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
@@ -48,31 +48,31 @@ adjustTimeStep  yes;
 maxCo           0.5;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled true;
-        outputControl outputTime;
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
index 693d3e125f..c507917d6c 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
@@ -48,31 +48,31 @@ adjustTimeStep  yes;
 maxCo           0.5;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled true;
-        outputControl outputTime;
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
index c211c964ae..3fccde63c4 100644
--- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/system/controlDict
@@ -44,31 +44,31 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled true;
-        outputControl outputTime;
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
index 2fe2edf6fa..ce2e9218c9 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict
@@ -43,7 +43,26 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
-functions       ( forces { type forceCoeffs ; functionObjectLibs ( "libforces.so" ) ; patches ( WALL10 ) ; pName p ; UName U ; log true ; rhoInf 1 ; CofR ( 0 0 0 ) ; liftDir ( -0.239733 0.970839 0 ) ; dragDir ( 0.970839 0.239733 0 ) ; pitchAxis ( 0 0 1 ) ; magUInf 618.022 ; lRef 1 ; Aref 1 ; } );
+functions
+{
+    forces
+    {
+        type        forceCoeffs;
+        functionObjectLibs ( "libforces.so" );
+        patches     ( WALL10 );
+        pName       p;
+        UName       U;
+        log         true;
+        rhoInf      1;
+        CofR        ( 0 0 0 );
+        liftDir     ( -0.239733 0.970839 0 );
+        dragDir     ( 0.970839 0.239733 0 );
+        pitchAxis   ( 0 0 1 );
+        magUInf     618.022;
+        lRef        1;
+        Aref        1;
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
index 7a039df40d..aca68d4e1f 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
@@ -88,7 +88,7 @@ forAll(Tpatches, patchI)
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 }
diff --git a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
index b3d7312a06..2029bc066a 100644
--- a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
+++ b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
@@ -52,9 +52,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
@@ -123,7 +122,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
index 7c8989f567..e7b7f0aa63 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
@@ -19,7 +19,9 @@ FoamFile
 (
     rotor
     {
-        patches   (rotor);
+        // Fixed patches (by default they 'move' with the MRF zone)
+        nonRotatingPatches ();
+
         origin    origin [0 1 0 0 0 0 0]  (0 0 0);
         axis      axis   [0 0 0 0 0 0 0]  (0 0 1);
         omega     omega  [0 0 -1 0 0 0 0] 104.72;
diff --git a/tutorials/incompressible/channelFoam/channel395/system/controlDict b/tutorials/incompressible/channelFoam/channel395/system/controlDict
index 218a76d861..43a6a70428 100644
--- a/tutorials/incompressible/channelFoam/channel395/system/controlDict
+++ b/tutorials/incompressible/channelFoam/channel395/system/controlDict
@@ -44,34 +44,30 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
-
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-
-        enabled true;
-
-        outputControl outputTime;
-
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
+
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
-
+}
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
index e312fcb839..a5ba827eec 100644
--- a/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/t-junction/system/controlDict
@@ -47,7 +47,23 @@ adjustTimeStep  yes;
 
 maxCo           5;
 
-functions       ( probes { type probes ; functionObjectLibs ( "libsampling.so" ) ; name probes ; probeLocations ( ( 1e-06 0 0.01 ) ( 0.21 -0.20999 0.01 ) ( 0.21 0.20999 0.01 ) ( 0.21 0 0.01 ) ) ; fields ( p U ) ; } );
+functions
+{
+    probes
+    {
+        type        probes;
+        name        probes;
+        functionObjectLibs ( "libsampling.so" );
+        probeLocations
+        (
+            ( 1e-06 0 0.01 )
+            ( 0.21 -0.20999 0.01 )
+            ( 0.21 0.20999 0.01 )
+            ( 0.21 0 0.01 )
+        );
+        fields ( p U );
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
index ba9c0f1c40..a4b46af8cc 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict
@@ -44,14 +44,14 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     probes1
     {
-        type probes;
+        type            probes;
         functionObjectLibs ( "libsampling.so" );
-        enabled true;
-        outputControl timeStep;
-        outputInterval 1;
+        enabled         true;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0.0254 0.0253 0 )
@@ -71,28 +71,28 @@ functions
 
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled true;
-        outputControl outputTime;
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
index 2f1e1a9074..4f36f59c28 100644
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/controlDict
@@ -44,14 +44,14 @@ timePrecision   6;
 runTimeModifiable yes;
 
 functions
-(
+{
     probes1
     {
-        type probes;
+        type            probes;
         functionObjectLibs ( "libsampling.so" );
-        enabled true;
-        outputControl timeStep;
-        outputInterval 1;
+        enabled         true;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0.0254 0.0253 0 )
@@ -70,28 +70,28 @@ functions
 
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled true;
-        outputControl outputTime;
+        enabled         true;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean on;
-                base time;
+                mean        on;
+                prime2Mean  on;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
index fecc4cb717..e0cc1cef1a 100644
--- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
+++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/simpleSRFFoam.C
@@ -53,9 +53,8 @@ int main(int argc, char *argv[])
 
     Info<< "\nStarting time loop\n" << endl;
 
-    while (runTime.run())
+    while (runTime.loop())
     {
-        runTime++;
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
 #       include "readSIMPLEControls.H"
@@ -99,7 +98,7 @@ int main(int argc, char *argv[])
 
     Info<< "End\n" << endl;
 
-    return(0);
+    return 0;
 }
 
 
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
index 073ada6caa..2ba1fabc2b 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict
@@ -48,38 +48,38 @@ maxCo           0.5;
 maxAcousticCo   50;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled false;
-        outputControl outputTime;
+        enabled         false;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             gamma
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
index 0b3c876486..c87d60631d 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict
@@ -48,38 +48,38 @@ maxCo           0.5;
 maxAcousticCo   50;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled false;
-        outputControl outputTime;
+        enabled         false;
+        outputControl   outputTime;
         fields
         (
             U
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             p
             {
-                mean on;
-                prime2Mean off;
-                base time ;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
 
             gamma
             {
-                mean on;
-                prime2Mean off;
-                base time;
+                mean        on;
+                prime2Mean  off;
+                base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
index f533a54408..e4a69588f6 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict
@@ -50,13 +50,13 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     probes
     {
-        type probes;
-        outputControl timeStep;
-        outputInterval 1;
-        name probes;
+        type            probes;
+        name            probes;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -70,11 +70,11 @@ functions
 
     wallPressure
     {
-        type surfaces;
+        type            surfaces;
         functionObjectLibs ( "libsampling.so" );
-        outputControl timeStep;
-        outputInterval 10;
-        surfaceFormat raw;
+        outputControl   timeStep;
+        outputInterval  10;
+        surfaceFormat   raw;
         fields
         (
             p
@@ -84,13 +84,13 @@ functions
         (
             walls
             {
-                type patch;
-                patchName walls;
+                type        patch;
+                patchName   walls;
                 triangulate false;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
index a4e44f2de3..9fe32ebf04 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict
@@ -50,13 +50,13 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     probes
     {
-        type probes;
-        outputControl timeStep;
-        outputInterval 10;
-        name probes;
+        type            probes;
+        name            probes;
+        outputControl   timeStep;
+        outputInterval  10;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -70,11 +70,11 @@ functions
 
     wallPressure
     {
-        type surfaces;
+        type            surfaces;
         functionObjectLibs ( "libsampling.so" );
-        outputControl timeStep;
-        outputInterval 10;
-        surfaceFormat raw;
+        outputControl   timeStep;
+        outputInterval  10;
+        surfaceFormat   raw;
         fields
         (
             p
@@ -83,13 +83,13 @@ functions
         (
             walls
             {
-                type patch;
-                patchName walls;
+                type        patch;
+                patchName   walls;
                 triangulate false;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
index 1b122632d3..5823d9fbbd 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict
@@ -50,13 +50,13 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     probes
     {
-        type probes;
-        outputControl timeStep;
-        outputInterval 1;
-        name probes;
+        type            probes;
+        name            probes;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -67,7 +67,7 @@ functions
             p
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
index 1b122632d3..5823d9fbbd 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict
@@ -50,13 +50,13 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     probes
     {
-        type probes;
-        outputControl timeStep;
-        outputInterval 1;
-        name probes;
+        type            probes;
+        name            probes;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -67,7 +67,7 @@ functions
             p
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
index 1b122632d3..5823d9fbbd 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict
@@ -50,13 +50,13 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     probes
     {
-        type probes;
-        outputControl timeStep;
-        outputInterval 1;
-        name probes;
+        type            probes;
+        name            probes;
+        outputControl   timeStep;
+        outputInterval  1;
         probeLocations
         (
             ( 0 9.95 19.77 )
@@ -67,7 +67,7 @@ functions
             p
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
index 766cb87595..8fc8f27669 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
@@ -50,41 +50,44 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
+        outputControl   outputTime;
         fields
         (
             Ua
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             Ub
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             alpha
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             p
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
index e4d35359ad..d5eaba87fe 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
@@ -50,41 +50,44 @@ maxCo           0.9;
 maxDeltaT       1e-05;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
+        outputControl   outputTime;
         fields
         (
             Ua
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             Ub
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             alpha
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             p
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index d0f78bb505..1b724308f1 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -50,41 +50,44 @@ maxCo           0.5;
 maxDeltaT       1;
 
 functions
-(
+{
     fieldAverage1
     {
-        type fieldAverage;
+        type            fieldAverage;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
-        outputControl     outputTime;
+        outputControl   outputTime;
         fields
         (
             Ua
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             Ub
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             alpha
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
+
             p
             {
-                 mean on;
-                 prime2Mean off;
-                 base time;
+                 mean        on;
+                 prime2Mean  off;
+                 base        time;
             }
         );
     }
-);
+}
 
 
 // ************************************************************************* //
diff --git a/wmake/wmakeLnInclude b/wmake/wmakeLnInclude
index 1ed1671e7a..0580893b76 100755
--- a/wmake/wmakeLnInclude
+++ b/wmake/wmakeLnInclude
@@ -47,10 +47,13 @@ usage() {
 usage: $Script [-f] <dir> [-lnOption]
 
     Link all the source files in the <dir> into <dir>/lnInclude
-    * Use '-f' to force an update when the lnInclude directory already exists.
+
+Note
+    The '-f' option forces an update when the lnInclude directory already exists
+    and also changes the default linking from 'ln -s' to 'ln -sf'.
 
 USAGE
-   exit 1
+    exit 1
 }
 
 #------------------------------------------------------------------------------
@@ -59,6 +62,9 @@ USAGE
 unset forceUpdate
 unset findOpt
 
+# default ln option
+lnOpt="-s"
+
 # simple parse options
 while [ "$#" -gt 0 ]
 do
@@ -69,9 +75,10 @@ do
     -f)
         shift
         forceUpdate=1
+        lnOpt="-sf"
         ;;
     -*)
-        usage "unknown option/argument: '$*'"
+        usage "unknown option: '$*'"
         ;;
     *)
         break
@@ -79,7 +86,18 @@ do
     esac
 done
 
-baseDir=$1
+if [ $# -eq 1 ]
+then
+    baseDir=$1
+elif [ $# -eq 2 ]
+then
+    baseDir=$1
+    lnOpt="$2"
+else
+    usage "ERROR: incorrect number of arguments"
+fi
+
+
 # convert incorrect path/dir/lnInclude to something sensible
 while [ "${baseDir##*/}" = lnInclude ]
 do
@@ -92,17 +110,6 @@ done
 incDir=$baseDir/lnInclude
 
 
-if [ $# -eq 1 ]
-then
-    lnOpt="-s"
-elif [ $# -eq 2 ]
-then
-    lnOpt="$2"
-else
-    usage "ERROR: incorrect number of arguments"
-fi
-
-
 if [ ! -d $baseDir ]
 then
     echo "$Script error: base directory $baseDir does not exist" 1>&2
@@ -136,7 +143,7 @@ echo "$Script: linking include files to $incDir"
 #
 # remove any broken links first (this helps when file locations have moved)
 #
-find -L . -type l -exec rm \{\} \;
+find -L . -type l -exec rm {} \;
 
 #
 # create links, avoid recreating links unless necessary