Index: /trunk/FACT++/src/fadctrl.cc
===================================================================
--- /trunk/FACT++/src/fadctrl.cc	(revision 12234)
+++ /trunk/FACT++/src/fadctrl.cc	(revision 12235)
@@ -1067,4 +1067,5 @@
             fad.CmdSetRunNumber(runno);
             fad.Cmd(FAD::kCmdResetEventCounter);
+            fad.Cmd(FAD::kCmdTriggerLine, true);
             //fad.Cmd(FAD::kCmdSingleTrigger);
             //fad.Cmd(FAD::kCmdTriggerLine, true);
@@ -1395,5 +1396,5 @@
                 // and really sees the software trigger
                 // FIXME: Do we need this to be configurable?
-                if (Time()-fConfigTimer<boost::posix_time::milliseconds(100))
+                if (Time()-fConfigTimer<boost::posix_time::milliseconds(3000))
                     return FAD::kConfiguring1;
 
@@ -1425,5 +1426,5 @@
                     fad.Cmd(FAD::kCmdResetEventCounter);
                     fad.Cmd(FAD::kCmdSocket,      false);
-                    fad.Cmd(FAD::kCmdTriggerLine, true);
+                    //fad.Cmd(FAD::kCmdTriggerLine, true);
                     if (fTargetConfig->second.fContinousTrigger)
                         fad.Cmd(FAD::kCmdContTrigger, true);
@@ -1583,5 +1584,5 @@
             (bind(&StateMachineFAD::SetTriggerRate, this, placeholders::_1))
             ("Enable continous trigger");
-        T::AddEvent("SEND_SINGLE_TRIGGER", FAD::kConnecting, FAD::kConnected)
+        T::AddEvent("SEND_SINGLE_TRIGGER")
             (bind(&StateMachineFAD::Trigger, this, 1))
             ("Issue software triggers");
@@ -1990,5 +1991,4 @@
             return -1;
         }
-
         return -1;
     }
@@ -2010,8 +2010,8 @@
     po::options_description control("FAD control options");
     control.add_options()
-        ("quiet,q",    po_bool(),  "Disable printing contents of all received messages in clear text.")
-        ("hex-out",    po_bool(),  "Enable printing contents of all printed messages also as hex data.")
-        ("data-out",   po_bool(),  "Enable printing received event data.")
-        ("debug-tx",   po_bool(),  "Enable debugging of ethernet transmission.")
+        ("quiet,q",  po_bool(), "Disable printing contents of all received messages in clear text.")
+        ("hex-out",  po_bool(), "Enable printing contents of all printed messages also as hex data.")
+        ("data-out", po_bool(), "Enable printing received event data.")
+        ("debug-tx", po_bool(), "Enable debugging of ethernet transmission.")
         ;
 
@@ -2026,11 +2026,11 @@
     po::options_description builder("Event builder options");
     builder.add_options()
-        ("max-mem,m",  var<unsigned int>(100), "Maximum memory the event builder thread is allowed to consume for its event buffer")
+        ("max-mem,m",          var<unsigned int>(100), "Maximum memory the event builder thread is allowed to consume for its event buffer")
+        ("destination-folder", var<string>(""),        "Destination folder (base folder) for the event builder binary data files.")
         ;
-
 
     po::options_description runtype("Run type configuration");
     runtype.add_options()
-        ("run-type",                     vars<string>(),        "")
+        ("run-type",                     vars<string>(),        "Run type, e.g. data, pedestal, drs-calibration, light-pulser")
         ("enable-dwrite.*",              var<bool>(),           "")
         ("enable-drs.*",                 var<bool>(),           "")