Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 24417)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 24418)
@@ -190,10 +190,5 @@
 	path_prepend "${MPI_DIR}/bin"
 	cpath_prepend "${MPI_DIR}/include"
-	ld_library_path_prepend "$MPI_DIR/lib"
-fi
-
-LAPACK_DIR="${ISSM_DIR}/externalpackages/lapack/install"
-if [ -d "$LAPACK_DIR" ]; then
-	ld_library_path_append "$LAPACK_DIR/lib"
+	ld_library_path_append "${MPI_DIR}/lib"
 fi
 
@@ -202,4 +197,9 @@
 	export PETSC_DIR
 	ld_library_path_append "${PETSC_DIR}/lib"
+fi
+
+#LAPACK_DIR="${ISSM_DIR}/externalpackages/lapack/install"
+if [ -d "$LAPACK_DIR" ]; then
+	ld_library_path_append "${LAPACK_DIR}/lib"
 fi
 
@@ -256,19 +256,17 @@
 
 XERCESROOT="${ISSM_DIR}/externalpackages/xerces/install"
-XERCESCROOT="${ISSM_DIR}/externalpackages/xerces/src"
 if [ -d "$XERCESROOT" ]; then
 	export XERCESROOT
-	export XERCESCROOT
-fi
-
-XAIF_DIR="${ISSM_DIR}/externalpackages/xaifbooster/xaifBooster"
-XAIFBOOSTERROOT="${ISSM_DIR}/externalpackages/xaifbooster/"
-XAIFBOOSTER_HOME="${ISSM_DIR}/externalpackages/xaifbooster/xaifBooster"
-PLATFORM="x86-Linux"
+	export XERCESCROOT="${ISSM_DIR}/externalpackages/xerces/src"
+fi
+
+
+XAIFBOOSTERROOT="${ISSM_DIR}/externalpackages/xaifbooster"
+XAIF_DIR="${XAIFBOOSTERROOT}/xaifBooster"
 if [ -d "$XAIF_DIR" ]; then
 	export XAIFBOOSTERROOT
-	export XAIFBOOSTER_HOME
 	export XAIF_DIR
-	export PLATFORM
+	export XAIFBOOSTER_HOME=$XAIF_DIR
+	export PLATFORM="x86-Linux"
 fi
 
@@ -382,5 +380,5 @@
 fi
 
-PROJ_DIR="${ISSM_DIR}/externalpackages/proj/install"
+#PROJ_DIR="${ISSM_DIR}/externalpackages/proj/install"
 if [ -d "${PROJ_DIR}" ]; then
 	dyld_library_path_prepend "${PROJ_DIR}/lib"
@@ -424,5 +422,5 @@
 
 #AUX-CONFIG
-path_append "${ISSM_DIR}/aux-config"
+#path_append "${ISSM_DIR}/aux-config"
 
 #INISHELL
Index: /issm/trunk-jpl/externalpackages/mpich/install-3.3.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich/install-3.3.sh	(revision 24417)
+++ /issm/trunk-jpl/externalpackages/mpich/install-3.3.sh	(revision 24418)
@@ -14,6 +14,6 @@
 
 # Cleanup
-rm -rf src install
-mkdir src install
+rm -rf install src
+mkdir install src
 
 # Move source into 'src' directory
@@ -28,6 +28,11 @@
 
 # Compile and install
-make
-make install
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
 
 # Return to initial directory
Index: /issm/trunk-jpl/externalpackages/petsc/install-3.11-linux.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/petsc/install-3.11-linux.sh	(revision 24417)
+++ /issm/trunk-jpl/externalpackages/petsc/install-3.11-linux.sh	(revision 24418)
@@ -34,5 +34,5 @@
 	--with-ssl=0 \
 	--with-shared-libraries=1 \
-	--download-zlib=1\
+	--download-zlib=1 \
 	--download-hdf5=1 \
 	--download-netcdf=1 \