diff --git a/CMake/FindHDF5.cmake b/CMake/FindHDF5.cmake
index ce247d173..9ecc3a4f8 100644
--- a/CMake/FindHDF5.cmake
+++ b/CMake/FindHDF5.cmake
@@ -18,7 +18,7 @@ IF(Hdf5_INCLUDE_DIRS)
 ELSE(Hdf5_INCLUDE_DIRS)
 
   SET(TRIAL_LIBRARY_PATHS
-    /usr/apps/hdf5/lib
+    $ENV{HDF5_HOME}/lib
     /usr/apps/lib
     /usr/lib 
     /usr/local/lib
@@ -27,7 +27,7 @@ ELSE(Hdf5_INCLUDE_DIRS)
     )
 
   SET(TRIAL_INCLUDE_PATHS
-    /usr/apps/hdf5/include
+    $ENV{HDF5_HOME}/include
     /usr/apps/include
     /usr/include
     /opt/include
@@ -35,11 +35,6 @@ ELSE(Hdf5_INCLUDE_DIRS)
     /sw/include
     )
 
-  IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(TRIAL_LIBRARY_PATHS /usr/apps/hdf5/gcc3/lib ${TRIAL_LIBRARY_PATHS} )
-    SET(TRIAL_INCLUDE_PATHS /usr/apps/hdf5/gcc3/include ${TRIAL_INCLUDE_PATHS} )
-  ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
   IF($ENV{HDF5_DIR} MATCHES "hdf")
     MESSAGE(STATUS "Using environment variable HDF5_DIR.")
     SET(TRIAL_LIBRARY_PATHS $ENV{HDF5_DIR}/lib ${TRIAL_LIBRARY_PATHS} )
@@ -61,4 +56,4 @@ MARK_AS_ADVANCED(
   HDF5_INCLUDE_DIR 
   HDF5_LIBRARY 
   FOUND_HDF5
-  )
+)
diff --git a/CMake/FindLapack.cmake b/CMake/FindLapack.cmake
index 302d8da21..30711b6ea 100755
--- a/CMake/FindLapack.cmake
+++ b/CMake/FindLapack.cmake
@@ -12,9 +12,8 @@
 SET(MKL_PATHS "")
 
 #use environment variables
-IF(INTEL_COMPILER)
-  #use environment variables: e.g, module at OSC uses MKL
-  IF($ENV{MKL} MATCHES "mkl")
+#use environment variables: e.g, module at OSC uses MKL
+IF($ENV{MKL} MATCHES "mkl")
 
     MESSAGE(STATUS "Using intel/mkl library: $ENV{MKL}")
 
@@ -25,20 +24,13 @@ IF(INTEL_COMPILER)
   ENDIF($ENV{MKL} MATCHES "mkl")
 
   SET(MKL_PATHS ${MKL_PATHS} 
-        $ENV{MKL_HOME}
+        $ENV{MKL_HOME}/lib/${BITS}
 	/usr/local/intel/mkl60/mkl60/lib/64
 	/usr/local/intel/mkl/lib/32 
 	/opt/intel/mkl/lib/32
   ) 
   MESSAGE(STATUS "Looking for intel/mkl library in ${MKL_PATHS}")
 
-#  IF($ENV{MKL}) MATCHES "mkl")
-#    MESSAGE(STATUS "Using intel/mkl library: $ENV{MKL}")
-#    SET(LAPACK_LIBRARY $ENV{MKL})
-#    SET(BLAS_LIBRARY " ")
-#    SET(LAPACK_LIBRARY_INIT 1)
-#  ENDIF($ENV{MKL}) MATCHES "mkl")
-
   IF(NOT LAPACK_LIBRARY_INIT)
     FIND_LIBRARY(LAPACK_LIBRARY 
       NAMES mkl_lapack 
@@ -57,8 +49,7 @@ IF(INTEL_COMPILER)
       SET(LAPACK_LIBRARY_INIT 1 CACHE BOOL "lapack is initialized")
       SET(BLAS_LIBRARY_INIT 1 CACHE BOOL "blas is initialized")
     ENDIF(LAPACK_LIBRARY MATCHES "mkl")
-  ENDIF(NOT LAPACK_LIBRARY_INIT)
-ENDIF(INTEL_COMPILER)
+ENDIF(NOT LAPACK_LIBRARY_INIT)
 
 IF($ENV{ATLAS} MATCHES "atlas")
   IF($ENV{ATLAS} MATCHES "lapack") 
diff --git a/CMake/GNUCompilers.cmake b/CMake/GNUCompilers.cmake
index 22c49f297..b5d711e1a 100755
--- a/CMake/GNUCompilers.cmake
+++ b/CMake/GNUCompilers.cmake
@@ -1,7 +1,7 @@
 #GNU compilers
 IF(CMAKE_COMPILER_IS_GNUCXX) 
   ADD_DEFINITIONS(-Drestrict=__restrict__ -DADD_)
-  SET(CMAKE_CXX_FLAGS "-O6 -ftemplate-depth-60 -Drestrict=__restrict__ -fstrict-aliasing -funroll-all-loops   -finline-limit=1000 -ffast-math -Wno-deprecated")
+  SET(CMAKE_CXX_FLAGS "-O6 -ftemplate-depth-60 -Drestrict=__restrict__ -fstrict-aliasing -funroll-all-loops   -finline-limit=1000 -ffast-math -Wno-deprecated ")
 #  SET(CMAKE_CXX_FLAGS "-g -ftemplate-depth-60 -Drestrict=__restrict__ -fstrict-aliasing -Wno-deprecated")
   SET(FORTRAN_LIBS "-lg2c")
   SET(F77 g77)
diff --git a/CMake/Intel8.cmake b/CMake/Intel8.cmake
index 140ca3bc4..b3a947051 100755
--- a/CMake/Intel8.cmake
+++ b/CMake/Intel8.cmake
@@ -8,6 +8,8 @@ ADD_DEFINITIONS(-DADD_)
 #SET(CMAKE_CC_FLAGS "-restrict -unroll -fno-alias -O3 -Ob=1 -ansi -ipo -ipo_obj")
 SET(CMAKE_CXX_FLAGS "-restrict -unroll -fno-alias -O3")
 SET(CMAKE_CC_FLAGS "-restrict -unroll -fno-alias -O3")
+#SET(CMAKE_CXX_FLAGS "-restrict -unroll -fno-alias -O2 -g")
+#SET(CMAKE_CC_FLAGS "-restrict -unroll -fno-alias -O2 -g")
 
 #IF(BITS MATCHES 64)
 #  SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -ftz")