diff --git a/Makefile b/Makefile
index 9634bc26..69f230bd 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ endif
 ifeq ($(PARALLEL),MPI)
 	OPTS += -I $(MPI_DIR)/include
 	OPTS += -I $(PARMETIS_DIR)/include
-	OPTS += -I $(PARMETIS_DIR)/metis/include
+	OPTS += -I $(METIS_DIR)/include
 endif
 
 ifeq ($(CODE),DEBUG)
@@ -139,7 +139,7 @@ endif
 
 ifeq ($(PARALLEL),MPI)
 	OBJS += $(OBJ)mpi_inters.o
-	OBJS += $(PARMETIS_BUILD_DIR)/libparmetis.a $(PARMETIS_BUILD_DIR)/libmetis.a
+	OBJS += $(PARMETIS_BUILD_DIR)/libparmetis.a $(METIS_BUILD_DIR)/libmetis.a
 endif
 	
 ifeq ($(TECIO),YES)
@@ -259,3 +259,11 @@ endif
 
 clean: 
 	rm $(BIN)HiFiLES $(OBJ)*.o
+
+install: default
+	mkdir -p ${PREFIX}/bin ${PREFIX}/data
+	cp -f $(BIN)HiFiLES ${PREFIX}/bin
+	chmod 755 ${PREFIX}/bin/HiFiLES
+	cp -f data/*.dat ${PREFIX}/data
+	chmod 644 ${PREFIX}/data/*.dat
+
diff --git a/makefile.in b/makefile.in
deleted file mode 100644
index dd5b6073..00000000
--- a/makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
-# \file Makefile.in
-# \author - Original code: SD++ developed by Patrice Castonguay, Antony Jameson,
-#                          Peter Vincent, David Williams (alphabetical by surname).
-#         - Current development: Aerospace Computing Laboratory (ACL)
-#                                Aero/Astro Department. Stanford University.
-# \version 0.1.0
-#
-# High Fidelity Large Eddy Simulation (HiFiLES) Code.
-# Copyright (C) 2014 Aerospace Computing Laboratory (ACL).
-#
-# HiFiLES 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 3 of the License, or
-# (at your option) any later version.
-#
-# HiFiLES 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 HiFiLES.  If not, see <http://www.gnu.org/licenses/>.
-
-NODE=     CPU
-CODE=     DEBUG
-BLAS=     ATLAS_BLAS
-COMP=     GCC
-PARALLEL= NO
-TECIO=    YES
-MACHINE=  YOSEMITESAM
-
-BLAS_DIR= /usr/local/atlas
-
-PARMETIS_DIR = /usr/local
-
-PARMETIS_BUILD_DIR = $(PARMETIS_DIR)/lib
-
-TECIO_DIR = lib/tecio-2008
-
-CUDA_DIR = /usr/local/cuda-5.0
-
-MPI_DIR = /usr/mpi/gcc/mvapich-1.2.0
diff --git a/makefile.in b/makefile.in
new file mode 120000
index 00000000..12b3fc44
--- /dev/null
+++ b/makefile.in
@@ -0,0 +1 @@
+makefiles/makefile.pleiades.in
\ No newline at end of file
diff --git a/makefiles/makefile.pleiades.in b/makefiles/makefile.pleiades.in
new file mode 100644
index 00000000..3ae2e52f
--- /dev/null
+++ b/makefiles/makefile.pleiades.in
@@ -0,0 +1,47 @@
+# \file Makefile.in
+# \author - Original code: SD++ developed by Patrice Castonguay, Antony Jameson,
+#                          Peter Vincent, David Williams (alphabetical by surname).
+#         - Current development: Aerospace Computing Laboratory (ACL)
+#                                Aero/Astro Department. Stanford University.
+# \version 0.1.0
+#
+# High Fidelity Large Eddy Simulation (HiFiLES) Code.
+# Copyright (C) 2014 Aerospace Computing Laboratory (ACL).
+#
+# HiFiLES 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 3 of the License, or
+# (at your option) any later version.
+#
+# HiFiLES 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 HiFiLES.  If not, see <http://www.gnu.org/licenses/>.
+
+PREFIX= $(HOME)/local/hifiles/git-gcc_4.9.3-sgi_mpt.2.12r26
+NODE=     CPU
+CODE=     RELEASE
+BLAS=     NO_BLAS
+COMP=     GCC
+PARALLEL= MPI
+TECIO=    YES
+MACHINE=  PLEIADES
+
+BLAS_DIR= /usr/local/atlas
+
+PARMETIS_DIR = /u/dingraha/local/parmetis/4.0.3-gcc_4.9.3-sgi_mpt.2.12r26
+
+PARMETIS_BUILD_DIR = $(PARMETIS_DIR)/lib
+
+METIS_DIR = /u/dingraha/local/metis/5.1.0
+
+METIS_BUILD_DIR = $(METIS_DIR)/lib
+
+TECIO_DIR = lib/tecio-2008
+
+CUDA_DIR = /usr/local/cuda-5.0
+
+MPI_DIR = /nasa/sgi/mpt/2.12r26
diff --git a/src/geometry.cpp b/src/geometry.cpp
index 9bc273b7..a43b7d4d 100644
--- a/src/geometry.cpp
+++ b/src/geometry.cpp
@@ -2235,8 +2235,8 @@ void repartition_mesh(int &out_n_cells, array<int> &out_c2v, array<int> &out_c2n
 
   int nparts = FlowSol->nproc;
 
-  float *tpwgts = (float*) calloc(klocal,sizeof(float));
-  for (int i=0;i<klocal;i++)
+  float *tpwgts = (float*) calloc(nparts,sizeof(float));
+  for (int i=0;i<nparts;i++)
     tpwgts[i] = 1./ (float)FlowSol->nproc;
 
   float *ubvec = (float*) calloc(ncon,sizeof(float));