diff --git a/bin/buildParaView b/bin/buildParaView
index cceee96487..a5041ff596 100755
--- a/bin/buildParaView
+++ b/bin/buildParaView
@@ -87,14 +87,14 @@ For finer control, the build stages can be also selected individually
   -make
   -makedoc
   -install
-  [-envpath]    alter absolute paths in CMake files to use env variables
+  -envpath      alter absolute paths in CMake files to use env variables
 
 Build and install paraview-$ParaView_VERSION
   - run from folder above the ParaView source folder or place the ParaView
     source under \$WM_THIRD_PARTY_DIR ($WM_THIRD_PARTY_DIR)
 
 USAGE
-   exit 1
+    exit 1
 }
 
 #------------------------------------------------------------------------------
@@ -114,7 +114,7 @@ runCONFIG=true
 runMAKE=true
 runMAKEDOC=true
 runINSTALL=true
-runENVPATH=false
+runENVPATH=true
 
 
 # parse options
@@ -152,7 +152,7 @@ do
         runINSTALL=true
         shift
         ;;
-    -envpath)            # optional: change cmake files to use env variables
+    -envpath)            # stage 5: change cmake files to use env variables
         runCONFIG=false
         runMAKE=false
         runMAKEDOC=false
diff --git a/etc/bashrc b/etc/bashrc
index 218880e311..0c460577e9 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -33,8 +33,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-# export WM_PROJECT_VERSION=1.6.x
-: ${WM_PROJECT_VERSION:=dev}; export WM_PROJECT_VERSION
+export WM_PROJECT_VERSION=1.6
 
 ################################################################################
 # USER EDITABLE PART
@@ -102,9 +101,6 @@ export WM_COMPILER_LIB_ARCH=
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 : ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION
 
-# WM_JAVAC_OPTION = Opt | Debug
-: ${WM_JAVAC_OPTION:=Opt}; export WM_JAVAC_OPTION
-
 # WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
 : ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
 
diff --git a/etc/cshrc b/etc/cshrc
index 0ead9b1a65..bc5f325dd6 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -32,8 +32,7 @@
 #------------------------------------------------------------------------------
 
 setenv WM_PROJECT OpenFOAM
-# setenv WM_PROJECT_VERSION 1.6.x
-if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
+setenv WM_PROJECT_VERSION 1.6
 
 ################################################################################
 # USER EDITABLE PART
@@ -96,9 +95,6 @@ if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
 
-# WM_JAVAC_OPTION = Opt | Debug
-if ( ! $?WM_JAVAC_OPTION ) setenv WM_JAVAC_OPTION Opt
-
 # WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
 if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI
 
diff --git a/etc/settings.csh b/etc/settings.csh
index edafa90716..495c9324e9 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -118,8 +118,7 @@ unset MPI_ARCH_PATH
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    # set mpi_version=openmpi-1.3.3
-    set mpi_version=openmpi-1.3.2
+    set mpi_version=openmpi-1.3.3
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
 
diff --git a/etc/settings.sh b/etc/settings.sh
index 1203a843a0..6d640d2068 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -142,8 +142,7 @@ unset MPI_ARCH_PATH
 
 case "$WM_MPLIB" in
 OPENMPI)
-    # mpi_version=openmpi-1.3.3
-    mpi_version=openmpi-1.3.2
+    mpi_version=openmpi-1.3.3
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS