diff --git a/Allwmake b/Allwmake
index 973a013..dca63e4 100755
--- a/Allwmake
+++ b/Allwmake
@@ -56,9 +56,9 @@ echo
 echo ========================================
 echo Start ThirdParty Allwmake
 echo ========================================
+
+
 echo
-
-
 echo ========================================
 echo Build MPI libraries if required
 echo "    $MPI_ARCH_PATH"
@@ -189,7 +189,7 @@ esac
 # building scotch is still a bit of a pain
 
 # get SCOTCH_VERSION, SCOTCH_ARCH_PATH
-if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch)
 then
     . $settings
 else
@@ -198,6 +198,7 @@ else
     echo
 fi
 
+echo
 echo ========================================
 echo "Build Scotch decomposition library $SCOTCH_VERSION"
 echo "    $SCOTCH_ARCH_PATH"
@@ -211,7 +212,6 @@ if [ -f $SCOTCH_ARCH_PATH/include/scotch.h \
 then
     echo "    scotch header in $SCOTCH_ARCH_PATH/include"
     echo "    scotch libs   in $FOAM_EXT_LIBBIN"
-    echo
 elif [ -d "$SCOTCH_VERSION" ]
 then
 (
@@ -258,15 +258,15 @@ fi
 if [ "${FOAM_MPI:-dummy}" != dummy ] && \
    [ -f $SCOTCH_ARCH_PATH/include/scotch.h ] || \
 {
-    echo "    WARNING: skipping pt-scotch - 'scotch.h' include file not found!"
     echo
+    echo "    WARNING: skipping pt-scotch - 'scotch.h' include file not found!"
     false
 }
 then
+    echo
     echo ========================================
     echo "Build pt-scotch decomposition library $SCOTCH_VERSION (with $FOAM_MPI)"
     echo "    $SCOTCH_ARCH_PATH"
-    echo
 
     if [ -f $SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h \
       -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotch.so \
@@ -274,9 +274,9 @@ then
     then
         echo "    ptscotch header in $SCOTCH_ARCH_PATH/include/$FOAM_MPI"
         echo "    ptscotch libs   in $FOAM_EXT_LIBBIN/$FOAM_MPI"
-        echo
     else
     (
+        echo
         set -x
         cd $SCOTCH_VERSION/src || exit 1
 
@@ -318,7 +318,6 @@ then
     [ -f $SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h ] || {
         echo
         echo "    WARNING: required include file 'ptscotch.h' not found!"
-        echo
     }
 fi
 
@@ -326,11 +325,12 @@ fi
 #------------------------------------------------------------------------------
 
 # Metis is optional
+echo
 echo ========================================
 echo Build Metis decomposition
 
 # get METIS_VERSION, METIS_ARCH_PATH
-if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis`
+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis)
 then
     . $settings
 fi
@@ -395,13 +395,26 @@ warnNotFound()
 
 
 # CGAL is optional
+echo
 echo ========================================
 echo Build CGAL
 if [ -d "$CGAL_ARCH_PATH/include" \
   -a -r "$CGAL_ARCH_PATH/lib/libCGAL.so" ]
 then
-    echo "    CGAL headers in $CGAL_ARCH_PATH/include"
-    echo "    CGAL libs    in $CGAL_ARCH_PATH/lib"
+    # first some information about boost
+    if [ -d "$BOOST_ARCH_PATH/include/boost" \
+      -a -r "$BOOST_ARCH_PATH/lib/libboost_system.so" ]
+    then
+        echo "    BOOST headers in $BOOST_ARCH_PATH/include"
+        echo "    BOOST libs    in $BOOST_ARCH_PATH/lib"
+    elif [ -d "/usr/include/boost" \
+        -a -r "/usr/lib${WM_COMPILER_LIB_ARCH}/libboost_system.so" ]
+    then
+        echo "    BOOST headers in /usr/include"
+        echo "    BOOST libs    in /usr/lib${WM_COMPILER_LIB_ARCH}"
+    fi
+    echo "    CGAL  headers in $CGAL_ARCH_PATH/include"
+    echo "    CGAL  libs    in $CGAL_ARCH_PATH/lib"
 elif [ -n "$CGAL_ARCH_PATH" ]
 then
     ./makeCGAL || warnBuildIssues CGAL
@@ -411,13 +424,14 @@ fi
 
 
 # FFTW is optional
+echo
 echo ========================================
 echo Build FFTW
 if [ -d "$FFTW_ARCH_PATH/include" \
   -a -r "$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libfftw3.so" ]
 then
-    echo "    FFTW headers in $FFTW_ARCH_PATH/include"
-    echo "    FFTW libs    in $FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
+    echo "    FFTW  headers in $FFTW_ARCH_PATH/include"
+    echo "    FFTW  libs    in $FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
 elif [ -n "$FFTW_ARCH_PATH" ]
 then
     ./makeFFTW || warnBuildIssues FFTW
diff --git a/makeCGAL b/makeCGAL
index c85f7ec..c8f6796 100755
--- a/makeCGAL
+++ b/makeCGAL
@@ -67,12 +67,12 @@ usage() {
 
 usage: $Script [OPTION] [CGAL-VERSION] [boost-VERSION] [gmp-VERSION] [mpfr-VERSION]
 options:
-  -gcc              force g++ instead of the value from \$WM_CXX
+  -gcc              force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
   -system           use system versions for boost/gmp/mpfr
   -help
 
 * build CGAL with
-      $cgalPACKAGE
+      ${cgalPACKAGE:-'unspecified CGAL version'}
       $boostPACKAGE
       $gmpPACKAGE
       $mpfrPACKAGE
diff --git a/makeCmake b/makeCmake
index 4de02ca..bdd906c 100755
--- a/makeCmake
+++ b/makeCmake
@@ -4,7 +4,7 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-#    \\/     M anipulation  |
+#    \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
@@ -29,7 +29,8 @@
 #     Build script for cmake
 #
 #------------------------------------------------------------------------------
-cmakePACKAGE=cmake-3.2.1
+# Special purpose script, no default cmake version.
+unset cmakePACKAGE
 
 #------------------------------------------------------------------------------
 # run from third-party directory only
@@ -49,18 +50,18 @@ usage() {
 
 usage: ${0##*/} [OPTION] [cmake-VERSION]
 options:
-  -gcc              force g++ instead of the value from \$WM_CXX
+  -gcc              Force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
   -help
 
 * build cmake
-      $cmakePACKAGE
+      ${cmakePACKAGE:-'unspecified version'}
 
 USAGE
     exit 1
 }
 #------------------------------------------------------------------------------
 
-# ensure CMake gets the correct /CC++ compiler
+# ensure CMake gets the correct C/CC++ compiler
 [ -n "$WM_CC" ]  && export CC="$WM_CC"
 [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
 
@@ -85,15 +86,16 @@ do
     shift
 done
 
+[ -n "$cmakePACKAGE" ] || die "The cmake-VERSION was not specified"
 
 #------------------------------------------------------------------------------
-prefixDIR=$installBASE/$cmakePACKAGE
+CMAKE_ARCH_PATH=$installBASE/$cmakePACKAGE
 
 #
 # Build CMAKE
 #
 echo "---------------"
-if [ -d "$prefixDIR" -a -r "$prefixDIR/bin/cmake" ]
+if [ -d "$CMAKE_ARCH_PATH" -a -r "$CMAKE_ARCH_PATH/bin/cmake" ]
 then
     echo "Already built: $cmakePACKAGE"
 else
@@ -109,7 +111,7 @@ else
     mkdir -p $buildDIR
     cd $buildDIR
 
-    $sourceDIR/bootstrap --prefix=$prefixDIR \
+    $sourceDIR/bootstrap --prefix=$CMAKE_ARCH_PATH \
     && time make -j $WM_NCOMPPROCS \
     && make install \
     && echo "Built: $cmakePACKAGE"
diff --git a/makeFFTW b/makeFFTW
index 3877fdd..07e46d3 100755
--- a/makeFFTW
+++ b/makeFFTW
@@ -61,7 +61,7 @@ options:
   -help
 
 * build FFTW with
-      $fftwPACKAGE
+      ${fftwPACKAGE:-'unspecified FFTW version'}
 
 USAGE
     exit 1
diff --git a/makeGcc b/makeGcc
index 5624296..742d564 100755
--- a/makeGcc
+++ b/makeGcc
@@ -81,7 +81,7 @@ options:
       $gmpPACKAGE
       $mpfrPACKAGE
       $mpcPACKAGE
-      $gccPACKAGE
+      ${gccPACKAGE:-'unspecified GCC version'}
 
 USAGE
     exit 1
diff --git a/makeLLVM b/makeLLVM
index 225f671..67a9c40 100755
--- a/makeLLVM
+++ b/makeLLVM
@@ -82,7 +82,7 @@ options:
   -help
 
 * build llvm/clang
-      $llvmPACKAGE
+      ${llvmPACKAGE:-'unspecified LLVM version'}
 
 USAGE
     exit 1
@@ -148,7 +148,7 @@ else
     set -x
     $sourceDIR/configure \
         --prefix=$LLVM_ARCH_PATH \
-        --with-gcc-toolchain=`which gcc | sed s%/bin/gcc%%` \
+        --with-gcc-toolchain=$(which gcc | sed s%/bin/gcc%%) \
         --enable-optimized \
     && make -j $WM_NCOMPPROCS \
     && make install \
diff --git a/makeParaView b/makeParaView
index 357c85f..7fd1749 100755
--- a/makeParaView
+++ b/makeParaView
@@ -100,7 +100,7 @@ options:
   -qt               with extra Qt gui support (if not already enabled)
   -qt-VER           with Qt version corresponding to
                         \$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/qt-VER/bin/qmake
-  -gcc              force g++ instead of the value from \$WM_CXX
+  -gcc              force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
   -verbose          verbose output in Makefiles
   -version VER      specify an alternative version (current value: $ParaView_VERSION)
   -major   VER      specify an alternative major version for special builds
diff --git a/makeParaView3 b/makeParaView3
index b015886..7716daf 100755
--- a/makeParaView3
+++ b/makeParaView3
@@ -93,7 +93,7 @@ options:
   -qt               with extra Qt gui support (if not already enabled)
   -qt-VER           with Qt version corresponding to
                         \$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/qt-VER/bin/qmake
-  -gcc              force g++ instead of the value from \$WM_CXX
+  -gcc              force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
   -verbose          verbose output in Makefiles
   -version VER      specify an alternative version (current value: $ParaView_VERSION)
   -major   VER      specify an alternative major version for special builds
diff --git a/makeQt b/makeQt
index 047d814..d0723fa 100755
--- a/makeQt
+++ b/makeQt
@@ -50,7 +50,7 @@ usage() {
 
 usage: ${0##*/} [OPTION] [VERSION]
 options:
-  -gcc              force g++ instead of the value from \$WM_CXX
+  -gcc              Force gcc/g++ instead of the values from \$WM_CC, \$WM_CXX
   -help
 
 * build $qtTYPE, version $qtVERSION