Index: trunk/MagicSoft/Mars/callisto.cc
===================================================================
--- trunk/MagicSoft/Mars/callisto.cc	(revision 8682)
+++ trunk/MagicSoft/Mars/callisto.cc	(revision 8683)
@@ -202,4 +202,5 @@
     if (arg.GetNumArguments()!=1)
     {
+        gLog << warn << "WARNING - Wrong number of arguments..." << endl;
         Usage();
         return 2;
Index: trunk/MagicSoft/Mars/ganymed.cc
===================================================================
--- trunk/MagicSoft/Mars/ganymed.cc	(revision 8682)
+++ trunk/MagicSoft/Mars/ganymed.cc	(revision 8683)
@@ -163,4 +163,5 @@
     if (arg.GetNumArguments()!=1)
     {
+        gLog << warn << "WARNING - Wrong number of arguments..." << endl;
         Usage();
         return 2;
Index: trunk/MagicSoft/Mars/mars.cc
===================================================================
--- trunk/MagicSoft/Mars/mars.cc	(revision 8682)
+++ trunk/MagicSoft/Mars/mars.cc	(revision 8683)
@@ -52,9 +52,8 @@
     gLog << "             sequence (datacenter default if omitted)." << endl << endl;
     gLog << " Options:" << endl;
+    gLog << "   --config=mars.rc:         Change configuration file" << endl;
+    gLog << "                             <not yet implemented!>" << endl;
     gLog.Usage();
-    gLog << "   --config=mars.rc: Change configuration file" << endl;
-    gLog << "                     <not yet implemented!>" << endl;
-    gLog.Usage();
-    gLog << "     -?/-h: This help" << endl << endl;
+    gLog << "   -?/-h:                    This help" << endl << endl;
 }
 
@@ -85,4 +84,6 @@
         return 0xff;
 
+    MLog::RedirectErrorHandler(MLog::kColor);
+
     //
     // Evaluate arguments
@@ -93,5 +94,8 @@
     StartUpMessage();
 
-    if (arg.HasOption("-?") || arg.HasOption("-h") || arg.GetNumArguments()>1)
+    if (arg.HasOnly("-V") || arg.HasOnly("--version"))
+        return 0;
+
+    if (arg.HasOnly("-?") || arg.HasOnly("-h") || arg.HasOnly("--help"))
     {
         Usage();
@@ -115,4 +119,5 @@
     if (arg.GetNumArguments()>2)
     {
+        gLog << warn << "WARNING - Too many arguments..." << endl;
         Usage();
         return 2;
@@ -122,6 +127,6 @@
     // This is to make argv[i] more readable inside the code
     //
-    TString kFilename = arg.GetArgumentStr(0);
-    TString kInpathD  = arg.GetArgumentStr(1);
+    const TString kFilename = arg.GetArgumentStr(0);
+    const TString kInpathD  = arg.GetArgumentStr(1);
 
     //if (!kIsSequence && !InflateRun(kFilename))
@@ -183,4 +188,2 @@
     return 0;
 }
- 
-
Index: trunk/MagicSoft/Mars/showplot.cc
===================================================================
--- trunk/MagicSoft/Mars/showplot.cc	(revision 8682)
+++ trunk/MagicSoft/Mars/showplot.cc	(revision 8683)
@@ -171,4 +171,5 @@
     if (arg.GetNumArguments()<1 || arg.GetNumArguments()>2)
     {
+        gLog << warn << "WARNING - Wrong number of arguments..." << endl;
         Usage();
         return 2;
@@ -176,4 +177,5 @@
     if (arg.GetNumArguments()==2 && !arg.GetArgumentStr(1).IsDigit())
     {
+        gLog << warn << "WARNING - First argument must not be a number..." << endl;
         Usage();
         return 2;
Index: trunk/MagicSoft/Mars/sponde.cc
===================================================================
--- trunk/MagicSoft/Mars/sponde.cc	(revision 8682)
+++ trunk/MagicSoft/Mars/sponde.cc	(revision 8683)
@@ -132,4 +132,5 @@
     if (arg.GetNumArguments()<2 || arg.GetNumArguments()>3)
     {
+        gLog << warn << "WARNING - Wrong number of arguments..." << endl;
         Usage();
         return 2;
Index: trunk/MagicSoft/Mars/star.cc
===================================================================
--- trunk/MagicSoft/Mars/star.cc	(revision 8682)
+++ trunk/MagicSoft/Mars/star.cc	(revision 8683)
@@ -145,4 +145,5 @@
     if (arg.GetNumArguments()!=1)
     {
+        gLog << warn << "WARNING - Wrong number of arguments..." << endl;
         Usage();
         return 2;