Index: trunk/FACT++/src/Fits.cc
===================================================================
--- trunk/FACT++/src/Fits.cc	(revision 11440)
+++ trunk/FACT++/src/Fits.cc	(revision 11441)
@@ -258,6 +258,4 @@
 	}
 			
-	//As requested by Roland, the reference MjD is 0.0
-	fRefMjD = 0;//* static_cast<double*>(fStandardPointers[0]);
 	if (!updating)
 		return WriteHeaderKeys();
@@ -293,20 +291,21 @@
 bool Fits::WriteHeaderKeys()
 {
-	if (!fTable)
-		return false;
-
-        string stringValue = Time().GetAsStr();
-	stringValue[10]= 'T';
-
-	if (!WriteSingleHeaderKey("EXTREL", 1.0f, "Release Number")) return false;
-	if (!WriteSingleHeaderKey("TELESCOP", "FACT", "Telescope that acquired this data")) return false;
-	if (!WriteSingleHeaderKey("ORIGIN", "ISDC", "Institution that wrote the file")) return false;
-	if (!WriteSingleHeaderKey("CREATOR", "FACT++ DataLogger", "Program that wrote this file")) return false;
-	if (!WriteSingleHeaderKey("DATE", stringValue, "File creation data")) return false;
-	if (!WriteSingleHeaderKey("TIMESYS", "TT", "Time frame system")) return false;
-	if (!WriteSingleHeaderKey("TIMEUNIT", "d", "Time unit")) return false;
-	if (!WriteSingleHeaderKey("TIMEREF", "UTC", "Time reference frame")) return false;
-	if (!WriteSingleHeaderKey("MJDREF", fRefMjD, "Modified Julian Date of origin")) return false;
-	if (!WriteSingleHeaderKey("TSTOP", fEndMjD, "Time of the last receied data")) return false;
+    if (!fTable)
+        return false;
+
+    const Time now;
+    if (!WriteSingleHeaderKey("EXTREL",   1.0f, "Release Number")) return false;
+    if (!WriteSingleHeaderKey("TELESCOP", "FACT", "Telescope that acquired this data")) return false;
+    if (!WriteSingleHeaderKey("ORIGIN",   "ISDC", "Institution that wrote the file")) return false;
+    if (!WriteSingleHeaderKey("CREATOR",  "fadctrl", "Program that wrote this file (FACT++ datalogger)")) return false;
+    if (!WriteSingleHeaderKey("PACKAGE",   PACKAGE_NAME, "Package name")) return false;
+    if (!WriteSingleHeaderKey("VERSION",   PACKAGE_VERSION, "Package description")) return false;
+    if (!WriteSingleHeaderKey("COMPILED",  __DATE__" "__TIME__, "Compile time")) return false;
+    if (!WriteSingleHeaderKey("REVISION",  REVISION, "SVN revision")) return false;
+    if (!WriteSingleHeaderKey("DATE",     now.Iso(), "File creation date")) return false;
+    if (!WriteSingleHeaderKey("NIGHT",    now.NightAsInt(), "Night as int")) return false;
+    if (!WriteSingleHeaderKey("TIMESYS",  "UTC", "Time systen")) return false;
+    if (!WriteSingleHeaderKey("TSTART",   "", "Time of the first receied data")) return false;
+    if (!WriteSingleHeaderKey("TSTOP",    "", "Time of the last receied data")) return false;
     return true;
 }
@@ -360,5 +359,5 @@
     {
         const double doubleValue = *reinterpret_cast<double*>(fStandardPointers[0]);
-        WriteSingleHeaderKey("TSTART", doubleValue,
+        WriteSingleHeaderKey("TSTART", Time(doubleValue).Iso(),
                              "Time of the first received data");
     }
@@ -393,5 +392,5 @@
 //	    CCfits::FITS* backupFits = fFile;
 //	    fFile = NULL;
-	    WriteSingleHeaderKey("TSTOP", fEndMjD, "Time of the last receied data");
+	    WriteSingleHeaderKey("TSTOP", Time(fEndMjD).Iso(), "Time of the last receied data");
 	    delete fFile;
 
Index: trunk/FACT++/src/Fits.h
===================================================================
--- trunk/FACT++/src/Fits.h	(revision 11440)
+++ trunk/FACT++/src/Fits.h	(revision 11441)
@@ -47,6 +47,4 @@
 		///to keep track of the time of the latest written entry (to update the header when closing the file)
 		double fEndMjD;
-		///to keep track of the reference MjD
-		double fRefMjD;
 		///Write the FITS header keys
 		bool WriteHeaderKeys();
@@ -72,5 +70,4 @@
 					 fTotalNumBytes(0),
 					 fEndMjD(0.0),
-					 fRefMjD(0.0),
 					 fFileName(""),
 					 fNumOpenFitsFiles(NULL),
Index: trunk/FACT++/src/datalogger.cc
===================================================================
--- trunk/FACT++/src/datalogger.cc	(revision 11440)
+++ trunk/FACT++/src/datalogger.cc	(revision 11441)
@@ -2153,9 +2153,9 @@
 {
     //Init the time columns of the file
-    Description dateDesc(string("Time"), string("Modified Julian Date"), string("MjD"));
+    Description dateDesc(string("Time"), string("Modified Julian Date"), string("MJD"));
     sub.nightlyFile.AddStandardColumn(dateDesc, "1D", &fMjD, sizeof(double));
     sub.runFile.AddStandardColumn(dateDesc, "1D", &fMjD, sizeof(double));
 
-    Description QoSDesc("Qos", "Quality of service", "None");
+    Description QoSDesc("QoS", "Quality of service", "");
     sub.nightlyFile.AddStandardColumn(QoSDesc, "1J", &fQuality, sizeof(int));
     sub.runFile.AddStandardColumn(QoSDesc, "1J", &fQuality, sizeof(int));