diff --git a/CMakeLists.txt b/CMakeLists.txt
index a79f9e2bc66af19ae493d9d1ad6fb57ffd4726b6..7f9fc32ce66f29b775f1de204c696d94fd9e7f09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ IF (POLICY CMP0054)
 ENDIF (POLICY CMP0054)
 set(JPSCORE_MAJOR_VERSION 0)
 set(JPSCORE_MINOR_VERSION 8)
-set(JPSCORE_PATCH_VERSION 3)
+set(JPSCORE_PATCH_VERSION 4)
 set(JPSCORE_VERSION
   ${JPSCORE_MAJOR_VERSION}.${JPSCORE_MINOR_VERSION}.${JPSCORE_PATCH_VERSION})
 
@@ -283,7 +283,6 @@ set(source_files
   IO/TraVisToClient.cpp
 
   math/ForceModel.cpp
-  math/Mathematics.cpp
   math/ODESolver.cpp
   math/GCFMModel.cpp
   math/GompertzModel.cpp
@@ -487,7 +486,6 @@ set(header_files
 
   general/ArgumentParser.h
   general/Configuration.h
-  general/Macros.h
   general/randomnumbergenerator.h
 
   IO/GeoFileParser.h
@@ -579,7 +577,7 @@ if(JPSFIRE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJPSFIRE")
 endif()
 
-add_library(geo STATIC ${GEOMETRY_SRC})
+add_library(geo STATIC ${GEOMETRY_SRC} math/Mathematics.cpp   general/Macros.h)
 # add_library(ped STATIC ${PED_SRC})
 add_library(core STATIC ${source_files} ${PED_SRC})
 
@@ -744,7 +742,7 @@ if (BUILD_TESTING OR BUILD_CPPUNIT_TEST)
     MATH(EXPR ini_counter "${ini_counter}+1")
     set(testName "test_clean_geometry_${ini_counter}")
     message(STATUS "Add test "  ${SPACES} ${counter} "  : " ${testName})
-    add_test(NAME "${testName}" COMMAND jpscore "${cgeo-ini}")
+    add_test(NAME ${testName} COMMAND jpscore ${cgeo-ini})
   endforeach()
 
 
diff --git a/Simulation.cpp b/Simulation.cpp
index 127bf557f8686862a1bfe5fad50cafc321d9f37f..bf89f575e4ee810548ae4aaae817f247d8a064f8 100644
--- a/Simulation.cpp
+++ b/Simulation.cpp
@@ -437,6 +437,7 @@ double Simulation::RunBody(double maxSimTime)
     //in the case you want to run in no faster than realtime
     //time_t starttime, endtime;
     //time(&starttime);
+     Log->Write("INFO: run body");
 
     //take the current time from the pedestrian
     double t = Pedestrian::GetGlobalTime();
@@ -470,6 +471,7 @@ double Simulation::RunBody(double maxSimTime)
     // main program loop
     while ((_nPeds || (!_agentSrcManager.IsCompleted()&& _gotSources) ) && t<maxSimTime) {
         t = 0+(frameNr-1)*_deltaT;
+        Log->Write("INFO: t %f", t);
         //process the queue for incoming pedestrians
         ProcessAgentsQueue();