diff --git a/Changes b/Changes
index be0952e67..6a5244793 100644
--- a/Changes
+++ b/Changes
@@ -1022,3 +1022,4 @@ seen. gmtime warning still there
 - Updated /info
 - Added back good old error reporting in ./unreal start
 - Changed to beta5
+- Fixed some slave work.. return MOD_SUCCESS; in all command modules..
diff --git a/src/modules/m_adminchat.c b/src/modules/m_adminchat.c
index 1c4afe122..b2783343a 100644
--- a/src/modules/m_adminchat.c
+++ b/src/modules/m_adminchat.c
@@ -78,6 +78,7 @@ int    m_adminchat_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_ADMINCHAT, TOK_ADMINCHAT, m_admins, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -87,6 +88,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_adminchat_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -102,6 +104,7 @@ int	m_adminchat_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_adminchat_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 /*
diff --git a/src/modules/m_akill.c b/src/modules/m_akill.c
index 35283c6cb..ddb6176b4 100644
--- a/src/modules/m_akill.c
+++ b/src/modules/m_akill.c
@@ -79,6 +79,8 @@ int    m_akill_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_AKILL, TOK_AKILL, m_akill, MAXPARA);
+	return MOD_SUCCESS;
+
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +90,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_akill_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -103,6 +106,7 @@ int	m_akill_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_akill_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 
diff --git a/src/modules/m_away.c b/src/modules/m_away.c
index 3b33f9460..7f2991a92 100644
--- a/src/modules/m_away.c
+++ b/src/modules/m_away.c
@@ -72,6 +72,7 @@ int    m_away_Init(int module_load)
 #endif
 {
 	add_Command(MSG_AWAY, TOK_AWAY, m_away, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -80,6 +81,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_away_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -93,6 +95,7 @@ int	m_away_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_away_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 /***********************************************************************
  * m_away() - Added 14 Dec 1988 by jto.
diff --git a/src/modules/m_chghost.c b/src/modules/m_chghost.c
index 338acde0c..5ea71f93b 100644
--- a/src/modules/m_chghost.c
+++ b/src/modules/m_chghost.c
@@ -75,6 +75,8 @@ int    m_chghost_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_CHGHOST, TOK_CHGHOST, m_chghost, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 #ifdef DYNAMIC_LINKING
 DLLFUNC int	Mod_Load(int module_load)
@@ -82,6 +84,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_chghost_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 #ifdef DYNAMIC_LINKING
 DLLFUNC int	Mod_Unload(int module_unload)
@@ -94,6 +98,8 @@ int	m_chghost_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				Mod_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 /* 
diff --git a/src/modules/m_chgident.c b/src/modules/m_chgident.c
index ba8b08d51..2bc87a51a 100644
--- a/src/modules/m_chgident.c
+++ b/src/modules/m_chgident.c
@@ -82,6 +82,7 @@ int   m_chgident_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_CHGIDENT, TOK_CHGIDENT, m_chgident, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -90,6 +91,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int   m_chgident_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -103,6 +105,7 @@ int	m_chgident_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_chgident_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 /* 
diff --git a/src/modules/m_chgname.c b/src/modules/m_chgname.c
index 0a9c7a667..851cd7937 100644
--- a/src/modules/m_chgname.c
+++ b/src/modules/m_chgname.c
@@ -79,6 +79,8 @@ int    m_chgname_Init(int module_load)
 	*/
 	add_Command(MSG_CHGNAME, TOK_CHGNAME, m_chgname, MAXPARA);
         add_Command(MSG_SVSNAME, TOK_CHGNAME, m_chgname, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +90,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_chgname_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 
 
@@ -108,6 +112,8 @@ int	m_chgname_Unload(int module_unload)
 		sendto_realops("Failed to delete command svsname when unloading %s",
 				m_chgname_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 
diff --git a/src/modules/m_guest.c b/src/modules/m_guest.c
index d0e0f0979..e8f90a728 100644
--- a/src/modules/m_guest.c
+++ b/src/modules/m_guest.c
@@ -79,6 +79,8 @@ int    m_guest_Init(int module_load)
 #ifdef GUEST
 	add_Hook(HOOKTYPE_GUEST, m_guest);
 #endif
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +90,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_guest_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 
 
@@ -101,6 +105,7 @@ int	m_guest_Unload(int module_unload)
 #ifdef GUEST
 	del_Hook(HOOKTYPE_GUEST, m_guest);
 #endif
+	return MOD_SUCCESS;
 }
 
 
diff --git a/src/modules/m_htm.c b/src/modules/m_htm.c
index 3277fbf89..3c6630c80 100644
--- a/src/modules/m_htm.c
+++ b/src/modules/m_htm.c
@@ -100,7 +100,7 @@ int    m_htm_Init(int module_load)
 	e_lcf = EventAdd("lcf", LCF, 0, lcf_check, NULL);
 	e_htmcalc = EventAdd("htmcalc", 1, 0, htm_calc, NULL);
 #endif
-
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -110,6 +110,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_htm_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -129,6 +130,7 @@ int	m_htm_Unload(int module_unload)
 	EventDel(e_lcf);
 	EventDel(e_htmcalc);
 #endif
+	return MOD_SUCCESS;
 }
 
 /* m_htm recoded by griever
diff --git a/src/modules/m_kill.c b/src/modules/m_kill.c
index 3345f15d5..94ccec2c3 100644
--- a/src/modules/m_kill.c
+++ b/src/modules/m_kill.c
@@ -80,6 +80,7 @@ int    m_kill_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_KILL, TOK_KILL, m_kill, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -89,6 +90,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_kill_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -104,6 +106,8 @@ int	m_kill_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_kill_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 
diff --git a/src/modules/m_kline.c b/src/modules/m_kline.c
index 66141f7c7..d7b1bd4e0 100644
--- a/src/modules/m_kline.c
+++ b/src/modules/m_kline.c
@@ -80,6 +80,8 @@ int    m_kline_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_KLINE, TOK_KLINE, m_kline, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -89,6 +91,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_kline_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 
 
@@ -104,6 +108,7 @@ int	m_kline_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_kline_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 /*
diff --git a/src/modules/m_lag.c b/src/modules/m_lag.c
index 26939d823..412450416 100644
--- a/src/modules/m_lag.c
+++ b/src/modules/m_lag.c
@@ -78,6 +78,8 @@ int    m_lag_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_LAG, TOK_LAG, m_lag, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -87,6 +89,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_lag_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -102,6 +105,8 @@ int	m_lag_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_lag_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 /* m_lag (lag measure) - Stskeeps
diff --git a/src/modules/m_message.c b/src/modules/m_message.c
index deeba76a4..6dd66b1c9 100644
--- a/src/modules/m_message.c
+++ b/src/modules/m_message.c
@@ -86,6 +86,8 @@ int    m_message_Init(int module_load)
 	*/
 	add_CommandX(MSG_PRIVATE, TOK_PRIVATE, m_private, MAXPARA, M_USER|M_SERVER|M_RESETIDLE);
 	add_Command(MSG_NOTICE, TOK_NOTICE, m_notice, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -95,6 +97,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_message_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 
 
@@ -115,6 +119,7 @@ int	m_message_Unload(int module_unload)
 		sendto_realops("Failed to delete command notice when unloading %s",
 				m_message_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 
diff --git a/src/modules/m_mkpasswd.c b/src/modules/m_mkpasswd.c
index c4694364e..6662ae169 100644
--- a/src/modules/m_mkpasswd.c
+++ b/src/modules/m_mkpasswd.c
@@ -72,6 +72,8 @@ int    m_mkpasswd_Init(int module_load)
 #endif
 {
 	add_Command(MSG_MKPASSWD, TOK_MKPASSWD, m_mkpasswd, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 #ifdef DYNAMIC_LINKING
@@ -80,6 +82,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_mkpasswd_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -93,6 +96,8 @@ int	m_mkpasswd_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_mkpasswd_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 /*
 ** m_mkpasswd
diff --git a/src/modules/m_nachat.c b/src/modules/m_nachat.c
index 99680ef3a..eb0f750c7 100644
--- a/src/modules/m_nachat.c
+++ b/src/modules/m_nachat.c
@@ -78,6 +78,8 @@ int    m_nachat_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_NACHAT, TOK_NACHAT, m_nachat, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -86,7 +88,9 @@ DLLFUNC int	Mod_Load(int module_load)
 #else
 int    m_nachat_Load(int module_load)
 #endif
-{
+{	
+	return MOD_SUCCESS;
+	
 }
 
 
@@ -102,6 +106,8 @@ int m_nachat_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_nachat_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 /*
diff --git a/src/modules/m_oper.c b/src/modules/m_oper.c
index 377aa401a..a152c9509 100644
--- a/src/modules/m_oper.c
+++ b/src/modules/m_oper.c
@@ -113,6 +113,7 @@ int    m_oper_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_OPER, TOK_OPER, m_oper, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -122,6 +123,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_oper_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -137,6 +139,7 @@ int	m_oper_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_oper_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 
diff --git a/src/modules/m_pingpong.c b/src/modules/m_pingpong.c
index b1bc00685..ded3cdb98 100644
--- a/src/modules/m_pingpong.c
+++ b/src/modules/m_pingpong.c
@@ -87,6 +87,8 @@ int    m_pingpong_Init(int module_load)
 
 	add_Command(MSG_PING, TOK_PING, m_ping, MAXPARA);
 	add_CommandX(MSG_PONG, TOK_PONG, m_pong, MAXPARA, M_UNREGISTERED|M_USER|M_SERVER);
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -96,6 +98,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_pingpong_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -116,6 +119,7 @@ int	m_pingpong_Unload(int module_unload)
 		sendto_realops("Failed to delete command pong when unloading %s",
 				m_pingpong_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 
diff --git a/src/modules/m_quit.c b/src/modules/m_quit.c
index 5ea41ab60..66795163e 100644
--- a/src/modules/m_quit.c
+++ b/src/modules/m_quit.c
@@ -79,6 +79,8 @@ int    m_quit_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_CommandX(MSG_QUIT, TOK_QUIT, m_quit, MAXPARA, M_UNREGISTERED|M_USER);
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +90,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_quit_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 
 
@@ -103,6 +107,8 @@ int	m_quit_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_quit_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 
diff --git a/src/modules/m_rakill.c b/src/modules/m_rakill.c
index 5e485f033..977a41d40 100644
--- a/src/modules/m_rakill.c
+++ b/src/modules/m_rakill.c
@@ -79,6 +79,8 @@ int    m_rakill_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_RAKILL, TOK_RAKILL, m_rakill, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +90,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_rakill_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 
 
@@ -103,6 +107,8 @@ int	m_rakill_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_rakill_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 
diff --git a/src/modules/m_rping.c b/src/modules/m_rping.c
index d99b88236..b32350d1a 100644
--- a/src/modules/m_rping.c
+++ b/src/modules/m_rping.c
@@ -84,6 +84,8 @@ int    m_rping_Init(int module_load)
 	*/
 	add_Command(MSG_RPING, TOK_RPING, m_rping, MAXPARA);
 	add_Command(MSG_RPONG, TOK_RPONG, m_rpong, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -93,6 +95,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_rping_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 
 
@@ -113,6 +117,8 @@ int	m_rping_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_rping_Header.name);
 	}
+	return MOD_SUCCESS;	
+	
 }
 
 /*
diff --git a/src/modules/m_sdesc.c b/src/modules/m_sdesc.c
index 05af98c5f..4f02cb995 100644
--- a/src/modules/m_sdesc.c
+++ b/src/modules/m_sdesc.c
@@ -78,6 +78,7 @@ int    m_sdesc_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SDESC, TOK_SDESC, m_sdesc, 1);
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -86,6 +87,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_sdesc_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 
 #ifdef DYNAMIC_LINKING
@@ -99,6 +102,8 @@ int	m_sdesc_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_sdesc_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 /* m_sdesc - 15/05/1999 - Stskeeps
diff --git a/src/modules/m_sendumode.c b/src/modules/m_sendumode.c
index 2fddcff8d..c2a6c703f 100644
--- a/src/modules/m_sendumode.c
+++ b/src/modules/m_sendumode.c
@@ -83,6 +83,7 @@ int    m_sendumode_Init(int module_load)
 	*/
 	add_Command(MSG_SENDUMODE, TOK_SENDUMODE, m_sendumode, MAXPARA);
 	add_Command(MSG_SMO, TOK_SMO, m_sendumode, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -92,6 +93,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_sendumode_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -112,6 +114,8 @@ int	m_sendumode_Unload(int module_unload)
 		sendto_realops("Failed to delete command smo when unloading %s",
 				m_sendumode_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 
 }
 
diff --git a/src/modules/m_sethost.c b/src/modules/m_sethost.c
index 4fdfbb246..714aa7bc3 100644
--- a/src/modules/m_sethost.c
+++ b/src/modules/m_sethost.c
@@ -77,6 +77,8 @@ int    m_sethost_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SETHOST, TOK_SETHOST, m_sethost, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 #ifdef DYNAMIC_LINKING
@@ -85,6 +87,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_sethost_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	 
 }
 
 #ifdef DYNAMIC_LINKING
@@ -98,6 +102,8 @@ int	m_sethost_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				Mod_Header.name);
 	}
+	return MOD_SUCCESS;
+	 
 }
 
 /*
diff --git a/src/modules/m_setident.c b/src/modules/m_setident.c
index 9f54f2225..f746c0aaf 100644
--- a/src/modules/m_setident.c
+++ b/src/modules/m_setident.c
@@ -76,6 +76,8 @@ int    m_setident_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SETIDENT, TOK_SETIDENT, m_setident, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 #ifdef DYNAMIC_LINKING
@@ -84,6 +86,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int	m_setident_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 #ifdef DYNAMIC_LINKING
 DLLFUNC int	Mod_Unload(int module_unload)
@@ -96,6 +100,8 @@ int	m_setident_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_setident_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 /* m_setident - 12/05/1999 - Stskeeps
diff --git a/src/modules/m_setname.c b/src/modules/m_setname.c
index 6373a4847..c0f167f7e 100644
--- a/src/modules/m_setname.c
+++ b/src/modules/m_setname.c
@@ -78,6 +78,8 @@ int    m_setname_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SETNAME, TOK_SETNAME, m_setname, 1);
+	return MOD_SUCCESS;
+	
 }
 #ifdef DYNAMIC_LINKING
 DLLFUNC int	Mod_Load(int module_load)
@@ -85,6 +87,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_setname_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 
 #ifdef DYNAMIC_LINKING
@@ -98,6 +102,8 @@ int	m_setname_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_setname_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 /* m_setname - 12/05/1999 - Stskeeps
diff --git a/src/modules/m_sqline.c b/src/modules/m_sqline.c
index 99c327a3e..b7a566d3c 100644
--- a/src/modules/m_sqline.c
+++ b/src/modules/m_sqline.c
@@ -79,6 +79,8 @@ int    m_sqline_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SQLINE, TOK_SQLINE, m_sqline, MAXPARA);
+	return MOD_SUCCESS;
+	
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +90,8 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_sqline_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
+	
 }
 
 
@@ -103,6 +107,8 @@ int	m_sqline_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_sqline_Header.name);
 	}
+	return MOD_SUCCESS;
+	
 }
 
 /*    m_sqline
diff --git a/src/modules/m_svsmode.c b/src/modules/m_svsmode.c
index 5a9656f3e..f252132d3 100644
--- a/src/modules/m_svsmode.c
+++ b/src/modules/m_svsmode.c
@@ -76,6 +76,7 @@ int    m_svsmode_Init(int module_load)
 {
 	add_Command(MSG_SVSMODE, TOK_SVSMODE, m_svsmode, MAXPARA);
 	add_Command(MSG_SVS2MODE, TOK_SVS2MODE, m_svs2mode, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -84,6 +85,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int m_svsmode_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -97,6 +99,7 @@ int	m_svsmode_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_svsmode_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 extern void add_send_mode_param(aChannel *chptr, aClient *from, char what, char mode, char *param);
diff --git a/src/modules/m_svsmotd.c b/src/modules/m_svsmotd.c
index 31d5bb243..92ca0f037 100644
--- a/src/modules/m_svsmotd.c
+++ b/src/modules/m_svsmotd.c
@@ -72,6 +72,7 @@ int    m_svsmotd_Init(int module_load)
 #endif
 {
 	add_Command(MSG_SVSMOTD, TOK_SVSMOTD, m_svsmotd, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -80,6 +81,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_svsmotd_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -93,7 +95,9 @@ int	m_svsmotd_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_svsmotd_Header.name);
 	}
+	return MOD_SUCCESS;
 }
+
 /*
 ** m_svsmotd
 **
diff --git a/src/modules/m_svsnick.c b/src/modules/m_svsnick.c
index 416459819..27e36948c 100644
--- a/src/modules/m_svsnick.c
+++ b/src/modules/m_svsnick.c
@@ -72,6 +72,7 @@ int    m_svsnick_Init(int module_load)
 #endif
 {
 	add_Command(MSG_SVSNICK, TOK_SVSNICK, m_svsnick, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -80,6 +81,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_svsnick_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -93,6 +95,7 @@ int	m_svsnick_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_svsnick_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 /*
 ** m_svsnick
diff --git a/src/modules/m_svsnline.c b/src/modules/m_svsnline.c
index 51c0aa4ff..70eb74046 100644
--- a/src/modules/m_svsnline.c
+++ b/src/modules/m_svsnline.c
@@ -81,6 +81,7 @@ int    m_svsnline_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SVSNLINE, TOK_SVSNLINE, m_svsnline, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -90,6 +91,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_svsnline_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -105,6 +107,7 @@ int	m_svsnline_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_svsnline_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 void wipe_svsnlines(void)
diff --git a/src/modules/m_svsnoop.c b/src/modules/m_svsnoop.c
index 7d75c78dc..bc81d87ed 100644
--- a/src/modules/m_svsnoop.c
+++ b/src/modules/m_svsnoop.c
@@ -74,6 +74,7 @@ int    m_svsnoop_Init(int module_load)
 #endif
 {
 	add_Command(MSG_SVSNOOP, TOK_SVSNOOP, m_svsnoop, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -82,6 +83,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_svsnoop_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -95,6 +97,7 @@ int	m_svsnoop_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_svsnoop_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 int m_svsnoop(aClient *cptr, aClient *sptr, int parc, char *parv[])
 {
diff --git a/src/modules/m_svso.c b/src/modules/m_svso.c
index e66bc04fd..9e88178fa 100644
--- a/src/modules/m_svso.c
+++ b/src/modules/m_svso.c
@@ -106,6 +106,7 @@ int    m_svso_Init(int module_load)
 #endif
 {
 	add_Command(MSG_SVSO, TOK_SVSO, m_svso, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -114,6 +115,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_svso_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -127,6 +129,7 @@ int	m_svso_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_svso_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 /*
 ** m_svso - Stskeeps
diff --git a/src/modules/m_swhois.c b/src/modules/m_swhois.c
index 3c60d8f00..332b085da 100644
--- a/src/modules/m_swhois.c
+++ b/src/modules/m_swhois.c
@@ -57,7 +57,7 @@ ModuleHeader m_swhois_Header
 ModuleHeader Mod_Header
 #endif
   = {
-	"test",
+	"m_swhois",
 	"$Id$",
 	"command /swhois", 
 	"3.2-b5",
@@ -71,6 +71,7 @@ int    m_swhois_Init(int module_load)
 #endif
 {
 	add_Command(MSG_SWHOIS, TOK_SWHOIS, m_swhois, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -79,6 +80,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_swhois_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 #ifdef DYNAMIC_LINKING
@@ -92,6 +94,7 @@ int	m_swhois_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_swhois_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 /*
  * m_swhois
diff --git a/src/modules/m_tkl.c b/src/modules/m_tkl.c
index 4e90789f2..13ead0362 100644
--- a/src/modules/m_tkl.c
+++ b/src/modules/m_tkl.c
@@ -78,7 +78,7 @@ int    m_tkl_Init(int module_load)
 	add_Command(MSG_TZLINE, TOK_NONE, m_tzline, 3);
 	add_Command(MSG_TKLINE, TOK_NONE, m_tkline, 3);
 	add_Command(MSG_GZLINE, TOK_NONE, m_gzline, 3);
-
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +88,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_tkl_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -108,6 +109,7 @@ int	m_tkl_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_tkl_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 /*
diff --git a/src/modules/m_tsctl.c b/src/modules/m_tsctl.c
index bfd68cf4d..744624a3e 100644
--- a/src/modules/m_tsctl.c
+++ b/src/modules/m_tsctl.c
@@ -79,6 +79,7 @@ int    m_tsctl_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_TSCTL, TOK_TSCTL, m_tsctl, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +89,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_tsctl_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -103,6 +105,7 @@ int	m_tsctl_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_tsctl_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 /*
diff --git a/src/modules/m_unkline.c b/src/modules/m_unkline.c
index 9e9d39365..8368d6819 100644
--- a/src/modules/m_unkline.c
+++ b/src/modules/m_unkline.c
@@ -79,6 +79,7 @@ int    m_unkline_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_UNKLINE, TOK_UNKLINE, m_unkline, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +89,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_unkline_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -103,6 +105,7 @@ int	m_unkline_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_unkline_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 /*
diff --git a/src/modules/m_unsqline.c b/src/modules/m_unsqline.c
index 8b1756bb8..a60c64b5b 100644
--- a/src/modules/m_unsqline.c
+++ b/src/modules/m_unsqline.c
@@ -79,6 +79,7 @@ int    m_unsqline_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_UNSQLINE, TOK_UNSQLINE, m_unsqline, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +89,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_unsqline_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -103,6 +105,7 @@ int	m_unsqline_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_unsqline_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 /*    m_unsqline
diff --git a/src/modules/m_unzline.c b/src/modules/m_unzline.c
index 9ad25875b..2bcbb55a7 100644
--- a/src/modules/m_unzline.c
+++ b/src/modules/m_unzline.c
@@ -79,6 +79,7 @@ int    m_unzline_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_UNZLINE, TOK_UNZLINE, m_unzline, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -88,6 +89,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_unzline_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -103,6 +105,7 @@ int	m_unzline_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_unzline_Header.name);
 	}
+	return MOD_SUCCESS;
 }
 
 
diff --git a/src/modules/m_who.c b/src/modules/m_who.c
index 4efe7840c..fdbe57bef 100644
--- a/src/modules/m_who.c
+++ b/src/modules/m_who.c
@@ -82,6 +82,7 @@ int    m_who_Init(int module_load)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_WHO, TOK_WHO, m_who, MAXPARA);
+	return MOD_SUCCESS;
 }
 
 /* Is first run when server is 100% ready */
@@ -91,6 +92,7 @@ DLLFUNC int	Mod_Load(int module_load)
 int    m_who_Load(int module_load)
 #endif
 {
+	return MOD_SUCCESS;
 }
 
 
@@ -106,6 +108,7 @@ int	m_who_Unload(int module_unload)
 		sendto_realops("Failed to delete commands when unloading %s",
 				m_who_Header.name);
 	}
+	return MOD_SUCCESS;
 }