diff --git a/cmake/GENIESetup.cmake b/cmake/GENIESetup.cmake
index c7f9eb3..74dfd3e 100644
--- a/cmake/GENIESetup.cmake
+++ b/cmake/GENIESetup.cmake
@@ -1,232 +1,236 @@
 # Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 ################################################################################
 #    This file is part of NUISANCE.
 #
 #    NUISANCE 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.
 #
 #    NUISANCE 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 NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 # TODO
 # check system for libxml2
 # check whether we need the includes
 # check if we can use a subset of the GENIE libraries
 
 include(${CMAKE_SOURCE_DIR}/cmake/parseConfigApp.cmake)
 ################################################################################
 #                            Check Dependencies
 ################################################################################
 
 #################################  GENIE  ######################################
 if(GENIE STREQUAL "")
   cmessage(FATAL_ERROR "Variable GENIE is not defined. "
     "The location of a pre-built GENIE install must be defined either as"
     " $ cmake -DGENIE=/path/to/GENIE or as an environment variable"
     " $ export GENIE=/path/to/GENIE")
 endif()
 
 if (BUILD_GEVGEN)
   cmessage(STATUS "Building custom gevgen")
   LIST(APPEND EXTRA_CXX_FLAGS -D__GEVGEN_ENABLED__)
 endif()
 
 if(GENIE_EMPMEC_REWEIGHT)
   cmessage(STATUS "Enable EMPMEC dials")
   LIST(APPEND EXTRA_CXX_FLAGS -D__GENIE_EMP_MECRW_ENABLED)
 endif()
 
 # Extract GENIE VERSION
 if (GENIE_VERSION STREQUAL "AUTO")
    execute_process (COMMAND ${CMAKE_SOURCE_DIR}/cmake/getgenieversion.sh ${GENIE}
    OUTPUT_VARIABLE GENIE_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
 
 execute_process(COMMAND genie-config --version
 OUTPUT_VARIABLE GENIE_VER OUTPUT_STRIP_TRAILING_WHITESPACE)
 cmessage(STATUS "genie_ver: ${GENIE_VER}")
 if(GENIE_VER VERSION_GREATER 3.0.0)
   set(GENIE_POST_R3 1)
   string(REPLACE "." "" GENIE_VERSION ${GENIE_VER})
   cmessage(STATUS "set genie_post_r3")
 endif()
 
 if(NOT GENIE_POST_R3)
 LIST(APPEND EXTRA_CXX_FLAGS -DGENIE_PRE_R3)
 cmessage(STATUS "setting genie_pre_r3 ${EXTRA_CXX_FLAGS}")
 endif()
 
 execute_process (COMMAND genie-config
   --topsrcdir OUTPUT_VARIABLE GENIE_INCLUDES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 #Allows for external override in the case where genie-config lies.
 if(NOT DEFINED GENIE_LIB_DIR OR GENIE_LIB_DIR STREQUAL "")
   GETLIBDIRS(genie-config --libs GENIE_LIB_DIR)
 endif()
 GETLIBS(genie-config --libs GENIE_LIBS)
 
 cmessage(STATUS "GENIE version : ${GENIE_VERSION}")
 cmessage(STATUS "GENIE libdir  : ${GENIE_LIB_DIR}")
 cmessage(STATUS "GENIE libs    : ${GENIE_LIBS}")
 
 string(REGEX MATCH "ReinSeghal" WASMATCHED ${GENIE_LIBS})
 if(WASMATCHED AND GENIE_VERSION STREQUAL "210")
   set(GENIE_SEHGAL ${GENIE_LIBS})
   STRING(REPLACE "ReinSeghal" "ReinSehgal" GENIE_LIBS ${GENIE_SEHGAL})
   cmessage(DEBUG "Fixed inconsistency in library naming: ${GENIE_LIBS}")
 endif()
 
 if(NOT GENIE_POST_R3)
   LIST(FIND GENIE_LIBS GReWeight WAS_FOUND)
   if(WAS_FOUND STREQUAL "-1")
     LIST(APPEND GENIE_LIBS GReWeight)
     cmessage(DEBUG "Force added ReWeight library: ${GENIE_LIBS}")
   endif()
 else()
   LIST(FIND GENIE_LIBS GRwFwk WAS_FOUND)
   if(WAS_FOUND STREQUAL "-1")
     LIST(APPEND GENIE_LIBS GRwClc GRwFwk GRwIO)
     cmessage(DEBUG "Force added ReWeight library: ${GENIE_LIBS}")
   endif()
 endif()
 
 LIST(APPEND GENIE_LIBS -Wl,--end-group )
 LIST(REVERSE GENIE_LIBS)
 LIST(APPEND GENIE_LIBS -Wl,--start-group -Wl,--no-as-needed )
 LIST(REVERSE GENIE_LIBS)
 
 cmessage(DEBUG "GENIE_LIBS: ${GENIE_LIBS}")
 
 ################################  LHAPDF  ######################################
 if(LHAPDF_LIB STREQUAL "")
   cmessage(FATAL_ERROR "Variable LHAPDF_LIB is not defined. The location of a pre-built lhapdf install must be defined either as $ cmake -DLHAPDF_LIB=/path/to/LHAPDF_libraries or as an environment variable $ export LHAPDF_LIB=/path/to/LHAPDF_libraries")
 endif()
 
 if(LHAPDF_INC STREQUAL "")
   cmessage(FATAL_ERROR "Variable LHAPDF_INC is not defined. The location of a pre-built lhapdf install must be defined either as $ cmake -DLHAPDF_INC=/path/to/LHAPDF_includes or as an environment variable $ export LHAPDF_INC=/path/to/LHAPDF_includes")
 endif()
 
 if(LHAPATH STREQUAL "")
   cmessage(FATAL_ERROR "Variable LHAPATH is not defined. The location of a the LHAPATH directory must be defined either as $ cmake -DLHAPATH=/path/to/LHAPATH or as an environment variable $ export LHAPATH=/path/to/LHAPATH")
 endif()
 
 ################################  LIBXML  ######################################
 if(LIBXML2_LIB STREQUAL "")
   GETLIBDIR(xml2-config --libs LIBXML2_LIB IGNORE_EMPTY_RESPONSE)
   if(LIBXML2_LIB STREQUAL "")
     message(WARNING "Variable LIBXML2_LIB is not defined, as xml2-config was found and didn't report a library include path, it is likely that libxml2.so can be found in the standard system location, lets hope so.")
   endif()
 endif()
 
 if(LIBXML2_INC STREQUAL "")
   GETINCDIR(xml2-config --cflags LIBXML2_INC)
   if(LIBXML2_INC STREQUAL "")
     message(FATAL_ERROR "Variable LIBXML2_INC is not defined and could not be found with xml2-config. The location of a pre-built libxml2 install must be defined either as $ cmake -DLIBXML2_INC=/path/to/LIBXML2_includes or as an environment variable $ export LIBXML2_INC=/path/to/LIBXML2_includes")
   endif()
 endif()
 
 ###############################  log4cpp  ######################################
 if(LOG4CPP_LIB STREQUAL "")
   GETLIBDIR(log4cpp-config --libs LOG4CPP_LIB)
   if(LOG4CPP_LIB STREQUAL "")
     message(FATAL_ERROR "Variable LOG4CPP_LIB is not defined and could not be found with log4cpp-config. The location of a pre-built log4cpp install must be defined either as $ cmake -DLOG4CPP_LIB=/path/to/LOG4CPP_libraries or as an environment variable $ export LOG4CPP_LIB=/path/to/LOG4CPP_libraries")
   endif()
 endif()
 
 if(LOG4CPP_INC STREQUAL "")
   GETINCDIR(log4cpp-config --cflags LOG4CPP_INC)
   if(LOG4CPP_INC STREQUAL "")
     message(FATAL_ERROR "Variable LOG4CPP_INC is not defined and could not be found with log4cpp-config. The location of a pre-built log4cpp install must be defined either as $ cmake -DLOG4CPP_INC=/path/to/LOG4CPP_includes or as an environment variable $ export LOG4CPP_INC=/path/to/LOG4CPP_includes")
   endif()
 endif()
 ################################################################################
 
 LIST(APPEND EXTRA_CXX_FLAGS -D__GENIE_ENABLED__ -D__GENIE_VERSION__=${GENIE_VERSION})
 
 LIST(APPEND EXTRA_LIBS ${GENIE_LIBS})
 
 ###############################  GSL  ######################################
 if(GENIE_POST_R3)
   if(GSL_LIB STREQUAL "")
     GETLIBDIR(gsl-config --libs GSL_LIB)
     if(GSL_LIB STREQUAL "")
       message(FATAL_ERROR "Variable GSL_LIB is not defined and could not be found with gsl-config. The location of a pre-built gsl install must be defined either as $ cmake -DGSL_LIB=/path/to/GSL_libraries or as an environment variable $ export GSL_LIB=/path/to/GSL_libraries")
     endif()
   endif()
 
   if(GSL_INC STREQUAL "")
     GETINCDIR(gsl-config --cflags GSL_INC)
     if(GSL_INC STREQUAL "")
       message(FATAL_ERROR "Variable GSL_INC is not defined and could not be found with gsl-config. The location of a pre-built gsl install must be defined either as $ cmake -DGSL_INC=/path/to/GSL_includes or as an environment variable $ export GSL_INC=/path/to/GSL_includes")
     endif()
   endif()
 
+  #cmessage(WARNING "GSL_LIB: ${GSL_LIB}, GSL_LIB_LIST: ${GSL_LIB_LIST}")
   GETLIBS(gsl-config --libs GSL_LIB_LIST)
+  #cmessage(AUTHOR_WARNING "GSL_LIB: ${GSL_LIB}, GSL_LIB_LIST: ${GSL_LIB_LIST}")
 
   if(GENIE_REWEIGHT STREQUAL "")
     message(FATAL_ERROR "Variable GENIE_REWEIGHT is not defined. When using GENIE v3+, we require the reweight product to be built and accessible via the environment variable GENIE_REWEIGHT")
   endif()
 endif()
 ################################################################################
 
+#cmessage(FATAL_ERROR "GSL_LIB: ${GSL_LIB}, GSL_LIB_LIST: ${GSL_LIB_LIST}")
+
 LIST(APPEND EXTRA_LIBS LHAPDF xml2 log4cpp)
 
 LIST(APPEND EXTRA_LINK_DIRS
   ${GENIE_LIB_DIR}
   ${LHAPDF_LIB}
   ${LOG4CPP_LIB})
 
 if(NOT GENIE_POST_R3)
   LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES
     ${GENIE_INCLUDES_DIR}
     ${GENIE_INCLUDES_DIR}/GHEP
     ${GENIE_INCLUDES_DIR}/Ntuple
     ${GENIE_INCLUDES_DIR}/ReWeight
     ${GENIE_INCLUDES_DIR}/Apps
     ${GENIE_INCLUDES_DIR}/FluxDrivers
     ${GENIE_INCLUDES_DIR}/EVGDrivers
     ${LHAPDF_INC}
     ${LIBXML2_INC}
     ${LOG4CPP_INC})
 else()
   LIST(APPEND RWENGINE_INCLUDE_DIRECTORIES
     ${GENIE_INCLUDES_DIR}
     ${GENIE_REWEIGHT}/src
     ${GSL_INC}
     ${LHAPDF_INC}
     ${LIBXML2_INC}
     ${LOG4CPP_INC})
 
     LIST(APPEND EXTRA_LINK_DIRS
       ${GENIE_REWEIGHT}/lib
       ${GSL_LIB}
     )
 
     LIST(APPEND EXTRA_LIBS ${GSL_LIB_LIST})
 
 endif()
 
 cmessage(WARNING ${EXTRA_LINK_DIRS})
 cmessage(WARNING ${EXTRA_LIBS})
 
 SAYVARS()
 
 if(USE_PYTHIA8)
   set(NEED_PYTHIA8 TRUE)
   set(NEED_ROOTPYTHIA8 TRUE)
 else()
   set(NEED_PYTHIA6 TRUE)
   set(NEED_ROOTPYTHIA6 TRUE)
 endif()
 set(NEED_ROOTEVEGEN TRUE)
 
 SET(USE_GENIE TRUE CACHE BOOL "Whether to enable GENIE (reweight) support. Requires external libraries. <FALSE>" FORCE)
diff --git a/cmake/parseConfigApp.cmake b/cmake/parseConfigApp.cmake
index 222b0ec..2f72ce5 100644
--- a/cmake/parseConfigApp.cmake
+++ b/cmake/parseConfigApp.cmake
@@ -1,141 +1,148 @@
 function(GETFIRSTMATCHINGDELMIMMEDDIR DELIM CONFIGAPP ARG DIR_OUT FAILURE_IS_NOT_ERROR)
 
   cmessage(DEBUG "CONFIGAPP: ${CONFIGAPP}, ARG: ${ARG} DIR_OUT: ${DIR_OUT}, FAILURE_IS_NOT_ERROR: ${FAILURE_IS_NOT_ERROR}")
 
   if(DELIM STREQUAL "")
     cmessage(FATAL_ERROR "GETFIRSTMATCHINGDELMIMMEDDIR Passed no delimiter. This is a build configuration bug in NUISANCE, please report to the developers.")
   endif()
 
   if(CONFIGAPP STREQUAL "")
     cmessage(FATAL_ERROR "GETFIRSTMATCHINGDELMIMMEDDIR Passed no configuration application. This is a build configuration bug in NUISANCE, please report to the developers.")
   endif()
 
   SET(CONFIGAPP_LOCATION "CONFIGAPP_LOCATION-NOTFOUND")
   find_program(CONFIGAPP_LOCATION ${CONFIGAPP})
   if(NOT CONFIGAPP_LOCATION STREQUAL "CONFIGAPP_LOCATION-NOTFOUND")
     execute_process (COMMAND ${CONFIGAPP_LOCATION}
     ${ARG} OUTPUT_VARIABLE CONFIGAPP_RESPONSE_RAW OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     cmessage(DEBUG "${CONFIGAPP_LOCATION} ${ARG} responded with: \"${CONFIGAPP_RESPONSE_RAW}\"")
 
     if(CONFIGAPP_RESPONSE_RAW STREQUAL "")
       if(FAILURE_IS_NOT_ERROR)
         cmessage(DEBUG "\"${CONFIGAPP_LOCATION} ${ARG}\" produced no output and was expected to.")
         set(${DIR_OUT} "" PARENT_SCOPE)
       else()
         cmessage(FATAL_ERROR "\"${CONFIGAPP_LOCATION} ${ARG}\" produced no output and was required to.")
       endif()
     else()
       string(REGEX MATCH "${DELIM}\([^ ]+\)" PARSE_CONFIGAPP_RESPONSE_MATCH ${CONFIGAPP_RESPONSE_RAW})
 
       if(NOT PARSE_CONFIGAPP_RESPONSE_MATCH)
         if(FAILURE_IS_NOT_ERROR)
           cmessage(DEBUG "Couldn't find ${DELIM} flag, found: \"${CONFIGAPP_RESPONSE_RAW}\"")
           set(${CMAKE_MATCH_1} "")
         else()
           cmessage(FATAL_ERROR "Expected to be able to parse the result of ${CONFIGAPP} ${ARG} to a lib directory, but couldn't find a ${DELIM} flag, found: \"${CONFIGAPP_RESPONSE_RAW}\"")
         endif()
       endif()
 
       set(${DIR_OUT} ${CMAKE_MATCH_1} PARENT_SCOPE)
     endif()
   else()
     cmessage(FATAL_ERROR "[ERROR]: Failed to find dependency configuration application: \"${CONFIGAPP}\"")
   endif()
 endfunction()
 
 #Uselike GETLIBDIR(gsl-config --libs GSL_LIB_DIR)
 function(GETLIBDIR CONFIGAPP ARG LIBDIR_OUT)
   if(ARGN)
     set(FAILURE_IS_NOT_ERROR TRUE)
   else()
     set(FAILURE_IS_NOT_ERROR FALSE)
   endif()
   GETFIRSTMATCHINGDELMIMMEDDIR(
     "-L"
     ${CONFIGAPP}
     ${ARG}
     MATCHING_DIR
     ${FAILURE_IS_NOT_ERROR})
   set(${LIBDIR_OUT} ${MATCHING_DIR} PARENT_SCOPE)
 endfunction()
 
 #Uselike GETINCDIR(gsl-config --cflags GSL_INC_DIR)
 function(GETINCDIR CONFIGAPP ARG INCDIR_OUT)
   if(ARGN)
     set(FAILURE_IS_NOT_ERROR TRUE)
   else()
     set(FAILURE_IS_NOT_ERROR FALSE)
   endif()
   GETFIRSTMATCHINGDELMIMMEDDIR(
     "-I"
     ${CONFIGAPP}
     ${ARG}
     MATCHING_DIR
     ${FAILURE_IS_NOT_ERROR})
   set(${INCDIR_OUT} ${MATCHING_DIR} PARENT_SCOPE)
 endfunction()
 
 function(GETALLMATCHINGDELMIMMEDDIR DELIM CONFIGAPP ARG LIST_OUT)
   if(DELIM STREQUAL "")
     cmessage(FATAL_ERROR "GETALLMATCHINGDELMIMMEDDIR Passed no delimiter. This is a build configuration bug in NUISANCE, please report to the developers.")
   endif()
 
   if(CONFIGAPP STREQUAL "")
     cmessage(FATAL_ERROR "GETALLMATCHINGDELMIMMEDDIR Passed no configuration application. This is a build configuration bug in NUISANCE, please report to the developers.")
   endif()
 
+  #cmessage(WARNING "DELIM: ${DELIM}, CONFIGAPP: ${CONFIGAPP}, ARG: ${ARG}, LIST_OUT: ${LIST_OUT}")
+
+  SET(CONFIGAPP_LOCATION "CONFIGAPP_LOCATION-NOTFOUND")
   find_program(CONFIGAPP_LOCATION ${CONFIGAPP})
   if(NOT CONFIGAPP_LOCATION STREQUAL "CONFIGAPP_LOCATION-NOTFOUND")
     execute_process (COMMAND ${CONFIGAPP_LOCATION}
     ${ARG} OUTPUT_VARIABLE CONFIGAPP_RESPONSE_RAW OUTPUT_STRIP_TRAILING_WHITESPACE)
 
     string(REPLACE " " ";" CONFIGAPP_RESPONSE_LIST "${CONFIGAPP_RESPONSE_RAW}")
 
+   # cmessage(WARNING "CONFIGAPP_RESPONSE_RAW: ${CONFIGAPP_RESPONSE_RAW}, CONFIGAPP_RESPONSE_LIST: ${CONFIGAPP_RESPONSE_LIST}")
+
     set(LIST_BUILD)
 
     foreach(I ${CONFIGAPP_RESPONSE_LIST})
       if(I)
         string(REGEX MATCH "^${DELIM}" WASMATCHED ${I})
         if(WASMATCHED)
           string(REPLACE "${DELIM}" "" I_STRIPPED "${I}")
           LIST(APPEND LIST_BUILD ${I_STRIPPED})
         endif()
       endif()
     endforeach()
 
     set(${LIST_OUT} ${LIST_BUILD} PARENT_SCOPE)
   else()
     cmessage(FATAL_ERROR "[ERROR]: Failed to find dependency configuration application: \"${CONFIGAPP}\"")
   endif()
 endfunction()
 
 #Uselike GETLIBDIRS(gsl-config --libs GSL_LIB_DIR)
 function(GETLIBDIRS CONFIGAPP ARG LIBDIR_OUT)
   GETALLMATCHINGDELMIMMEDDIR(
     "-L"
     ${CONFIGAPP}
     ${ARG}
     MATCHING_DIR)
   set(${LIBDIR_OUT} ${MATCHING_DIR} PARENT_SCOPE)
 endfunction()
 
 #Uselike GETINCDIRS(gsl-config --cflags GSL_INC_DIR)
 function(GETINCDIRS CONFIGAPP ARG INCDIR_OUT)
   GETALLMATCHINGDELMIMMEDDIR(
     "-I"
     ${CONFIGAPP}
     ${ARG}
     MATCHING_DIR)
   set(${INCDIR_OUT} ${MATCHING_DIR} PARENT_SCOPE)
 endfunction()
 
 #Uselike GETLIBS(gsl-config --libs GSL_LIB_DIR)
 function(GETLIBS CONFIGAPP ARG LIBLIST_OUT)
+  #cmessage(WARNING "LIBLIST_OUT: ${LIBLIST_OUT}")
   GETALLMATCHINGDELMIMMEDDIR(
     "-l"
     ${CONFIGAPP}
     ${ARG}
     MATCHING_ITEMS)
   set(${LIBLIST_OUT} ${MATCHING_ITEMS} PARENT_SCOPE)
+  #cmessage(WARNING "LIBLIST_OUT: ${LIBLIST_OUT}: ${${LIBLIST_OUT}}")
 endfunction()