--- src/help.c.bak	2011-05-20 17:38:54.628997583 +0200
+++ src/help.c	2011-05-20 18:16:56.273274951 +0200
@@ -451,104 +451,115 @@
   
     
   (void) fprintf( stdout, 
-		  "Usage is: spacezero [-options]\n" );
+		  "Usage is: spacezero [GENERAL OPTIONS] [GAME OPTIONS]\n" );
   (void) fprintf( stdout, 
-		  "possible options:  h n p g l k nosound nomusic cooperative compcooperative queen nopirates s c ip port name f geom\n");
+		  "          spacezero [GENERAL OPTIONS] -s [MULTIPLAYER OPTIONS] [GAME OPTIONS]\n" );
   (void) fprintf( stdout, 
-		  "\nOptions:\n-h \t this help.\n" );
+		  "          spacezero [GENERAL OPTIONS] -c [MULTIPLAYER OPTIONS]\n" );
   (void) fprintf( stdout, 
-		  "-n n\t where n is the number of planets.(default %d)\n",NUMPLANETS);
+		  "          spacezero -h\n" );
   (void) fprintf( stdout, 
-		  "-p n\t where n is the number of players.(default %d)\n",NUMPLAYERS);
+		  "\n-s\t\t server mode (multiplayer).\n" );
   (void) fprintf( stdout, 
-		  "-g n\t where n is the number of galaxies.(default %d)\n",NUMGALAXIES);
+		  "-c\t\t client mode (multiplayer).\n" );
   (void) fprintf( stdout, 
-		  "-l n\t where n is the size of the Universe.\n" );
+		  "-h\t\t this help.\n" );
   (void) fprintf( stdout, 
-		  "-k \t planets are known by all the players.\n" );
-
+		  "\nGENERAL OPTIONS:\n" );
   (void) fprintf( stdout, 
-		  "-nosound \t sound disabled.\n" );
+		  "-nosound\t sound disabled.\n" );
   (void) fprintf( stdout, 
-		  "-nomusic \t music disabled.\n" );
+		  "-nomusic\t music disabled.\n" );
   (void) fprintf( stdout, 
-		  "-cooperative \t cooperative mode.\n" );
+		  "-name playername where playername is the name of the player.\n" );
   (void) fprintf( stdout, 
-		  "-compcooperative \t computer cooperative mode.\n" );
+		  "-f font\t\t change the default font by font.\n" );
   (void) fprintf( stdout, 
-		  "-queen \t Queen mode.\n" );
+		  "\nGAME OPTIONS:\n" );
   (void) fprintf( stdout, 
-		  "-nopirates \t Dont add a team of pirates.\n" );
+		  "-geom WIDTHxHEIGHT define the size of the main window.\n" );
   (void) fprintf( stdout, 
-		  "-s,c \t server,client mode.\n" );
+		  "-n n\t\t where n is the number of planets.(default %d)\n",NUMPLANETS);
   (void) fprintf( stdout, 
-		  "-ip IP\t where IP is the ip of the server.\n" );
+		  "-p n\t\t where n is the number of players.(default %d)\n",NUMPLAYERS);
   (void) fprintf( stdout, 
-		  "-port n  where n is the port used for communication.\n" );
+		  "-g n\t\t where n is the number of galaxies.(default %d)\n",NUMGALAXIES);
   (void) fprintf( stdout, 
-		  "-name playername where playername is the name of the player.\n" );
+		  "-l n\t\t where n is the size of the Universe.\n" );
+  (void) fprintf( stdout, 
+		  "-k\t\t planets are known by all the players.\n" );
+  (void) fprintf( stdout, 
+		  "-cooperative\t cooperative mode (all humans allied).\n" );
+  (void) fprintf( stdout, 
+		  "-compcooperative computer cooperative mode (all computers allied).\n" );
+  (void) fprintf( stdout, 
+		  "-queen\t\t Queen mode.\n" );
+  (void) fprintf( stdout, 
+		  "-nopirates\t Dont add a team of pirates.\n" );
+  (void) fprintf( stdout, 
+		  "\nMULTIPLAYER OPTIONS:\n" );
   (void) fprintf( stdout, 
-		  "-f font\t change the default font by font.\n" );
+		  "-ip IP\t\t where IP is the ip of the server.(default %s)\n",DEFAULT_IP);
   (void) fprintf( stdout, 
-		  "-geom widthxheigth define the size of the main window.\n" );
+		  "-port n\t\t where n and n+1 are the tcp ports used.(default %d)\n",DEFAULT_PORT);
   (void) fprintf( stdout, 
 		  "\nKeyboard controls:\n==================\n");
   (void) fprintf( stdout, 
-		  "up arrow\taccelerate.\n");
+		  "up arrow\t accelerate.\n");
   (void) fprintf( stdout, 
-		  "left,right arrows\tturn left right.\n");
+		  "left,right arrows turn left right.\n");
   (void) fprintf( stdout, 
-		  "space\t\tfire.\n");
+		  "space\t\t fire.\n");
   (void) fprintf( stdout, 
-		  "tab\t\tchange to next ship.\n");
+		  "tab\t\t change to next ship.\n");
   (void) fprintf( stdout, 
-		  "Ctrl-tab\tchange to previous ship.\n");
+		  "Ctrl-tab\t change to previous ship.\n");
   (void) fprintf( stdout, 
-		  "PageUp\t\tchange to next planet.\n");
+		  "PageUp\t\t change to next planet.\n");
   (void) fprintf( stdout, 
-		  "PageDown\t\tchange to previous planet.\n");
+		  "PageDown\t change to previous planet.\n");
   (void) fprintf( stdout, 
-		  "Home\t\tchange to first ship in outer space.\n");
+		  "Home\t\t change to first ship in outer space.\n");
   (void) fprintf( stdout, 
-		  "1 2 3\t\tchoose weapon.\n");
+		  "1 2 3\t\t choose weapon.\n");
   (void) fprintf( stdout, 
-		  "Ctrl-[f1f2f3f4]\tmark a ship to be selected.\n");
+		  "Ctrl-[f1f2f3f4]\t mark a ship to be selected.\n");
   (void) fprintf( stdout, 
-		  "f1 f2 f3 f4\tselect a previous marked ship.\n");
+		  "f1 f2 f3 f4\t select a previous marked ship.\n");
   (void) fprintf( stdout, 
-		  "f5\t\tshow a ship list.\n");
+		  "f5\t\t show a ship list.\n");
   (void) fprintf( stdout, 
-		  "f6\t\tshow game statistics.\n");
+		  "f6\t\t show game statistics.\n");
   (void) fprintf( stdout, 
-		  "o\t\tenter in order menu.\n");
+		  "o\t\t enter in order menu.\n");
   (void) fprintf( stdout, 
-		  "Esc\t\texit from order menu.\n");
+		  "Esc\t\t exit from order menu.\n");
   (void) fprintf( stdout, 
-		  "m\t\tshow space map.\n");
+		  "m\t\t show space map.\n");
   (void) fprintf( stdout, 
-		  "a i\t\tautomatic-manual mode.\n");
+		  "a i\t\t automatic-manual mode.\n");
   (void) fprintf( stdout, 
-		  "n\t\twindow, ship mode view.\n");
+		  "n\t\t window, ship mode view.\n");
   (void) fprintf( stdout, 
-		  "p\t\tpause game\n");
+		  "p\t\t pause game\n");
   (void) fprintf( stdout, 
-		  "Ctrl-s\t\tsave the game.\n");
+		  "Ctrl-s\t\t save the game.\n");
   (void) fprintf( stdout, 
-		  "Ctrl-l\t\tload the saved game.\n");
+		  "Ctrl-l\t\t load the saved game.\n");
   (void) fprintf( stdout, 
-		  "Ctrl-q\t\tquit game.\n");
+		  "Ctrl-q\t\t quit game.\n");
   (void) fprintf( stdout, 
 		  "\nIn map view:\n------------\n");
   (void) fprintf( stdout, 
-		  "z Z\t\tzoom in out.\n");
+		  "z Z\t\t zoom in out.\n");
   (void) fprintf( stdout, 
-		  "arrow keys\tmove map.\n");
+		  "arrow keys\t move map.\n");
   (void) fprintf( stdout, 
-		  "space\t\tcenter map in the actual ship.\n");
+		  "space\t\t center map in the actual ship.\n");
   (void) fprintf( stdout, 
-		  "mouse pointer\tshow coordinates.\n");
+		  "mouse pointer\t show coordinates.\n");
   (void) fprintf( stdout, 
-		  "l\t\tshow-hide labels.\n");
+		  "l\t\t show-hide labels.\n");
 
   (void) fprintf( stdout,
 		  "\nversion: %s",ver);