Index: /trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- /trunk/FACT++/src/EventBuilderWrapper.h	(revision 11650)
+++ /trunk/FACT++/src/EventBuilderWrapper.h	(revision 11651)
@@ -1377,6 +1377,9 @@
 	const array<uint16_t,2> roi = {{ event->Roi, event->RoiTM }};
 
-        if (roi!=fVecRoi)
+	if (roi!=fVecRoi)
+	{
 	    Update(fDimRoi, roi);
+	    fVecRoi = roi;
+	}
 
         const FAD::EventHeader *beg = reinterpret_cast<FAD::EventHeader*>(fadhd);
@@ -1386,6 +1389,6 @@
         {
             // Event incomplete
-            if (ptr->fStartDelimiter==0)
-                return -1;
+            //if (ptr->fStartDelimiter==0)
+            //    return -1;
 
                 // Either one of
Index: /trunk/FACT++/src/HeadersFAD.cc
===================================================================
--- /trunk/FACT++/src/HeadersFAD.cc	(revision 11650)
+++ /trunk/FACT++/src/HeadersFAD.cc	(revision 11651)
@@ -21,5 +21,5 @@
     out << "Time:       " << setprecision(3) << fixed << fTimeStamp/10000. << "s" << endl;
     out << "EvtCounter: " << fEventCounter << " of " << fNumTriggersToGenerate << endl;
-    out << "Trigger:    Type=" << fTriggerType << " Id=" << fTriggerId << " Crc=0x" << hex << fTriggerCrc << endl;
+    out << "Trigger:    Type=" << fTriggerType << " Counter=" << fTriggerCounter << " Crc=0x" << hex << fTriggerCrc << endl;
 
     out << "RefClock:   " << dec << fFreqRefClock << endl;
@@ -63,7 +63,7 @@
     out << "  Busy enabled:              ";
     if (HasBusyOn())
-        out << "continously enabled" << endl;
+        out << "constantly enabled" << endl;
     else
-        out << (HasBusyOff()?"continously disabled":"normal") << endl;
+        out << (HasBusyOff()?"constantly disabled":"normal") << endl;
     out << "  Trigger line enabled:      " << (HasTriggerEnabled()?"enabled":"disabled") << endl;
     out << "  Continous trigger enabled: " << (HasContTriggerEnabled()?"enabled":"disabled") << endl;
Index: /trunk/FACT++/src/HeadersFAD.h
===================================================================
--- /trunk/FACT++/src/HeadersFAD.h	(revision 11650)
+++ /trunk/FACT++/src/HeadersFAD.h	(revision 11651)
@@ -169,5 +169,5 @@
         uint16_t fTriggerCrc;          // Receiver timeout / CRC ; 1 byte each
         uint16_t fTriggerType;
-        uint32_t fTriggerId;
+        uint32_t fTriggerCounter;
         //
         uint32_t fEventCounter;
@@ -204,8 +204,8 @@
             Reverse(&fEventCounter);
 
-	    Reverse(((uint16_t*)fTriggerId));
-            Reverse(((uint16_t*)fTriggerId)+1);
-
-            Reverse(&fTriggerId);
+	    Reverse(((uint16_t*)fTriggerCounter));
+            Reverse(((uint16_t*)fTriggerCounter)+1);
+
+            Reverse(&fTriggerCounter);
 
             Reverse(((uint16_t*)fFreqRefClock));
Index: /trunk/FACT++/src/fad.cc
===================================================================
--- /trunk/FACT++/src/fad.cc	(revision 11650)
+++ /trunk/FACT++/src/fad.cc	(revision 11651)
@@ -129,5 +129,5 @@
         fHeader.fPackageLength = sizeof(EventHeader)/2+1;
         fHeader.fEventCounter++;
-        fHeader.fTriggerId = triggerid;
+        fHeader.fTriggerCounter = triggerid;
         fHeader.fTimeStamp = uint32_t((Time(Time::utc).UnixTime()-fStartTime)*10000);
         fHeader.fFreqRefClock = 997+rand()/(RAND_MAX/7);