Index: trunk/FACT++/src/Main.h
===================================================================
--- trunk/FACT++/src/Main.h	(revision 12955)
+++ trunk/FACT++/src/Main.h	(revision 12956)
@@ -1,4 +1,4 @@
-#ifndef FACT_MAIN
-#define FACT_MAIN
+#ifndef FACT_Main
+#define FACT_Main
 
 #include <map>
@@ -6,9 +6,18 @@
 #include <functional>
 
-#include "LocalControl.h"
+#include <boost/filesystem.hpp>
+
+#include "Dim.h"
+#include "Time.h"
+#include "MainImp.h"
+#include "Readline.h"
+#include "WindowLog.h"
+#include "MessageImp.h"
 #include "Configuration.h"
 
 namespace Main
 {
+    using namespace std;
+
     void SetupConfiguration(Configuration &conf)
     {
@@ -24,5 +33,5 @@
             ("console,c",  var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
             ("cmd",        vars<string>(), "Execute one or more commands at startup")
-            ("exec,e",     vars<string>(), "Execute one or more scrips at startup")
+            ("exec,e",     vars<string>(), "Execute one or more scrips at startup ('file:N' - start at label N)")
             ("quit",       po_switch(),    "Quit after startup");
         ;
@@ -32,4 +41,15 @@
 
         conf.AddOptions(config);
+    }
+
+    void PrintUsage()
+    {
+        cout <<
+            "Files:\n"
+            "The following files are written by each program by default\n"
+            "  program.evt:   A log of all executed of skipped events\n"
+            "  program.his:   The history accessible by Pg-up/dn\n"
+            "  program.log:   All output piped to the log-stream"
+            << endl;
     }
 
@@ -49,5 +69,5 @@
     }
 
-    void Thread(StateMachineImp *io_service, bool dummy)
+    void Thread(MainImp *io_service, bool dummy)
     {
         // This is necessary so that the StateMachien Thread can signal the
Index: trunk/FACT++/src/StateMachineImp.h
===================================================================
--- trunk/FACT++/src/StateMachineImp.h	(revision 12955)
+++ trunk/FACT++/src/StateMachineImp.h	(revision 12956)
@@ -7,4 +7,5 @@
 #include <vector>
 
+#include "MainImp.h"
 #include "MessageImp.h"
 
@@ -12,5 +13,5 @@
 class EventImp;
 
-class StateMachineImp : public MessageImp
+class StateMachineImp : public MainImp, public MessageImp
 {
 public: