diff --git a/ChangeLog b/ChangeLog
index 373fede9..7eafcb01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,11 @@ NeoStats ChangeLog - Anything we add/remove/fix/change is in here (even our rant
  - Fixed a bug with users being marked away multiple times, thus, screwing up statserv stats :(
  - Compile fixes and warnings
  - memprof found me a few memory leaks. Fixed them up :)
+ - the solaris fixes broke a bunch of stuff, reversed them out for now
+ - join 0 support
+ - moraleserv bugs fixed
+ - ultimate3 SMODE support
+ - Ultiamte3 SMODE broke ConnectServ. Bah Humbug
 
 * NeoStats * Shmad & Fish * Version 2.5.0-Release Candidate 2 
  - Misc. Updates (S)
diff --git a/TODO b/TODO
index 6a2bc286..e3f54218 100644
--- a/TODO
+++ b/TODO
@@ -22,7 +22,6 @@ join 0 is really broken atm :)
 
 "make dist" option. 
 
-SMODE command from Ultimate3 (needs to be done asap)
 
 2.6.0 Series - Yep, I'm already thinking about this....
 ------------
diff --git a/Ultimate.h b/Ultimate.h
index 5388ec3a..156732d0 100644
--- a/Ultimate.h
+++ b/Ultimate.h
@@ -20,7 +20,7 @@
 **  USA
 **
 ** NeoStats CVS Identification
-** $Id: Ultimate.h,v 1.16 2003/01/13 07:20:53 fishwaldo Exp $
+** $Id: Ultimate.h,v 1.17 2003/01/21 13:09:23 fishwaldo Exp $
 */
 #ifndef ULTIMATE_H
 #define ULTIMATE_H
@@ -314,6 +314,7 @@
 #define MSG_BURST	"BURST"
 #define MSG_SJOIN	"SJOIN"
 #define MSG_CLIENT	"CLIENT"
+#define MSG_SMODE	"SMODE"
 
 
 
diff --git a/dl/cs/cs.c b/dl/cs/cs.c
index e8ed3734..3528a720 100644
--- a/dl/cs/cs.c
+++ b/dl/cs/cs.c
@@ -20,7 +20,7 @@
 **  USA
 **
 ** NeoStats CVS Identification
-** $Id: cs.c,v 1.14 2002/10/14 01:06:20 shmad Exp $
+** $Id: cs.c,v 1.15 2003/01/21 13:09:23 fishwaldo Exp $
 */
 
 #include <stdio.h>
@@ -147,6 +147,7 @@ EventFnList my_event_list[] = {
     { "ONLINE", Online},
     { "SIGNON", cs_new_user},
     { "UMODE", cs_user_modes},
+    { "SMODE", cs_user_modes},
     { "SIGNOFF", cs_del_user},
     { "KILL", cs_user_kill},
     { "NICK_CHANGE", cs_user_nick},
diff --git a/dl/extauth/Makefile b/dl/extauth/Makefile
index d9a9e471..e6665b0b 100644
--- a/dl/extauth/Makefile
+++ b/dl/extauth/Makefile
@@ -11,8 +11,8 @@ all:	extauth
 .c.o:
 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
 
-extauth: $(SOURCES)
-	$(CC) $(MODLDFLAGS) $(INCLUDES) $(CFLAGS) -o $(TARGET) $(LIBS) $(SOURCES)
+extauth: $(OBJECTS)
+	$(LD) $(MODLDFLAGS) -o $(TARGET) $(LIBS) $(OBJECTS)
 	/bin/cp $(TARGET) ../
 
 clean:
diff --git a/dl/ms/ms.c b/dl/ms/ms.c
index 84f0308d..f0d96175 100644
--- a/dl/ms/ms.c
+++ b/dl/ms/ms.c
@@ -20,7 +20,7 @@
 **  USA
 **
 ** NeoStats CVS Identification
-** $Id: ms.c,v 1.9 2003/01/04 04:56:03 fishwaldo Exp $
+** $Id: ms.c,v 1.10 2003/01/21 13:09:24 fishwaldo Exp $
 */
 
 #include <stdio.h>
@@ -221,12 +221,12 @@ EventFnList *__module_get_events() {
     return my_event_list;
 };
 
-static void _init() {
+void _init() {
     s_MoraleServ = "MoraleServ";
 }
 
 
-static void _fini() {
+void _fini() {
 };
 
 
diff --git a/ircd.c b/ircd.c
index 61a34658..431e002a 100755
--- a/ircd.c
+++ b/ircd.c
@@ -22,7 +22,7 @@
 **  USA
 **
 ** NeoStats CVS Identification
-** $Id: ircd.c,v 1.107 2003/01/15 14:18:47 fishwaldo Exp $
+** $Id: ircd.c,v 1.108 2003/01/21 13:09:23 fishwaldo Exp $
 */
  
 #include <setjmp.h>
@@ -73,6 +73,7 @@ void Srv_Tburst(char *origin, char **argv, int argc);
 #endif
 #ifdef ULTIMATE3
 void Srv_Client(char *, char **, int argc);
+void Srv_Smode(char *origin, char **argv, int argc);
 #endif
 
 static void ShowMOTD(char *);
@@ -251,6 +252,7 @@ IntCommands cmd_list[] = {
 	{MSG_BURST,	Srv_Burst, 		0, 	0},
 	{MSG_SJOIN,	Srv_Sjoin,		1,	0},
 	{MSG_CLIENT,	Srv_Client,		0,	0},
+	{MSG_SMODE,	Srv_Smode, 		1, 	0},
 #endif
 	{MSG_VCTRL,	Srv_Vctrl, 		0, 	0},
 	{TOK_VCTRL,	Srv_Vctrl, 		0, 	0},
@@ -1243,6 +1245,7 @@ void Srv_Client(char *origin, char **argv, int argc) {
 			Module_Event("UMODE", av, ac);
 			free(av);
 //			FreeList(av, ac);
+			ac = 0;
 #ifdef ULTIMATE3
 			AddStringToList(&av, argv[0], &ac);
 #ifdef DEBUG
@@ -1250,12 +1253,24 @@ void Srv_Client(char *origin, char **argv, int argc) {
 #endif
 			UserMode(argv[0], argv[4], 1);
 			AddStringToList(&av, argv[4], &ac);
-			Module_Event("UMODE", av, ac);
+			Module_Event("SMODE", av, ac);
 			free(av);
 //			FreeList(av, ac);
 #endif
 
 }
+
+void Srv_Smode(char *origin, char **argv, int argc) {
+			char **av;
+			int ac = 0;
+			AddStringToList(&av, argv[0], &ac);
+			AddStringToList(&av, argv[1], &ac);
+			UserMode(argv[0], argv[1], 1);
+			Module_Event("SMODE", av, ac);
+			free(av);
+};
+			 
+
 #endif
 void Srv_Svsnick(char *origin, char **argv, int argc) {
 			User *u;