diff --git a/src/MS/Makefile b/src/MS/Makefile
index a84825a..7191c84 100644
--- a/src/MS/Makefile
+++ b/src/MS/Makefile
@@ -11,10 +11,10 @@ CASA_LIBS=-lcasa_casa -lcasa_tables -lcasa_measures -lcasa_ms -lcfitsio
 #LAPACK=-llapack -lblas
 LAPACK=-lopenblas -lgfortran -lpthread
 # LAPACK_DIR=/cm/shared/apps/openblas/0.2.8/lib
-LAPACK_DIR=/cm/shared/apps/openblas/0.2.15/lib
+LAPACK_DIR=/cm/shared/package/openblas/0.2.17mt/lib
 #LAPACK_DIR=/usr/lib/atlas/sse/
 
-LDFLAGS=-Wl,--rpath,/usr/local/OpenBLAS/lib/,${CASA_LIBDIR}
+LDFLAGS=-Wl,--rpath,/cm/shared/package/openblas/0.2.17mt/lib/,${CASA_LIBDIR}
 #LDFLAGS=-Wl,-t,--rpath,/software/users/lofareor/SW/lib64
 # -Wl,--hash-style=both
 
diff --git a/src/MS/Makefile.gpu b/src/MS/Makefile.gpu
index ff63810..9efaddd 100644
--- a/src/MS/Makefile.gpu
+++ b/src/MS/Makefile.gpu
@@ -6,7 +6,7 @@ CASA_INCDIR=-I/cm/shared/package/casacore/v2.3.0-gcc-4.9.3/include -I/cm/shared/
 CASA_LIBS=-lcasa_casa -lcasa_tables -lcasa_measures -lcasa_ms -lcfitsio
 # LAPACK=-llapack -lblas
 LAPACK=-lopenblas -lgfortran -lpthread
-LAPACK_DIR=/cm/shared/apps/openblas/0.2.8/lib
+LAPACK_DIR=/cm/shared/package/openblas/0.2.17mt/lib
 #LAPACK_DIR=/usr/lib/atlas/sse/
 
 CUDAINC=-I/cm/shared/apps/cuda80/toolkit/8.0.44/include/
@@ -18,7 +18,7 @@ NVML_INC=/usr/include/nvidia/gdk/
 NVML_LIB=-lnvidia-ml -L/usr/lib64/nvidia/
 
 
-LDFLAGS=-Wl,--rpath,/usr/local/OpenBLAS/lib/,${CASA_LIBDIR}
+LDFLAGS=-Wl,--rpath,/cm/shared/package/openblas/0.2.17mt/lib,${CASA_LIBDIR}
 #LDFLAGS=-Wl,-t,--rpath,/software/users/lofareor/SW/lib64
 # -Wl,--hash-style=both
 
diff --git a/src/lib/Dirac/Makefile b/src/lib/Dirac/Makefile
index 350dfe9..cdc691e 100644
--- a/src/lib/Dirac/Makefile
+++ b/src/lib/Dirac/Makefile
@@ -7,7 +7,7 @@ CFLAGS= -Wall -g -pg
 CLIBS= -lm -lpthread
 #LAPACK=-L/usr/lib/atlas/sse -llapack -lblas
 #LAPACK=-L/usr/local/GotoBLAS2/lib -lgoto2 -lpthread -lgfortran
-LAPACK=-L/usr/local/OpenBLAS/lib/ -lopenblas -lgfortran -lpthread
+LAPACK=-L/cm/shared/package/openblas/0.2.17mt/lib -lopenblas -lgfortran -lpthread
 
 
 INCLUDES= -I. 
diff --git a/src/lib/Dirac/Makefile.gpu b/src/lib/Dirac/Makefile.gpu
index 9089a43..3897c41 100644
--- a/src/lib/Dirac/Makefile.gpu
+++ b/src/lib/Dirac/Makefile.gpu
@@ -3,7 +3,7 @@ CXX=g++
 NVCC=nvcc
 CFLAGS= -Wall -O3 -g -DHAVE_CUDA -DHYBRID_CODE -pg
 CLIBS= -lm -lpthread
-LAPACK=-L/usr/local/OpenBLAS/lib/ -lopenblas -lgfortran -lpthread
+LAPACK=-L/cm/shared/package/openblas/0.2.17mt/lib -lopenblas -lgfortran -lpthread
 # LAPACK=-lblas -lgfortran -lpthread
 
 CUDAINC=/usr/local/cuda/include
diff --git a/src/lib/Radio/Makefile b/src/lib/Radio/Makefile
index 06f3214..6f34a5a 100644
--- a/src/lib/Radio/Makefile
+++ b/src/lib/Radio/Makefile
@@ -7,7 +7,7 @@ CFLAGS= -Wall -g -pg
 CLIBS= -lm -lpthread
 #LAPACK=-L/usr/lib/atlas/sse -llapack -lblas
 #LAPACK=-L/usr/local/GotoBLAS2/lib -lgoto2 -lpthread -lgfortran
-LAPACK=-L/usr/local/OpenBLAS/lib/ -lopenblas -lgfortran -lpthread
+LAPACK=-L/cm/shared/package/openblas/0.2.17mt/lib -lopenblas -lgfortran -lpthread
 
 
 INCLUDES= -I. -I../Dirac/ 
diff --git a/src/lib/Radio/Makefile.gpu b/src/lib/Radio/Makefile.gpu
index 00a3cdf..923722b 100644
--- a/src/lib/Radio/Makefile.gpu
+++ b/src/lib/Radio/Makefile.gpu
@@ -3,7 +3,7 @@ CXX=g++
 NVCC=nvcc
 CFLAGS= -Wall -O3 -g -DHAVE_CUDA -DHYBRID_CODE -pg
 CLIBS= -lm -lpthread
-LAPACK=-L/usr/local/OpenBLAS/lib/ -lopenblas -lgfortran -lpthread
+LAPACK=-L/cm/shared/package/openblas/0.2.17mt/lib -lopenblas -lgfortran -lpthread
 # LAPACK=-lblas -lgfortran -lpthread
 
 CUDAINC=/usr/local/cuda/include
diff --git a/test/Generate_sources.py b/test/Generate_sources.py
index 742aee2..7b46c00 100644
--- a/test/Generate_sources.py
+++ b/test/Generate_sources.py
@@ -67,9 +67,9 @@ with warnings.catch_warnings():
              'pos_angle', 'freq0')
 
     formats = ['U6', 'i4', 'i4', 'f8', 'i4', 'i4', 'f8', 'f8', 'i4', 'i4', 'i4', 'f8', 'f8',
-               'i4', 'i4', 'i4', 'i4', 'f8', 'f8']
+               'f8', 'f8', 'f8', 'f8', 'f8', 'f8']
 
-    formats_reformatted = '%s  %d  %d  %f  %d  %d  %f  %f  %d  %d  %d  %f  %f  %d  %d  %d  %d  %f  %f'
+    formats_reformatted = '%s  %d  %d  %f  %d  %d  %f  %f  %d  %d  %d  %f  %f  %f  %f  %f  %f  %f  %f'
 
     sources_parameters = np.recarray((number_of_sources,), formats=formats,
                                      names=names)
@@ -122,7 +122,7 @@ with warnings.catch_warnings():
 
 # sources_parameters.tofile("extended_source_list_using_tofile.txt", sep='\n')
 
-with open("extended_source_list_centered_on_3C196.txt", 'wb') as f:
+with open("extended_source_list.txt", 'wb') as f:
     f.write(b"##  From Generate_sources.py by Hanno Spreeuw.\n")
     f.write(b"##  Generates point sources at random positions with random brighnesses within some range.\n")
     f.write(b"##  this is an LSM text (hms/dms) file\n")
@@ -136,5 +136,5 @@ with open("extended_source_list_centered_on_3C196.txt", 'wb') as f:
 # Now write the cluster file
 # First add '1' and '1' to indicate the cluster id and chunk size.
 cluster_array = np.concatenate((np.array(['1', '1']), sources_parameters.name))
-with open("extended_source_list_centered_on_3C196.txt.cluster", 'wb') as f:
+with open("extended_source_list.txt.cluster", 'wb') as f:
     np.savetxt(f, (cluster_array).reshape(1, cluster_array.shape[0]), fmt='%s', delimiter=' ')