Index: trunk/MagicSoft/Mars/mjobs/MJCut.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCut.cc	(revision 7152)
+++ trunk/MagicSoft/Mars/mjobs/MJCut.cc	(revision 7169)
@@ -331,4 +331,5 @@
     write->AddContainer("MPointingPos",   "Events");
     write->AddContainer("MHillasSrcAnti", "Events", kFALSE);
+    write->AddContainer("MImagePar",      "Events", kFALSE);
     write->AddContainer("MNewImagePar",   "Events", kFALSE);
     write->AddContainer("MNewImagePar2",  "Events", kFALSE);
@@ -338,10 +339,4 @@
     write->AddContainer("MMcEvt",         "Events", kFALSE);
     write->AddContainer("DataType",       "Events");
-
-    // Should not be the default: Either as option, or as
-    // setup from resource file
-    // write.AddContainer("MHillasExt",    "Events");
-    // write.AddContainer("MImagePar",     "Events");
-    // write.AddContainer("MNewImagePar",  "Events");
 }
 
@@ -439,6 +434,8 @@
     // Possible source position (eg. Wobble Mode)
     MPointingPos source("MSourcePos");
-    if (set.GetSourcePos(source))
-    {
+    if (set.HasSource())
+    {
+        if (!set.GetSourcePos(source))
+            return kFALSE;
         plist.AddToList(&source);
         *fLog << inf << "Using Source Position: " << source.GetTitle() << endl;
Index: trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc	(revision 7152)
+++ trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc	(revision 7169)
@@ -637,5 +637,5 @@
     TString str;
     str += Form("(%.2f#pm%.2f)10^{%d}", p1/exp, e1/exp, np);
-    str += Form("(\\frac{E}{TeV})^{-%.2f#pm%.2f}", p0, e0);
+    str += Form("(\\frac{E}{TeV})^{%.2f#pm%.2f}", p0, e0);
     str += "\\frac{ph}{TeVm^{2}s}";
 
@@ -814,5 +814,5 @@
             TLatex tex;
             tex.SetBit(TLatex::kTextNDC);
-            tex.DrawLatex(0.7, 0.93, Form("P(\\chi^{2})=%.0f", p*100));
+            tex.DrawLatex(0.75, 0.93, Form("P(\\chi^{2})=%.0f%%", p*100));
         }
     }
@@ -1063,4 +1063,10 @@
     }
 
+    gLog.Separator("Energy Estimator");
+    if (plist.FindObject("EstimateEnergy"))
+        plist.FindObject("EstimateEnergy")->Print();
+
+    gLog.Separator("Spectrum");
+
     // -------------------------- Spectrum ----------------------------