diff --git a/source/cd_dos.c b/source/cd_dos.c
index 4902386..179b3f6 100644
--- a/source/cd_dos.c
+++ b/source/cd_dos.c
@@ -842,19 +842,19 @@ CDAudio_Init (void)
 		enabled = false;
 	}
 
-	Cmd_AddCommand ("cd", CD_f, "Control the CD player.
-Commands:
-eject - Eject the CD.
-info - Reports information on the CD.
-loop (track number) - Loops the specified track.
-remap (track1) (track2) ... - Remap the current track order.
-reset - Causes the CD audio to re-initialize.
-resume - Will resume playback after pause.
-off - Shuts down the CD audio system..
-on - Re-enables the CD audio system after a cd off command.
-pause - Pause the CD playback.
-play (track number) - Plays the specified track one time.
-stop - Stops the currently playing track.");
+	Cmd_AddCommand ("cd", CD_f, "Control the CD player.\n"
+		"Commands:\n"
+		"eject - Eject the CD.\n"
+		"info - Reports information on the CD.\n"
+		"loop (track number) - Loops the specified track.\n"
+		"remap (track1) (track2) ... - Remap the current track order.\n"
+		"reset - Causes the CD audio to re-initialize.\n"
+		"resume - Will resume playback after pause.\n"
+		"off - Shuts down the CD audio system..\n"
+		"on - Re-enables the CD audio system after a cd off command.\n"
+		"pause - Pause the CD playback.\n"
+		"play (track number) - Plays the specified track one time.\n"
+		"stop - Stops the currently playing track.");
 
 	Con_Printf ("CD Audio Initialized\n");
 
diff --git a/source/cd_linux.c b/source/cd_linux.c
index b480463..6427401 100644
--- a/source/cd_linux.c
+++ b/source/cd_linux.c
@@ -426,7 +426,19 @@ CDAudio_Init (void)
 		cdValid = false;
 	}
 
-	Cmd_AddCommand ("cd", CD_f, "No Description");
+	Cmd_AddCommand ("cd", CD_f, "Control the CD player.\n"
+		"Commands:\n"
+		"eject - Eject the CD.\n"
+		"info - Reports information on the CD.\n"
+		"loop (track number) - Loops the specified track.\n"
+		"remap (track1) (track2) ... - Remap the current track order.\n"
+		"reset - Causes the CD audio to re-initialize.\n"
+		"resume - Will resume playback after pause.\n"
+		"off - Shuts down the CD audio system..\n"
+		"on - Re-enables the CD audio system after a cd off command.\n"
+		"pause - Pause the CD playback.\n"
+		"play (track number) - Plays the specified track one time.\n"
+		"stop - Stops the currently playing track.");
 
 	Con_Printf ("CD Audio Initialized\n");
 
diff --git a/source/cd_sdl.c b/source/cd_sdl.c
index 8b3485e..16758f3 100644
--- a/source/cd_sdl.c
+++ b/source/cd_sdl.c
@@ -198,7 +198,21 @@ CDAudio_Init (void)
 		Con_Printf ("CDAudio_Init: CD contains no audio tracks.\n");
 		cdValid = false;
 	}
-	Cmd_AddCommand ("cd", CD_f, "No Description");
+	
+	Cmd_AddCommand ("cd", CD_f, "Control the CD player.\n"
+		"Commands:\n"
+		"eject - Eject the CD.\n"
+		"info - Reports information on the CD.\n"
+		"loop (track number) - Loops the specified track.\n"
+		"remap (track1) (track2) ... - Remap the current track order.\n"
+		"reset - Causes the CD audio to re-initialize.\n"
+		"resume - Will resume playback after pause.\n"
+		"off - Shuts down the CD audio system..\n"
+		"on - Re-enables the CD audio system after a cd off command.\n"
+		"pause - Pause the CD playback.\n"
+		"play (track number) - Plays the specified track one time.\n"
+		"stop - Stops the currently playing track.");
+	
 	Con_Printf ("CD Audio Initialized.\n");
 	return 0;
 }
diff --git a/source/cd_sgi.c b/source/cd_sgi.c
index 71226bc..3147206 100644
--- a/source/cd_sgi.c
+++ b/source/cd_sgi.c
@@ -324,7 +324,19 @@ CDAudio_Init (void)
 	initialized = true;
 	enabled = true;
 
-	Cmd_AddCommand ("cd", CD_f, "No Description");
+	Cmd_AddCommand ("cd", CD_f, "Control the CD player.\n"
+		"Commands:\n"
+		"eject - Eject the CD.\n"
+		"info - Reports information on the CD.\n"
+		"loop (track number) - Loops the specified track.\n"
+		"remap (track1) (track2) ... - Remap the current track order.\n"
+		"reset - Causes the CD audio to re-initialize.\n"
+		"resume - Will resume playback after pause.\n"
+		"off - Shuts down the CD audio system..\n"
+		"on - Re-enables the CD audio system after a cd off command.\n"
+		"pause - Pause the CD playback.\n"
+		"play (track number) - Plays the specified track one time.\n"
+		"stop - Stops the currently playing track.");
 
 	Con_Printf ("CD Audio Initialized\n");
 
diff --git a/source/cd_win.c b/source/cd_win.c
index a00959d..e25b776 100644
--- a/source/cd_win.c
+++ b/source/cd_win.c
@@ -482,7 +482,19 @@ CDAudio_Init (void)
 		enabled = false;
 	}
 
-	Cmd_AddCommand ("cd", CD_f, "No Description");
+	Cmd_AddCommand ("cd", CD_f, "Control the CD player.\n"
+		"Commands:\n"
+		"eject - Eject the CD.\n"
+		"info - Reports information on the CD.\n"
+		"loop (track number) - Loops the specified track.\n"
+		"remap (track1) (track2) ... - Remap the current track order.\n"
+		"reset - Causes the CD audio to re-initialize.\n"
+		"resume - Will resume playback after pause.\n"
+		"off - Shuts down the CD audio system..\n"
+		"on - Re-enables the CD audio system after a cd off command.\n"
+		"pause - Pause the CD playback.\n"
+		"play (track number) - Plays the specified track one time.\n"
+		"stop - Stops the currently playing track.");
 
 //  Con_Printf("CD Audio Initialized\n");
 
diff --git a/source/cl_cmd.c b/source/cl_cmd.c
index a07f5d5..79cffae 100644
--- a/source/cl_cmd.c
+++ b/source/cl_cmd.c
@@ -123,5 +123,13 @@ cl_Cmd_Init (void)
 //
 // register our commands
 //
-	Cmd_AddCommand ("cmd", Cmd_ForwardToServer_f, "No Description");
+	Cmd_AddCommand ("cmd", Cmd_ForwardToServer_f, "Send a command to the server.\n"
+		"Commands:\n"
+		"download - Same as the command.\n"
+		"kill - Same as the command.\n"
+		"msg (value) - Same as the command.\n"
+		"prespawn (entity) (spot) - Find a spawn spot for the player entity.\n"
+		"spawn (entity) - Spawn the player entity.\n"
+		"setinfo - Same as the command.\n"
+		"serverinfo - Same as the command.");
 }
diff --git a/source/cl_input.c b/source/cl_input.c
index d451d9a..49f49e9 100644
--- a/source/cl_input.c
+++ b/source/cl_input.c
@@ -707,41 +707,41 @@ CL_InitInput
 void
 CL_Input_Init (void)
 {
-	Cmd_AddCommand ("+moveup", IN_UpDown, "No Description");
-	Cmd_AddCommand ("-moveup", IN_UpUp, "No Description");
-	Cmd_AddCommand ("+movedown", IN_DownDown, "No Description");
-	Cmd_AddCommand ("-movedown", IN_DownUp, "No Description");
-	Cmd_AddCommand ("+left", IN_LeftDown, "No Description");
-	Cmd_AddCommand ("-left", IN_LeftUp, "No Description");
-	Cmd_AddCommand ("+right", IN_RightDown, "No Description");
-	Cmd_AddCommand ("-right", IN_RightUp, "No Description");
-	Cmd_AddCommand ("+forward", IN_ForwardDown, "No Description");
-	Cmd_AddCommand ("-forward", IN_ForwardUp, "No Description");
-	Cmd_AddCommand ("+back", IN_BackDown, "No Description");
-	Cmd_AddCommand ("-back", IN_BackUp, "No Description");
-	Cmd_AddCommand ("+lookup", IN_LookupDown, "No Description");
-	Cmd_AddCommand ("-lookup", IN_LookupUp, "No Description");
-	Cmd_AddCommand ("+lookdown", IN_LookdownDown, "No Description");
-	Cmd_AddCommand ("-lookdown", IN_LookdownUp, "No Description");
-	Cmd_AddCommand ("+strafe", IN_StrafeDown, "No Description");
-	Cmd_AddCommand ("-strafe", IN_StrafeUp, "No Description");
-	Cmd_AddCommand ("+moveleft", IN_MoveleftDown, "No Description");
-	Cmd_AddCommand ("-moveleft", IN_MoveleftUp, "No Description");
-	Cmd_AddCommand ("+moveright", IN_MoverightDown, "No Description");
-	Cmd_AddCommand ("-moveright", IN_MoverightUp, "No Description");
-	Cmd_AddCommand ("+speed", IN_SpeedDown, "No Description");
-	Cmd_AddCommand ("-speed", IN_SpeedUp, "No Description");
-	Cmd_AddCommand ("+attack", IN_AttackDown, "No Description");
-	Cmd_AddCommand ("-attack", IN_AttackUp, "No Description");
-	Cmd_AddCommand ("+use", IN_UseDown, "No Description");
-	Cmd_AddCommand ("-use", IN_UseUp, "No Description");
-	Cmd_AddCommand ("+jump", IN_JumpDown, "No Description");
-	Cmd_AddCommand ("-jump", IN_JumpUp, "No Description");
-	Cmd_AddCommand ("impulse", IN_Impulse, "No Description");
-	Cmd_AddCommand ("+klook", IN_KLookDown, "No Description");
-	Cmd_AddCommand ("-klook", IN_KLookUp, "No Description");
-	Cmd_AddCommand ("+mlook", IN_MLookDown, "No Description");
-	Cmd_AddCommand ("-mlook", IN_MLookUp, "No Description");
+	Cmd_AddCommand ("+moveup", IN_UpDown, "When active the player is swimming up in a liquid");
+	Cmd_AddCommand ("-moveup", IN_UpUp, "When active the player is not swimming up in a liquid");
+	Cmd_AddCommand ("+movedown", IN_DownDown, "When active the player is swimming down in a liquid");
+	Cmd_AddCommand ("-movedown", IN_DownUp, "When active the player is not swimming down in a liquid");
+	Cmd_AddCommand ("+left", IN_LeftDown, "When active the player is turning left");
+	Cmd_AddCommand ("-left", IN_LeftUp, "When active the player is not turning left");
+	Cmd_AddCommand ("+right", IN_RightDown, "When active the player is turning right");
+	Cmd_AddCommand ("-right", IN_RightUp, "When active the player is not turning right");
+	Cmd_AddCommand ("+forward", IN_ForwardDown, "When active the player is moving forward");
+	Cmd_AddCommand ("-forward", IN_ForwardUp, "When active the player is not moving forward");
+	Cmd_AddCommand ("+back", IN_BackDown, "When active the player is moving backwards");
+	Cmd_AddCommand ("-back", IN_BackUp, "When active the player is not moving backwards");
+	Cmd_AddCommand ("+lookup", IN_LookupDown, "When active the player's view is looking up");
+	Cmd_AddCommand ("-lookup", IN_LookupUp, "When active the player's view is not looking up");
+	Cmd_AddCommand ("+lookdown", IN_LookdownDown, "When active the player's view is looking down");
+	Cmd_AddCommand ("-lookdown", IN_LookdownUp, "When active the player's view is not looking up");
+	Cmd_AddCommand ("+strafe", IN_StrafeDown, "When active, +left and +right function like +moveleft and +moveright");
+	Cmd_AddCommand ("-strafe", IN_StrafeUp, "When active, +left and +right stop functioning like +moveleft and +moveright");
+	Cmd_AddCommand ("+moveleft", IN_MoveleftDown, "When active the player is strafing left");
+	Cmd_AddCommand ("-moveleft", IN_MoveleftUp, "When active the player is not strafing left");
+	Cmd_AddCommand ("+moveright", IN_MoverightDown, "When active the player is strafing right");
+	Cmd_AddCommand ("-moveright", IN_MoverightUp, "When active the player is not strafing right");
+	Cmd_AddCommand ("+speed", IN_SpeedDown, "When active the player is running");
+	Cmd_AddCommand ("-speed", IN_SpeedUp, "When active the player is not running");
+	Cmd_AddCommand ("+attack", IN_AttackDown, "When active player is firing/using current weapon");
+	Cmd_AddCommand ("-attack", IN_AttackUp, "When active player is not firing/using current weapon");
+	Cmd_AddCommand ("+use", IN_UseDown, "Non-functional. Left over command for opening doors and triggering switches");
+	Cmd_AddCommand ("-use", IN_UseUp, "Non-functional. Left over command for opening doors and triggering switches");
+	Cmd_AddCommand ("+jump", IN_JumpDown, "When active the player is jumping");
+	Cmd_AddCommand ("-jump", IN_JumpUp, "When active the player is not jumping");
+	Cmd_AddCommand ("impulse", IN_Impulse, "Call a game function or QuakeC function.");
+	Cmd_AddCommand ("+klook", IN_KLookDown, "When active, +forward and +back perform +lookup and +lookdown");
+	Cmd_AddCommand ("-klook", IN_KLookUp, "When active, +forward and +back don't perform +lookup and +lookdown");
+	Cmd_AddCommand ("+mlook", IN_MLookDown, "When active moving the mouse or joystick forwards and backwards performs +lookup and +lookdown");
+	Cmd_AddCommand ("-mlook", IN_MLookUp, "When active moving the mouse or joystick forwards and backwards doesn't perform +lookup and +lookdown");
 }
 
 void
diff --git a/source/cl_main.c b/source/cl_main.c
index fc393ab..645e8cc 100644
--- a/source/cl_main.c
+++ b/source/cl_main.c
@@ -1139,48 +1139,56 @@ CL_Init (void)
 // register our commands
 //
 
-	Cmd_AddCommand ("version", CL_Version_f, "No Description");
+	Cmd_AddCommand ("version", CL_Version_f, "Report version information");
 
-	Cmd_AddCommand ("changing", CL_Changing_f, "No Description");
-	Cmd_AddCommand ("disconnect", CL_Disconnect_f, "No Description");
-	Cmd_AddCommand ("record", CL_Record_f, "No Description");
-	Cmd_AddCommand ("rerecord", CL_ReRecord_f, "No Description");
-	Cmd_AddCommand ("stop", CL_Stop_f, "No Description");
-	Cmd_AddCommand ("playdemo", CL_PlayDemo_f, "No Description");
-	Cmd_AddCommand ("timedemo", CL_TimeDemo_f, "No Description");
+	Cmd_AddCommand ("changing", CL_Changing_f, "Used when maps are changing");
+	Cmd_AddCommand ("disconnect", CL_Disconnect_f, "Disconnect from server");
+	Cmd_AddCommand ("record", CL_Record_f, "Record a demo 'record filename server'");
+	Cmd_AddCommand ("rerecord", CL_ReRecord_f, "Rerecord a demo on the same server");
+	Cmd_AddCommand ("stop", CL_Stop_f, "Stop recording a demo");
+	Cmd_AddCommand ("playdemo", CL_PlayDemo_f, "Play a recorded demo");
+	Cmd_AddCommand ("timedemo", CL_TimeDemo_f, "Play a demo as fast as your hardware can. Useful for benchmarking.");
 
-	Cmd_AddCommand ("maplist", COM_Maplist_f, "No Description");
+	Cmd_AddCommand ("maplist", COM_Maplist_f, "List maps available");
 
-	Cmd_AddCommand ("quit", CL_Quit_f, "No Description");
+	Cmd_AddCommand ("quit", CL_Quit_f, "Exit the program");
 
-	Cmd_AddCommand ("connect", CL_Connect_f, "No Description");
-	Cmd_AddCommand ("reconnect", CL_Reconnect_f, "No Description");
+	Cmd_AddCommand ("connect", CL_Connect_f, "Connect to a server 'connect hostname:port'");
+	Cmd_AddCommand ("reconnect", CL_Reconnect_f, "Reconnect to the last server");
 
-	Cmd_AddCommand ("rcon", CL_Rcon_f, "No Description");
-	Cmd_AddCommand ("packet", CL_Packet_f, "No Description");
-	Cmd_AddCommand ("user", CL_User_f, "No Description");
-	Cmd_AddCommand ("users", CL_Users_f, "No Description");
+	Cmd_AddCommand ("rcon", CL_Rcon_f, "Issue the set of commands to the server you are currently connected to or have set in rcon_address");
+	Cmd_AddCommand ("packet", CL_Packet_f, "Send a packet with specified contents to the destination");
+	Cmd_AddCommand ("user", CL_User_f, "Queries the user for his setinfo information");
+	Cmd_AddCommand ("users", CL_Users_f, "Report information on connected players and retrieve user ids");
+	Cmd_AddCommand ("setinfo", CL_SetInfo_f, "Sets information about your QuakeWorld user.\n"
+		"Used without a key it will list all of your current settings.\n"
+		"Specifying a non-existent key and a value will create the new key.\n"
 
-	Cmd_AddCommand ("setinfo", CL_SetInfo_f, "No Description");
-	Cmd_AddCommand ("fullinfo", CL_FullInfo_f, "No Description");
-	Cmd_AddCommand ("fullserverinfo", CL_FullServerinfo_f, "No Description");
+		"Special Keys:\n"
+		"b_switch - Determines the highest weapon that Quake should switch to upon a backpack pickup.\n"
+		"w_switch - Determines the highest weapon that Quake should switch to upon a weapon pickup.");
+		
+	Cmd_AddCommand ("fullinfo", CL_FullInfo_f, "Used by QuakeSpy and Qlist to set setinfo variables");
+	Cmd_AddCommand ("fullserverinfo", CL_FullServerinfo_f, "Used by QuakeSpy and Qlist to obtain server variables");
 
-	Cmd_AddCommand ("download", CL_Download_f, "No Description");
+	Cmd_AddCommand ("download", CL_Download_f, "Manually download a quake file from the server");
 
-	Cmd_AddCommand ("nextul", CL_NextUpload, "No Description");
-	Cmd_AddCommand ("stopul", CL_StopUpload, "No Description");
+	Cmd_AddCommand ("nextul", CL_NextUpload, "Tells the client to send the next upload");
+	Cmd_AddCommand ("stopul", CL_StopUpload, "Tells the client to stop uploading");
 
 //
 // forward to server commands
 //
-	Cmd_AddCommand ("kill", NULL, "No Description");
-	Cmd_AddCommand ("pause", NULL, "No Description");
-	Cmd_AddCommand ("say", NULL, "No Description");
-	Cmd_AddCommand ("say_team", NULL, "No Description");
-	Cmd_AddCommand ("serverinfo", NULL, "No Description");
+	Cmd_AddCommand ("kill", NULL, "Suicide :)");
+	Cmd_AddCommand ("pause", NULL, "Pause the game");
+	Cmd_AddCommand ("say", NULL, "Say something to all other players");
+	Cmd_AddCommand ("say_team", NULL, "Say something only to people on your team");
+	Cmd_AddCommand ("serverinfo", NULL, "Report the current server info");
+
 }
 
 
+
 void
 CL_Init_Cvars (void)
 {
@@ -1262,10 +1270,8 @@ CL_Init_Cvars (void)
 	cl_solid_players = Cvar_Get ("cl_solid_players", "1", CVAR_NONE,
 								 "Are players solid? If off, you can walk through them with difficulty");
 
-	/* Misty: FIXME: Nobody knows exactly what this does. Someone has to find 
-	   out, proboably me. */
 	localid = Cvar_Get ("localid", "", CVAR_NONE,
-						"FIXME: nobody knows what this does.");
+						"FIXME: This has something to do with client authentication. No Description");
 
 	// 
 	// info mirrors
diff --git a/source/cmd.c b/source/cmd.c
index 5bc23fd..4928c16 100644
--- a/source/cmd.c
+++ b/source/cmd.c
@@ -915,13 +915,15 @@ Cmd_Init (void)
 //
 // register our commands
 //
-	Cmd_AddCommand ("stuffcmds", Cmd_StuffCmds_f, "No Description");
-	Cmd_AddCommand ("exec", Cmd_Exec_f, "No Description");
-	Cmd_AddCommand ("echo", Cmd_Echo_f, "No Description");
-	Cmd_AddCommand ("alias", Cmd_Alias_f, "No Description");
-	Cmd_AddCommand ("unalias", Cmd_UnAlias_f, "No Description");
-	Cmd_AddCommand ("wait", Cmd_Wait_f, "No Description");
-	Cmd_AddCommand ("cmdlist", Cmd_CmdList_f, "No Description");
+	Cmd_AddCommand ("stuffcmds", Cmd_StuffCmds_f, "Execute the commands given at startup again");
+	Cmd_AddCommand ("exec", Cmd_Exec_f, "Execute a script file");
+	Cmd_AddCommand ("echo", Cmd_Echo_f, "Print text to console");
+	Cmd_AddCommand ("alias", Cmd_Alias_f, "Used to create a reference to a command or list of commands.\n"
+		"When used without parameters, displays all current aliases.\n"
+		"Note: Enclose multiple commands within quotes and seperate each command with a semi-colon.");
+	Cmd_AddCommand ("unalias", Cmd_UnAlias_f, "Remove the selected alias");
+	Cmd_AddCommand ("wait", Cmd_Wait_f, "Wait a game tic");
+	Cmd_AddCommand ("cmdlist", Cmd_CmdList_f, "List all commands");
 }
 
 
diff --git a/source/com.c b/source/com.c
index 3192406..854e164 100644
--- a/source/com.c
+++ b/source/com.c
@@ -108,7 +108,7 @@ COM_Init (void)
 	LittleFloat = FloatSwap;
 #endif
 
-	Cmd_AddCommand ("path", COM_Path_f, "No Description");
+	Cmd_AddCommand ("path", COM_Path_f, "Show what paths Quake is using");
 
 	COM_Filesystem_Init ();
 	COM_CheckRegistered ();
diff --git a/source/console.c b/source/console.c
index 5f1eb8a..3996e0c 100644
--- a/source/console.c
+++ b/source/console.c
@@ -276,11 +276,11 @@ Con_Init (void)
 //
 // register our commands
 //
-	Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f, "No Description");
-	Cmd_AddCommand ("togglechat", Con_ToggleChat_f, "No Description");
-	Cmd_AddCommand ("messagemode", Con_MessageMode_f, "No Description");
-	Cmd_AddCommand ("messagemode2", Con_MessageMode2_f, "No Description");
-	Cmd_AddCommand ("clear", Con_Clear_f, "No Description");
+	Cmd_AddCommand ("toggleconsole", Con_ToggleConsole_f, "Toggle the console up and down");
+	Cmd_AddCommand ("togglechat", Con_ToggleChat_f, "Toggle the console up and down");
+	Cmd_AddCommand ("messagemode", Con_MessageMode_f, "Prompt to send a message to everyone");
+	Cmd_AddCommand ("messagemode2", Con_MessageMode2_f, "Prompt to send a message to only people on your team");
+	Cmd_AddCommand ("clear", Con_Clear_f, "Clear the console");
 	con_initialized = true;
 }
 
diff --git a/source/cvar.c b/source/cvar.c
index 2cff27d..864cdc9 100644
--- a/source/cvar.c
+++ b/source/cvar.c
@@ -471,11 +471,12 @@ Cvar_Init (void)
 {
 	developer = Cvar_Get ("developer", "0", 0, "set to enable extra debugging information");
 
-	Cmd_AddCommand ("set", Cvar_Set_f, "No Description");
-	Cmd_AddCommand ("setrom", Cvar_Setrom_f, "No Description");
-	Cmd_AddCommand ("toggle", Cvar_Toggle_f, "No Description");
-	Cmd_AddCommand ("help", Cvar_Help_f, "No Description");
-	Cmd_AddCommand ("cvarlist", Cvar_CvarList_f, "No Description");
+	Cmd_AddCommand ("set", Cvar_Set_f, "Set the selected variable, useful on the command line (+set variablename setting)");
+	Cmd_AddCommand ("setrom", Cvar_Setrom_f, "Set the selected variable and make it read only, useful on the command line. 
+(+setrom variablename setting)");
+	Cmd_AddCommand ("toggle", Cvar_Toggle_f, "Toggle a cvar on or off");
+	Cmd_AddCommand ("help", Cvar_Help_f, "Display quake help");
+	Cmd_AddCommand ("cvarlist", Cvar_CvarList_f, "List all cvars");
 }
 
 void
diff --git a/source/gl_rmisc.c b/source/gl_rmisc.c
index 44ae02e..e7f0d43 100644
--- a/source/gl_rmisc.c
+++ b/source/gl_rmisc.c
@@ -188,10 +188,10 @@ R_Init (void)
 	allowskybox = false;				// server will decide if this is
 										// allowed  --KB
 
-	Cmd_AddCommand ("timerefresh", R_TimeRefresh_f, "No Description");
-	Cmd_AddCommand ("envmap", R_Envmap_f, "No Description");
-	Cmd_AddCommand ("pointfile", R_ReadPointFile_f, "No Description");
-	Cmd_AddCommand ("loadsky", R_LoadSky_f, "No Description");
+	Cmd_AddCommand ("timerefresh", R_TimeRefresh_f, "Tests the current refresh rate for the current location");
+	Cmd_AddCommand ("envmap", R_Envmap_f, "FIXME: What on earth does this do? No Description");
+	Cmd_AddCommand ("pointfile", R_ReadPointFile_f, "Load a pointfile to determine map leaks");
+	Cmd_AddCommand ("loadsky", R_LoadSky_f, "Load a skybox");
 
 	R_InitBubble ();
 
diff --git a/source/gl_screen.c b/source/gl_screen.c
index 75dfc1a..ef5427e 100644
--- a/source/gl_screen.c
+++ b/source/gl_screen.c
@@ -411,10 +411,10 @@ SCR_Init (void)
 	//
 	// register our commands
 	//
-	Cmd_AddCommand ("screenshot", SCR_ScreenShot_f, "No Description");
-	Cmd_AddCommand ("snap", SCR_RSShot_f, "No Description");
-	Cmd_AddCommand ("sizeup", SCR_SizeUp_f, "No Description");
-	Cmd_AddCommand ("sizedown", SCR_SizeDown_f, "No Description");
+	Cmd_AddCommand ("screenshot", SCR_ScreenShot_f, "Take a screenshot, saves as qfxxx.tga in the current directory");
+	Cmd_AddCommand ("snap", SCR_RSShot_f, "Send a screenshot to someone");
+	Cmd_AddCommand ("sizeup", SCR_SizeUp_f, "Increases the screen size");
+	Cmd_AddCommand ("sizedown", SCR_SizeDown_f, "Decreases the screen size");
 
 	scr_ram = Draw_PicFromWad ("ram");
 	scr_net = Draw_PicFromWad ("net");
diff --git a/source/in_svgalib.c b/source/in_svgalib.c
index 32e1fe7..5ea6339 100644
--- a/source/in_svgalib.c
+++ b/source/in_svgalib.c
@@ -265,7 +265,7 @@ IN_InitMouse (void)
 	char       *mousedev;
 	int         mouserate = MOUSE_DEFAULTSAMPLERATE;
 
-	Cmd_AddCommand ("force_centerview", Force_CenterView_f, "No Description");
+	Cmd_AddCommand ("force_centerview", Force_CenterView_f, "Force viewpoint of player to center");
 
 	mouse_buttons = 3;
 
diff --git a/source/in_win.c b/source/in_win.c
index eb725bc..dec5319 100644
--- a/source/in_win.c
+++ b/source/in_win.c
@@ -433,7 +433,7 @@ IN_Init
 void
 IN_Init (void)
 {
-	Cmd_AddCommand ("force_centerview", Force_CenterView_f, "No Description");
+	Cmd_AddCommand ("force_centerview", Force_CenterView_f, "Force view of player to center");
 
 	uiWheelMessage = RegisterWindowMessage ("MSWHEEL_ROLLMSG");
 
diff --git a/source/in_x11.c b/source/in_x11.c
index 735827c..08f2c0f 100644
--- a/source/in_x11.c
+++ b/source/in_x11.c
@@ -535,7 +535,7 @@ IN_Init (void)
 	x11_add_event (ButtonRelease, &event_button);
 	x11_add_event (MotionNotify, &event_motion);
 
-	Cmd_AddCommand ("force_centerview", Force_CenterView_f, "No Description");
+	Cmd_AddCommand ("force_centerview", Force_CenterView_f, "Force view of player to center");
 }
 
 void
diff --git a/source/joy_win.c b/source/joy_win.c
index 632e554..4076abe 100644
--- a/source/joy_win.c
+++ b/source/joy_win.c
@@ -388,7 +388,7 @@ void
 JOY_Init (void)
 {
         JOY_StartupJoystick();
-	Cmd_AddCommand ("joyadvancedupdate", JOY_AdvancedUpdate_f, "No Description");
+	Cmd_AddCommand ("joyadvancedupdate", JOY_AdvancedUpdate_f, "FIXME: This appears to update the joystick poll? No Description");
 
 //        Con_DPrintf ("This system does not have joystick support.\n");
 }
@@ -571,45 +571,44 @@ JOY_Init_Cvars(void)
 				  "Joystick sensitivity");
 
 	// joystick variables
-	/* FIXME: Someone who has windows please document these cvars.*/
 
 	in_joystick = 
-		Cvar_Get ("joystick", "0", CVAR_ARCHIVE, "FIXME: Please document");
+		Cvar_Get ("joystick", "0", CVAR_ARCHIVE, "FIXME: No Description");
 	joy_name = 
-		Cvar_Get ("joyname", "joystick", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyname", "joystick", CVAR_NONE, "FIXME: No Description");
 	joy_advanced = 
-		Cvar_Get ("joyadvanced", "0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyadvanced", "0", CVAR_NONE, "FIXME: No Description");
 	joy_advaxisx = 
-		Cvar_Get ("joyadvaxisx", "0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyadvaxisx", "0", CVAR_NONE, "FIXME: No Description");
 	joy_advaxisy = 
-		Cvar_Get ("joyadvaxisy", "0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyadvaxisy", "0", CVAR_NONE, "FIXME: No Description");
 	joy_advaxisz = 
-		Cvar_Get ("joyadvaxisz", "0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyadvaxisz", "0", CVAR_NONE, "FIXME: No Description");
 	joy_advaxisr = 
-		Cvar_Get ("joyadvaxisr", "0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyadvaxisr", "0", CVAR_NONE, "FIXME: No Description");
 	joy_advaxisu = 
-		Cvar_Get ("joyadvaxisu", "0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyadvaxisu", "0", CVAR_NONE, "FIXME: No Description");
 	joy_advaxisv = 
-		Cvar_Get ("joyadvaxisv", "0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyadvaxisv", "0", CVAR_NONE, "FIXME: No Description");
 	joy_forwardthreshold =
-		Cvar_Get ("joyforwardthreshold", "0.15", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyforwardthreshold", "0.15", CVAR_NONE, "FIXME: No Description");
 	joy_sidethreshold =
-		Cvar_Get ("joysidethreshold", "0.15", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joysidethreshold", "0.15", CVAR_NONE, "FIXME: No Description");
 	joy_pitchthreshold =
-		Cvar_Get ("joypitchthreshold", "0.15", CVAR_NONE, "FIXME: Please document");
-	joy_yawthreshold = Cvar_Get ("joyyawthreshold", "0.15", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joypitchthreshold", "0.15", CVAR_NONE, "FIXME: No Description");
+	joy_yawthreshold = Cvar_Get ("joyyawthreshold", "0.15", CVAR_NONE, "FIXME: No Description");
 	joy_forwardsensitivity =
-		Cvar_Get ("joyforwardsensitivity", "-1.0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyforwardsensitivity", "-1.0", CVAR_NONE, "FIXME: No Description");
 	joy_sidesensitivity =
-		Cvar_Get ("joysidesensitivity", "-1.0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joysidesensitivity", "-1.0", CVAR_NONE, "FIXME: No Description");
 	joy_pitchsensitivity =
-		Cvar_Get ("joypitchsensitivity", "1.0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joypitchsensitivity", "1.0", CVAR_NONE, "FIXME: No Description");
 	joy_yawsensitivity =
-		Cvar_Get ("joyyawsensitivity", "-1.0", CVAR_NONE, "FIXME: Please document");
-	joy_wwhack1 = Cvar_Get ("joywwhack1", "0.0", CVAR_NONE, "FIXME: Please document");
-	joy_wwhack2 = Cvar_Get ("joywwhack2", "0.0", CVAR_NONE, "FIXME: Please document");
+		Cvar_Get ("joyyawsensitivity", "-1.0", CVAR_NONE, "FIXME: No Description");
+	joy_wwhack1 = Cvar_Get ("joywwhack1", "0.0", CVAR_NONE, "FIXME: No Description");
+	joy_wwhack2 = Cvar_Get ("joywwhack2", "0.0", CVAR_NONE, "FIXME: No Description");
 
-        joy_debug = Cvar_Get ("joy_debug", "0.0", CVAR_NONE, "FIXME: Please document");
+        joy_debug = Cvar_Get ("joy_debug", "0.0", CVAR_NONE, "FIXME: No Description");
 
 	return;
 }
diff --git a/source/keys.c b/source/keys.c
index c5eb53e..27f00f5 100644
--- a/source/keys.c
+++ b/source/keys.c
@@ -752,9 +752,16 @@ Key_Init (void)
 //
 // register our functions
 //
-	Cmd_AddCommand ("bind", Key_Bind_f, "No Description");
-	Cmd_AddCommand ("unbind", Key_Unbind_f, "No Description");
-	Cmd_AddCommand ("unbindall", Key_Unbindall_f, "No Description");
+	Cmd_AddCommand ("bind", Key_Bind_f, "Assign a command or a set of commands to a key.\n"
+		"Note: To bind multiple commands to a key, enclose the commands in quotes and separate with semi-colons. \n"
+		"To bind to non-printable keys, use the key name.\n"
+		"Key Name List: Escape, F1-F12, pause, backspace, tab, semicolon, enter, shift, ctrl, alt, space, ins,\n"
+		"home, pgup, del, end, pgdn, uparrow, downarrow, leftarrow, rightarrow, mouse1-mouse3, aux1-aux9, joy1-joy4,\n"
+		"mwheelup, mwheeldown\n"
+		"Special: The escape, and ~ (tilde) keys can only be bound from an external configuration file.");
+
+	Cmd_AddCommand ("unbind", Key_Unbind_f, "Remove the bind from the the selected key");
+	Cmd_AddCommand ("unbindall", Key_Unbindall_f, "Remove all binds (USE CAUTIOUSLY!!!)");
 }
 
 void
diff --git a/source/menu.c b/source/menu.c
index 74b9249..691d5da 100644
--- a/source/menu.c
+++ b/source/menu.c
@@ -1541,14 +1541,14 @@ M_Quit_Draw (void)
 void
 M_Init (void)
 {
-	Cmd_AddCommand ("togglemenu", M_ToggleMenu_f, "No Description");
+	Cmd_AddCommand ("togglemenu", M_ToggleMenu_f, "Toggle the menu");
 
-	Cmd_AddCommand ("menu_main", M_Menu_Main_f, "No Description");
-	Cmd_AddCommand ("menu_options", M_Menu_Options_f, "No Description");
-	Cmd_AddCommand ("menu_keys", M_Menu_Keys_f, "No Description");
-	Cmd_AddCommand ("menu_video", M_Menu_Video_f, "No Description");
-	Cmd_AddCommand ("menu_help", M_Menu_Help_f, "No Description");
-	Cmd_AddCommand ("menu_quit", M_Menu_Quit_f, "No Description");
+	Cmd_AddCommand ("menu_main", M_Menu_Main_f, "Show main menu");
+	Cmd_AddCommand ("menu_options", M_Menu_Options_f, "Show options menu");
+	Cmd_AddCommand ("menu_keys", M_Menu_Keys_f, "Show key selection menu");
+	Cmd_AddCommand ("menu_video", M_Menu_Video_f, "Show video selection menu");
+	Cmd_AddCommand ("menu_help", M_Menu_Help_f, "Show help menu");
+	Cmd_AddCommand ("menu_quit", M_Menu_Quit_f, "Show quit question");
 }
 
 
diff --git a/source/quakefs.c b/source/quakefs.c
index d06cf7d..5a97973 100644
--- a/source/quakefs.c
+++ b/source/quakefs.c
@@ -1058,7 +1058,7 @@ COM_Filesystem_Init (void)
 {
 	int         i;
 
-	Cmd_AddCommand ("gamedir", COM_Gamedir_f, "No Description");
+	Cmd_AddCommand ("gamedir", COM_Gamedir_f, "Specifies the directory to be used while playing.");
 
 	// start up with basegame->string by default
 	COM_CreateGameDirectory (fs_basegame->string);
diff --git a/source/r_main.c b/source/r_main.c
index b1f2b86..06b84cd 100644
--- a/source/r_main.c
+++ b/source/r_main.c
@@ -238,9 +238,9 @@ R_Init (void)
 
 	R_InitTurb ();
 
-	Cmd_AddCommand ("timerefresh", R_TimeRefresh_f, "No Description");
-	Cmd_AddCommand ("pointfile", R_ReadPointFile_f, "No Description");
-	Cmd_AddCommand ("loadsky", R_LoadSky_f, "No Description");
+	Cmd_AddCommand ("timerefresh", R_TimeRefresh_f, "Tests the current refresh rate for the current location");
+	Cmd_AddCommand ("pointfile", R_ReadPointFile_f, "Load a pointfile to determine map leaks");
+	Cmd_AddCommand ("loadsky", R_LoadSky_f, "Load a skybox");
 
 	Cvar_SetValue (r_maxedges, (float) NUMSTACKEDGES);
 	Cvar_SetValue (r_maxsurfs, (float) NUMSTACKSURFACES);
diff --git a/source/r_view.c b/source/r_view.c
index 9a2f901..99d9867 100644
--- a/source/r_view.c
+++ b/source/r_view.c
@@ -774,9 +774,12 @@ V_Init
 void
 V_Init (void)
 {
-	Cmd_AddCommand ("v_cshift", V_cshift_f, "No Description");
-	Cmd_AddCommand ("bf", V_BonusFlash_f, "No Description");
-	Cmd_AddCommand ("centerview", V_StartPitchDrift, "No Description");
+	Cmd_AddCommand ("v_cshift", V_cshift_f, "This adjusts all of the colors currently being displayed.\n"
+		"Used when you are underwater, hit, have the Ring of Shadows, or Quad Damage. (v_cshift r g b intensity)");
+		
+	Cmd_AddCommand ("bf", V_BonusFlash_f, "Background flash, used when you pick up an item");
+	Cmd_AddCommand ("centerview", V_StartPitchDrift, "Centers the player's view ahead after +lookup or +lookdown \n"
+		"Will not work while mlook is active or freelook is 1.");
 
 	BuildGammaTable (1.0, 1.0);			// no gamma yet
 }
diff --git a/source/sbar.c b/source/sbar.c
index 9f9dc8e..93a9000 100644
--- a/source/sbar.c
+++ b/source/sbar.c
@@ -246,11 +246,11 @@ Sbar_Init (void)
 	sb_face_invis_invuln = Draw_PicFromWad ("face_inv2");
 	sb_face_quad = Draw_PicFromWad ("face_quad");
 
-	Cmd_AddCommand ("+showscores", Sbar_ShowScores, "No Description");
-	Cmd_AddCommand ("-showscores", Sbar_DontShowScores, "No Description");
+	Cmd_AddCommand ("+showscores", Sbar_ShowScores, "Display information on everyone playing");
+	Cmd_AddCommand ("-showscores", Sbar_DontShowScores, "Stop displaying information on everyone playing");
 
-	Cmd_AddCommand ("+showteamscores", Sbar_ShowTeamScores, "No Description");
-	Cmd_AddCommand ("-showteamscores", Sbar_DontShowTeamScores, "No Description");
+	Cmd_AddCommand ("+showteamscores", Sbar_ShowTeamScores, "Display information for your team");
+	Cmd_AddCommand ("-showteamscores", Sbar_DontShowTeamScores, "Stop displaying information for your team");
 
 	sb_sbar = Draw_PicFromWad ("sbar");
 	sb_ibar = Draw_PicFromWad ("ibar");
diff --git a/source/screen.c b/source/screen.c
index 7ff688e..3922451 100644
--- a/source/screen.c
+++ b/source/screen.c
@@ -428,10 +428,10 @@ SCR_Init (void)
 	//
 	// register our commands
 	//
-	Cmd_AddCommand ("screenshot", SCR_ScreenShot_f, "No Description");
-	Cmd_AddCommand ("snap", SCR_RSShot_f, "No Description");
-	Cmd_AddCommand ("sizeup", SCR_SizeUp_f, "No Description");
-	Cmd_AddCommand ("sizedown", SCR_SizeDown_f, "No Description");
+	Cmd_AddCommand ("screenshot", SCR_ScreenShot_f, "Take a screenshot and write it as qfxxx.tga in the current directory");
+	Cmd_AddCommand ("snap", SCR_RSShot_f, "Take a screenshot and upload it to the server");
+	Cmd_AddCommand ("sizeup", SCR_SizeUp_f, "Increase the size of the screen");
+	Cmd_AddCommand ("sizedown", SCR_SizeDown_f, "Decrease the size of the screen");
 
 	scr_ram = Draw_PicFromWad ("ram");
 	scr_net = Draw_PicFromWad ("net");
diff --git a/source/skin.c b/source/skin.c
index 56b5d73..0330872 100644
--- a/source/skin.c
+++ b/source/skin.c
@@ -302,9 +302,9 @@ CL_Color_f (void)
 void
 Skin_Init (void)
 {
-	Cmd_AddCommand ("skins", Skin_Skins_f, "No Description");
-	Cmd_AddCommand ("allskins", Skin_AllSkins_f, "No Description");
-	Cmd_AddCommand ("color", CL_Color_f, "No Description");
+	Cmd_AddCommand ("skins", Skin_Skins_f, "Download all skins that are currently in use");
+	Cmd_AddCommand ("allskins", Skin_AllSkins_f, "Download all skins that are currently in use");
+	Cmd_AddCommand ("color", CL_Color_f, "The pant and shirt color (color shirt pants) Note that if only shirt color is given, pants will match");
 	Skin_Init_Translation ();
 }
 
diff --git a/source/snd_dma.c b/source/snd_dma.c
index 98192bd..ff9f70d 100644
--- a/source/snd_dma.c
+++ b/source/snd_dma.c
@@ -203,11 +203,11 @@ S_Init (void)
 
 	Con_Printf("\nSound Initialization\n");
 
-	Cmd_AddCommand ("play", S_Play, "No Description");
-	Cmd_AddCommand ("playvol", S_PlayVol, "No Description");
-	Cmd_AddCommand ("stopsound", S_StopAllSoundsC, "No Description");
-	Cmd_AddCommand ("soundlist", S_SoundList, "No Description");
-	Cmd_AddCommand ("soundinfo", S_SoundInfo_f, "No Description");
+	Cmd_AddCommand ("play", S_Play, "Play selected sound effect (play pathto/sound.wav)");
+	Cmd_AddCommand ("playvol", S_PlayVol, "Play selected sound effect at selected volume (playvol pathto/sound.wav num");
+	Cmd_AddCommand ("stopsound", S_StopAllSoundsC, "Stops all sounds currently being played");
+	Cmd_AddCommand ("soundlist", S_SoundList, "Reports a list of sounds in the cache");
+	Cmd_AddCommand ("soundinfo", S_SoundInfo_f, "Report information on the sound system");
 
 	if (COM_CheckParm ("-nosound"))
 		return;
diff --git a/source/sv_ccmds.c b/source/sv_ccmds.c
index 39a2a6c..419e2a3 100644
--- a/source/sv_ccmds.c
+++ b/source/sv_ccmds.c
@@ -851,30 +851,72 @@ SV_InitOperatorCommands (void)
 								 MAX_SERVERINFO_STRING);
 	}
 
-	Cmd_AddCommand ("logfile", SV_Logfile_f, "No Description");
-	Cmd_AddCommand ("fraglogfile", SV_Fraglogfile_f, "No Description");
+	Cmd_AddCommand ("logfile", SV_Logfile_f, "Toggles logging of console text to qconsole.log");
+	Cmd_AddCommand ("fraglogfile", SV_Fraglogfile_f, "Enables logging of kills to frag_##.log");
 
-	Cmd_AddCommand ("snap", SV_Snap_f, "No Description");
-	Cmd_AddCommand ("snapall", SV_SnapAll_f, "No Description");
-	Cmd_AddCommand ("kick", SV_Kick_f, "No Description");
-	Cmd_AddCommand ("status", SV_Status_f, "No Description");
+	Cmd_AddCommand ("snap", SV_Snap_f, "FIXME: Take a screenshot of userid? No Description");
+	Cmd_AddCommand ("snapall", SV_SnapAll_f, "FIXME: No Description");
+	Cmd_AddCommand ("kick", SV_Kick_f, "Remove a user from the server (kick userid)");
+	Cmd_AddCommand ("status", SV_Status_f, "Report information on the current connected clients and the server - displays userids");
 
-	Cmd_AddCommand ("map", SV_Map_f, "No Description");
-	Cmd_AddCommand ("setmaster", SV_SetMaster_f, "No Description");
+	Cmd_AddCommand ("map", SV_Map_f, "Change to a new map (map mapname)");
+	Cmd_AddCommand ("setmaster", SV_SetMaster_f, "Lists the server with up to eight masters.\n"
+		"When a server is listed with a master, the master is aware of the server's IP address and port and it is added to the\n"
+		"list of current servers connected to a master. A heartbeat is sent to the master from the server to indicated that the\n"
+		"server is still running and alive.\n"
+   "\n"
+		"Examples:\n"
+		"setmaster 192.246.40.12:27002\n"
+		"setmaster 192.246.40.12:27002 192.246.40.12:27004");
 
-	Cmd_AddCommand ("say", SV_ConSay_f, "No Description");
-	Cmd_AddCommand ("heartbeat", SV_Heartbeat_f, "No Description");
-	Cmd_AddCommand ("quit", SV_Quit_f, "No Description");
-	Cmd_AddCommand ("god", SV_God_f, "No Description");
-	Cmd_AddCommand ("give", SV_Give_f, "No Description");
-	Cmd_AddCommand ("noclip", SV_Noclip_f, "No Description");
-	Cmd_AddCommand ("serverinfo", SV_Serverinfo_f, "No Description");
-	Cmd_AddCommand ("localinfo", SV_Localinfo_f, "No Description");
-	Cmd_AddCommand ("user", SV_User_f, "No Description");
-	Cmd_AddCommand ("sv_gamedir", SV_Gamedir, "No Description");
-	Cmd_AddCommand ("floodprot", SV_Floodprot_f, "No Description");
-	Cmd_AddCommand ("floodprotmsg", SV_Floodprotmsg_f, "No Description");
-	Cmd_AddCommand ("maplist", COM_Maplist_f, "No Description");
+	Cmd_AddCommand ("say", SV_ConSay_f, "Say something to everyone on the server, will show up as the name 'console' in game");
+	Cmd_AddCommand ("heartbeat", SV_Heartbeat_f, "Force a heartbeat to be sent to the master server.\n"
+		"A heartbeat tells the Master the server's IP address and that it is still alive.");
+	Cmd_AddCommand ("quit", SV_Quit_f, "Shut down the server");
+	Cmd_AddCommand ("god", SV_God_f, "Toggle god cheat to userid (god userid) Requires cheats are enabled");
+	Cmd_AddCommand ("give", SV_Give_f, "Give userid items, or health.\n"
+		"Items: 1 Axe, 2 Shotgun, 3 Double-Barrelled Shotgun, 4 Nailgun, 5 Super Nailgun, 6 Grenade Launcher, 7 Rocket Launcher,\n"
+		"8 ThunderBolt, C Cells, H Health, N Nails, R Rockets, S Shells.	Requires cheats are enabled. (give userid item amount)");
+	Cmd_AddCommand ("noclip", SV_Noclip_f, "Toggle no clipping cheat for userid. Requires cheats are enabled. (noclip userid)");
+	Cmd_AddCommand ("serverinfo", SV_Serverinfo_f, "Reports or sets information about server.\n"
+		"The information stored in this space is broadcast on the network to all players.\n"
+		"Values:\n"
+		"dq - Drop Quad Damage when a player dies.\n"
+		"dr - Drop Ring of Shadows when a player dies.\n"
+		"rj - Sets the multiplier rate for splash damage kick.\n"
+		"needpass - Displays the passwords enabled on the server.\n"
+		"watervis - Toggle the use of r_watervis by OpenGL clients.\n"
+		"Note: Keys with (*) in front cannot be changed. Maximum key size cannot exceed 64-bytes.\n"
+		"Maximum size for all keys cannot exceed 512-bytes.\n"
+		"(serverinfo key value)");
+		
+	Cmd_AddCommand ("localinfo", SV_Localinfo_f, "Shows or sets localinfo variables.\n"
+		"Useful for mod programmers who need to allow the admin to change settings.\n"
+		"This is an alternative storage space to the serverinfo space for mod variables.\n"
+		"The variables stored in this space are not broadcast on the network.\n"
+		"This space also has a 32-kilobyte limit which is much greater then the 512-byte limit on the serverinfo space.\n"
+		"Special Keys: (current map) (next map) - Using this combination will allow the creation of a custom map cycle without editing code.\n"
+		"\n"
+		"Example:\n"
+		"localinfo dm2 dm4\n"
+		"localinfo dm4 dm6\n"
+		"localinfo dm6 dm2\n"
+		"(localinfo key value)");
+
+	Cmd_AddCommand ("user", SV_User_f, "Report information about the user (user userid)");
+	Cmd_AddCommand ("sv_gamedir", SV_Gamedir, "Displays or determines the value of the serverinfo *gamedir variable.\n"
+		"Note: Useful when the physical gamedir directory has a different name than the widely accepted gamedir directory.\n"
+		"Example:\n"
+		"gamedir tf2_5; sv_gamedir fortress\n"
+		"gamedir ctf4_2; sv_gamedir ctf\n"
+		"(sv_gamedir dirname)");
+
+	Cmd_AddCommand ("floodprot", SV_Floodprot_f, "Sets the options for flood protection.\n"
+		"Default: 4 4 10\n"
+		"(floodprot (number of messages) (number of seconds) (silence time in seconds))");
+
+	Cmd_AddCommand ("floodprotmsg", SV_Floodprotmsg_f, "Sets the message displayed after flood protection is invoked (floodprotmsg message)");
+	Cmd_AddCommand ("maplist", COM_Maplist_f, "List all maps on the server");
 
 	cl_warncmd =
 		Cvar_Get ("cl_warncmd", "1", CVAR_NONE, "Toggles the display of error messages for unknown commands"); 
diff --git a/source/sv_main.c b/source/sv_main.c
index 5b89119..1580fc8 100644
--- a/source/sv_main.c
+++ b/source/sv_main.c
@@ -1603,13 +1603,14 @@ SV_InitLocal (void)
 	pausable = Cvar_Get ("pausable", "1", CVAR_NONE, "Toggle if server can be paused 1 is on, 0 is off");
 
 	// DoS protection
-	Cmd_AddCommand ("netdosexpire", SV_netDoSexpire_f, "No Description");
-	Cmd_AddCommand ("netdosvalues", SV_netDoSvalues_f, "No Description");
+	Cmd_AddCommand ("netdosexpire", SV_netDoSexpire_f, "FIXME: part of DoS protection obviously, but I don't know what it does. No Description");
+	Cmd_AddCommand ("netdosvalues", SV_netDoSvalues_f, "FIXME: part of DoS protection obviously, but I don't know what it does. No Description");
 
-	Cmd_AddCommand ("addip", SV_AddIP_f, "No Description");
-	Cmd_AddCommand ("removeip", SV_RemoveIP_f, "No Description");
-	Cmd_AddCommand ("listip", SV_ListIP_f, "No Description");
-	Cmd_AddCommand ("writeip", SV_WriteIP_f, "No Description");
+	Cmd_AddCommand ("addip", SV_AddIP_f, "Add a single IP or a domain of IPs to the IP list of the server.\n"
+		"Useful for banning people. (addip (ipnumber))");
+	Cmd_AddCommand ("removeip", SV_RemoveIP_f, "Remove an IP address from the server IP list. (removeip (ipnumber))");
+	Cmd_AddCommand ("listip", SV_ListIP_f, "Print out the current list of IPs on the server list.");
+	Cmd_AddCommand ("writeip", SV_WriteIP_f, "Record all IP addresses on the server IP list. The file name is listip.cfg");
 
 	for (i = 0; i < MAX_MODELS; i++)
 		snprintf (localmodels[i], sizeof (localmodels[i]), "*%i", i);
diff --git a/source/sv_progs.c b/source/sv_progs.c
index 3ae50b4..e71a997 100644
--- a/source/sv_progs.c
+++ b/source/sv_progs.c
@@ -150,10 +150,10 @@ SV_Progs_Init (void)
 	sv_pr_state.unlink = SV_UnlinkEdict;
 	sv_pr_state.flush = SV_FlushSignon;
 
-	Cmd_AddCommand ("edict", ED_PrintEdict_f, "No Description");
-	Cmd_AddCommand ("edicts", ED_PrintEdicts_f, "No Description");
-	Cmd_AddCommand ("edictcount", ED_Count_f, "No Description");
-	Cmd_AddCommand ("profile", PR_Profile_f, "No Description");
+	Cmd_AddCommand ("edict", ED_PrintEdict_f, "Report information on a given edict in the game. (edict (edict number))");
+	Cmd_AddCommand ("edicts", ED_PrintEdicts_f, "Display information on all edicts in the game.");
+	Cmd_AddCommand ("edictcount", ED_Count_f, "Display summary information on the edicts in the game.");
+	Cmd_AddCommand ("profile", PR_Profile_f, "FIXME: Report information about QuakeC Stuff (???) No Description");
 }
 
 void
diff --git a/source/vid_mgl.c b/source/vid_mgl.c
index a82f6cb..ab77c8e 100644
--- a/source/vid_mgl.c
+++ b/source/vid_mgl.c
@@ -2014,15 +2014,17 @@ VID_Init (unsigned char *palette)
 	int         basenummodes;
 	byte       *ptmp;
 
-	Cmd_AddCommand ("vid_testmode", VID_TestMode_f, "No Description");
-	Cmd_AddCommand ("vid_nummodes", VID_NumModes_f, "No Description");
-	Cmd_AddCommand ("vid_describecurrentmode", VID_DescribeCurrentMode_f, "No Description");
-	Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f, "No Description");
-	Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f, "No Description");
-	Cmd_AddCommand ("vid_forcemode", VID_ForceMode_f, "No Description");
-	Cmd_AddCommand ("vid_windowed", VID_Windowed_f, "No Description");
-	Cmd_AddCommand ("vid_fullscreen", VID_Fullscreen_f, "No Description");
-	Cmd_AddCommand ("vid_minimize", VID_Minimize_f, "No Description");
+	Cmd_AddCommand ("vid_testmode", VID_TestMode_f, "Switch to another video mode temporarily for 5-seconds to test it.
+(vid_testmode (mode))");
+	Cmd_AddCommand ("vid_nummodes", VID_NumModes_f, "Reports the total number of video modes available");
+	Cmd_AddCommand ("vid_describecurrentmode", VID_DescribeCurrentMode_f, "Report current video mode.");
+	Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f, "Report information on specified video mode, default is current.
+(vid_describemode (mode))");
+	Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f, "Report information on all video modes.");
+	Cmd_AddCommand ("vid_forcemode", VID_ForceMode_f, "Force QuakeWorld to use a certain video mode. (vid_forcemode (mode))");
+	Cmd_AddCommand ("vid_windowed", VID_Windowed_f, "Switch to windowed mode");
+	Cmd_AddCommand ("vid_fullscreen", VID_Fullscreen_f, "Switch to full screen mode");
+	Cmd_AddCommand ("vid_minimize", VID_Minimize_f, "Minimize windowed Quake");
 
 	if (COM_CheckParm ("-dibonly"))
 		dibonly = true;
diff --git a/source/vid_svgalib.c b/source/vid_svgalib.c
index a7fe7c4..b3446d1 100644
--- a/source/vid_svgalib.c
+++ b/source/vid_svgalib.c
@@ -552,7 +552,7 @@ VID_Init (unsigned char *palette)
 		return;
 
 #if 0
-	Cmd_AddCommand ("gamma", VID_Gamma_f, "No Description");
+	Cmd_AddCommand ("gamma", VID_Gamma_f, "Brightness level");
 #endif
 
 	if (UseDisplay) {
@@ -571,10 +571,11 @@ VID_Init (unsigned char *palette)
 
 		VID_InitModes ();
 
-		Cmd_AddCommand ("vid_nummodes", VID_NumModes_f, "No Description");
-		Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f, "No Description");
-		Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f, "No Description");
-		Cmd_AddCommand ("vid_debug", VID_Debug_f, "No Description");
+		Cmd_AddCommand ("vid_nummodes", VID_NumModes_f, "Reports the total number of video modes available.");
+		Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f, "Report information on specified video mode, default is current.
+(vid_describemode (mode))");
+		Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f, "Report information on all video modes.");
+		Cmd_AddCommand ("vid_debug", VID_Debug_f, "FIXME: No Description");
 
 		/* Interpret command-line params */
 		w = h = d = 0;
diff --git a/source/vid_wgl.c b/source/vid_wgl.c
index f66e25f..9fdaece 100644
--- a/source/vid_wgl.c
+++ b/source/vid_wgl.c
@@ -1471,10 +1471,11 @@ VID_Init (unsigned char *palette)
 
 	memset (&devmode, 0, sizeof (devmode));
 
-	Cmd_AddCommand ("vid_nummodes", VID_NumModes_f, "No Description");
-	Cmd_AddCommand ("vid_describecurrentmode", VID_DescribeCurrentMode_f, "No Description");
-	Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f, "No Description");
-	Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f, "No Description");
+	Cmd_AddCommand ("vid_nummodes", VID_NumModes_f, "Reports the total number of video modes available");
+	Cmd_AddCommand ("vid_describecurrentmode", VID_DescribeCurrentMode_f, "Report current video mode.");
+	Cmd_AddCommand ("vid_describemode", VID_DescribeMode_f, "Report information on specified video mode, default is current.
+(vid_describemode (mode))");
+	Cmd_AddCommand ("vid_describemodes", VID_DescribeModes_f, "Report information on all video modes.");
 
 	hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1));
 
diff --git a/source/vid_x11.c b/source/vid_x11.c
index bca66c6..615e5f1 100644
--- a/source/vid_x11.c
+++ b/source/vid_x11.c
@@ -506,7 +506,7 @@ VID_Init (unsigned char *palette)
 	VID_GetWindowSize (320, 200);
 
 //  plugin_load ("in_x11.so");
-//  Cmd_AddCommand ("gamma", VID_Gamma_f, "No Description");
+//  Cmd_AddCommand ("gamma", VID_Gamma_f, "Change brightness level");
 	for (i = 0; i < 256; i++)
 		vid_gamma[i] = i;
 
diff --git a/source/zone.c b/source/zone.c
index a8b6785..187138a 100644
--- a/source/zone.c
+++ b/source/zone.c
@@ -618,7 +618,7 @@ Cache_Init (void)
 	cache_head.next = cache_head.prev = &cache_head;
 	cache_head.lru_next = cache_head.lru_prev = &cache_head;
 
-	Cmd_AddCommand ("flush", Cache_Flush, "No Description");
+	Cmd_AddCommand ("flush", Cache_Flush, "Clears the current game cache");
 }
 
 /*