diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index e9eb9eae4e1d8e0fe4c53d9d4608681cc0d44332..faba01bd177fa3db35a23e10761879b0a6de0142 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -307,7 +307,6 @@ void MainWindow::slotStartPlaying()
     // the thread was shutdown from the reset option
     extern_shutdown_visual_thread = false;
 
-
     if (!isPlaying) {
         statusBar()->showMessage(QString::fromUtf8("waiting for data"));
         //only start the visualisation thread if in offline modus
@@ -367,7 +366,6 @@ void MainWindow::slotStartPlaying()
 
     //no matter what, the stop button should be enabled
     ui.BtStop->setEnabled(true);
-
 }
 
 void MainWindow::slotStopPlaying()
@@ -959,7 +957,6 @@ void MainWindow::slotControlSequence(const char * sex)
 
 void MainWindow::resetGraphicalElements()
 {
-
     //restore play button
     QIcon icon1;
     icon1.addPixmap(QPixmap(
@@ -994,7 +991,7 @@ void MainWindow::resetGraphicalElements()
     ui.action3_D->setEnabled(true);
     ui.action2_D->setEnabled(true);
 
-    labelRecording->setText("rec: OFF");
+    labelRecording->setText("rec: off");
     statusBar()->showMessage(tr("select a File"));
 
     //resetting the start/stop recording action
diff --git a/src/SaxParser.cpp b/src/SaxParser.cpp
index e940617cde0cb34b9cca0c36399d7d639ed53a59..2b5d4b9348ad2940bc47bef414462c897923f17b 100644
--- a/src/SaxParser.cpp
+++ b/src/SaxParser.cpp
@@ -68,9 +68,6 @@
 
 using namespace std;
 
-OutputHandler* Log=NULL;
-
-
 /**
  * constructor
  *
@@ -579,10 +576,6 @@ void SaxParser::clearPoints()
 /// provided for convenience and will be removed in the next version
 bool SaxParser::parseGeometryJPS(QString fileName, FacilityGeometry *geometry)
 {
-
-    //    if(Log) delete Log;
-    Log = new FileHandler(SystemSettings::getLogfile().toStdString().c_str());
-
     double captionsColor=0;//red
     if(!fileName.endsWith(".xml",Qt::CaseInsensitive)) return false;
     QString wd;
@@ -628,7 +621,6 @@ bool SaxParser::parseGeometryJPS(QString fileName, FacilityGeometry *geometry)
             polygons->InsertNextCell(polygon);
 
             //plot the walls only for not stairs
-
             const vector<Wall>& walls= sub->GetAllWalls();
             for(unsigned int w=0; w<walls.size(); w++) {
                 Point p1 = walls[w].GetPoint1();
@@ -677,6 +669,13 @@ bool SaxParser::parseGeometryJPS(QString fileName, FacilityGeometry *geometry)
     polygonPolyData->SetPolys(polygons);
     geometry->addFloor(polygonPolyData);
 
+    // Create a PolyData to represen the obstacles
+    //TODO:
+    //VTK_CREATE(vtkPolyData, polygonPolyData);
+    //polygonPolyData->SetPoints(points);
+    //polygonPolyData->SetPolys(polygons);
+    //geometry->addFloor(polygonPolyData);
+
 
     // add the crossings
     const map<int, Crossing*>& crossings=building->GetAllCrossings();
diff --git a/src/SystemSettings.cpp b/src/SystemSettings.cpp
index 7c5b9454136fb1b1278fc9ec40094dfe009a3fba..65de97526602fb1ebc4cc591425cee9068607c13 100644
--- a/src/SystemSettings.cpp
+++ b/src/SystemSettings.cpp
@@ -84,7 +84,7 @@ QString SystemSettings::filesPrefix="";
 QString SystemSettings::logfile="log.txt";
 
 //the log file is writting by a different module
-extern OutputHandler* Log;
+OutputHandler* Log=NULL;
 
 
 SystemSettings::SystemSettings() {}
@@ -382,6 +382,7 @@ void SystemSettings::CreateLogfile()
     }
 
     logfile = outputDir+"log_"+QDateTime::currentDateTime().toString("yyMMdd_hh_mm_").append(SystemSettings::getFilenamePrefix()).append(".txt");
+    Log = new FileHandler(logfile.toStdString().c_str());
 }
 
 QString &SystemSettings::getLogfile()
diff --git a/src/ThreadVisualisation.cpp b/src/ThreadVisualisation.cpp
index 2688d607744e4dda42c922f3eb337f4da87f98ca..b3bfdfbd9e12033061a3b349fd03888c53db8e0b 100644
--- a/src/ThreadVisualisation.cpp
+++ b/src/ThreadVisualisation.cpp
@@ -359,7 +359,7 @@ void ThreadVisualisation::run()
 
 
     //emit signalStatusMessage("Idle");
-    emit signal_controlSequences("CONTROL_RESET");
+    //emit signal_controlSequences("CONTROL_RESET");
 
 
     //clear some stuffs