diff -rupN a/modules.conf b/modules.conf
--- a/modules.conf	2014-12-27 20:22:55.888507213 -0600
+++ b/modules.conf	2014-12-27 22:53:57.234362288 -0600
@@ -1,137 +1,158 @@
-/*
- * Modules configuration stub... More work will be done on this later.
- */
-
-loadmodule "modules/cloak";
-loadmodule "modules/m_sethost";
-loadmodule "modules/m_chghost";
-loadmodule "modules/m_chgident";
-loadmodule "modules/m_setname";
-loadmodule "modules/m_setident";
-loadmodule "modules/m_sdesc";
-loadmodule "modules/m_svsmode";
-loadmodule "modules/m_swhois";
-loadmodule "modules/m_svsmotd";
-loadmodule "modules/m_svsnline";
-loadmodule "modules/m_who";
-loadmodule "modules/m_mkpasswd";
-loadmodule "modules/m_away";
-loadmodule "modules/m_svsnoop";
-loadmodule "modules/m_svso";
-loadmodule "modules/m_svsnick";
-loadmodule "modules/m_adminchat";
-loadmodule "modules/m_chgname";
-loadmodule "modules/m_guest";
-loadmodule "modules/m_kill";
-loadmodule "modules/m_lag";
-loadmodule "modules/m_message";
-loadmodule "modules/m_nachat";
-loadmodule "modules/m_oper";
-loadmodule "modules/m_pingpong";
-loadmodule "modules/m_quit";
-loadmodule "modules/m_rping";
-loadmodule "modules/m_sendumode";
-loadmodule "modules/m_sqline";
-loadmodule "modules/m_tsctl";
-loadmodule "modules/m_unkline";
-loadmodule "modules/m_unsqline";
-loadmodule "modules/m_unzline";
-loadmodule "modules/m_whois";
-loadmodule "modules/m_tkl";
-loadmodule "modules/m_vhost";
-loadmodule "modules/m_cycle";
-loadmodule "modules/m_svsjoin";
-loadmodule "modules/m_svspart";
-loadmodule "modules/m_svswatch";
-loadmodule "modules/m_svssilence";
-loadmodule "modules/m_sendsno";
-loadmodule "modules/m_svssno";
-loadmodule "modules/m_sajoin";
-loadmodule "modules/m_sapart";
-loadmodule "modules/m_samode";
-loadmodule "modules/m_kick";
-loadmodule "modules/m_topic";
-loadmodule "modules/m_invite";
-loadmodule "modules/m_list";
-loadmodule "modules/m_time";
-loadmodule "modules/m_sjoin";
-loadmodule "modules/m_svskill";
-loadmodule "modules/m_pass";
-loadmodule "modules/m_userhost";
-loadmodule "modules/m_ison";
-loadmodule "modules/m_silence";
-loadmodule "modules/m_knock";
-loadmodule "modules/m_umode2";
-loadmodule "modules/m_squit";
-loadmodule "modules/m_protoctl";
-loadmodule "modules/m_addline";
-loadmodule "modules/m_addomotd";
-loadmodule "modules/m_wallops";
-loadmodule "modules/m_admin";
-loadmodule "modules/m_globops";
-loadmodule "modules/m_locops";
-loadmodule "modules/m_chatops";
-loadmodule "modules/m_trace";
-loadmodule "modules/m_netinfo";
-loadmodule "modules/m_links";
-loadmodule "modules/m_help";
-loadmodule "modules/m_rules";
-loadmodule "modules/m_close";
-loadmodule "modules/m_map";
-loadmodule "modules/m_eos";
-loadmodule "modules/m_server";
-loadmodule "modules/m_stats";
-loadmodule "modules/m_svsfline";
-loadmodule "modules/m_dccdeny";
-loadmodule "modules/m_undccdeny";
-loadmodule "modules/m_whowas";
-loadmodule "modules/m_connect";
-loadmodule "modules/m_dccallow";
-loadmodule "modules/m_userip";
-loadmodule "modules/m_nick";
-loadmodule "modules/m_user";
-loadmodule "modules/m_mode";
-loadmodule "modules/m_watch";
-loadmodule "modules/m_part";
-loadmodule "modules/m_join";
-loadmodule "modules/m_motd";
-loadmodule "modules/m_opermotd";
-loadmodule "modules/m_botmotd";
-loadmodule "modules/m_lusers";
-loadmodule "modules/m_names";
-loadmodule "modules/m_svsnolag";
-loadmodule "modules/m_addmotd";
-loadmodule "modules/m_svslusers";
-loadmodule "modules/m_starttls";
-loadmodule "modules/m_nopost";
-loadmodule "modules/m_cap";
-loadmodule "modules/m_sasl";
-loadmodule "modules/m_md";
-loadmodule "modules/cap_invitenotify";
+/**
+ * modules.conf edited by: Scott Seufert (katsklaw@msn.com)
+ * 
+ * Modules configuration file. Starting in Unreal 3.4 commands.so has been split into 
+ * separate modules for a finer tuned experience. To emulate or keep the modules the same as 
+ * 3.2, no editing required.
+ * 
+ * Please read each module description for a very brief overview of the modules function.
+ * If in doubt, don't comment the module out. This file *MUST* be identical on all servers to 
+ * prevent desyncs.
+ **/
+
+/** Required modules. Do not unload any of these modules unless you *want* things to break! 
+ *  Some of these modules are required for an RFC compliant IRCd, other are required as part
+ *  of the Unreal IRCd s2s protocol. Some *can* be safely unloaded but do so at your own
+ *  risk! We assume you know what you are doing and will not help you choose!
+ * 
+ *  The Unreal IRCd Team is not responsible for ill effects encountered but unloading
+ *  the wrong module(s)!
+ * 
+ *  YOU HAVE BEEN WARNED!
+ **/
+
+loadmodule "modules/cloak"; /* unreal cloaking module */
+loadmodule "modules/m_admin"; /* /admin command */
+loadmodule "modules/m_away"; /* /away command. */
+loadmodule "modules/m_cap"; /* /cap command */
+loadmodule "modules/cap_invitenotify"; /* invite-notify protocol */
+loadmodule "modules/m_close"; /* /close command */
+loadmodule "modules/m_connect"; /* /connect command */
+loadmodule "modules/m_eos"; /* EOS protocol command */
+loadmodule "modules/m_help"; /* /help command */
+loadmodule "modules/m_invite"; /* /invite command */
+loadmodule "modules/m_ison"; /* /ison command */
+loadmodule "modules/m_join"; /* /join command */
+loadmodule "modules/m_kick"; /* /kick command */
+loadmodule "modules/m_kill"; /* /kill command */
+loadmodule "modules/m_knock"; /* /knock command */
+loadmodule "modules/m_links"; /* /links command */
+loadmodule "modules/m_list"; /* /list command */
+loadmodule "modules/m_lusers"; /* /lusers command */
+loadmodule "modules/m_map"; /* /map command */
+loadmodule "modules/m_md"; /* command /MD (S2S only) */
+loadmodule "modules/m_message"; /* /privmsg and /notice commands */
+loadmodule "modules/m_mode"; /* /mode command */
+loadmodule "modules/m_motd"; /* /motd command */
+loadmodule "modules/m_names"; /* /names command */
+loadmodule "modules/m_netinfo"; /* /netinfo command */
+loadmodule "modules/m_nick"; /* /nick command */
+loadmodule "modules/m_nopost"; /* Ban GET/POST/PUT commands */
+loadmodule "modules/m_oper"; /* /oper command */
+loadmodule "modules/m_part"; /* /part command */
+loadmodule "modules/m_pass"; /* /pass command */
+loadmodule "modules/m_pingpong"; /* PING/PONG */
+loadmodule "modules/m_protoctl"; /* /protoctl command*/
+loadmodule "modules/m_quit"; /* /quit command */
+loadmodule "modules/m_rping"; /* /rping command */
+loadmodule "modules/m_rules"; /* /rules command */
+loadmodule "modules/m_sasl"; /* SASL protocol command */
+loadmodule "modules/m_sendumode"; /* SMO protocol command */
+loadmodule "modules/m_sendsno"; /* /sendsno command */
+loadmodule "modules/m_server"; /* /server command */
+loadmodule "modules/m_silence"; /* /silence command */
+loadmodule "modules/m_sjoin"; /* /sjoin command */
+loadmodule "modules/m_sqline"; /* /sqline command */
+loadmodule "modules/m_squit"; /* /squit command */
+loadmodule "modules/m_starttls"; /* /starttls command */
+loadmodule "modules/m_stats"; /* /stats command */
+loadmodule "modules/m_time"; /* /time command */
+loadmodule "modules/m_topic"; /* /topic command */
+loadmodule "modules/m_trace"; /* /trace command */
+loadmodule "modules/m_tkl"; /* /gline,shun,gzline,kline,zline,spamfilter,tempshun commands */
+loadmodule "modules/m_tsctl"; /* /tsctl command */
+loadmodule "modules/m_user"; /* /user command */
+loadmodule "modules/m_userhost"; /* /userhost command */
+loadmodule "modules/m_userip"; /* /userip command */
+loadmodule "modules/m_umode2"; /* /umode2 command */
+loadmodule "modules/m_unkline"; /* /unkline command */
+loadmodule "modules/m_unsqline"; /* /unsqline command */
+loadmodule "modules/m_unzline"; /* /unzline command */
+loadmodule "modules/m_wallops"; /* /wallops command */
+loadmodule "modules/m_watch"; /* /watch command */
+loadmodule "modules/m_who"; /* /who command */
+loadmodule "modules/m_whois"; /* /whois command */
+loadmodule "modules/m_whowas"; /* /whowas command */
+
+/** Required for services **/
+loadmodule "modules/m_chghost"; /* /chghost command */
+loadmodule "modules/m_chgident"; /* /chgident command */
+loadmodule "modules/m_guest"; /* /guest command */
+loadmodule "modules/m_svsfline"; /* /svsfline command */
+loadmodule "modules/m_svsjoin"; /* /svsjoin command */
+loadmodule "modules/m_svskill"; /* /svskill command */
+loadmodule "modules/m_svslusers"; /* /svslusers command */
+loadmodule "modules/m_svsmode"; /* /svsmode command */
+loadmodule "modules/m_svsmotd"; /* /svsmotd command */
+loadmodule "modules/m_svsnick"; /* /svsnick command */
+loadmodule "modules/m_svssno"; /* /svssno command */
+loadmodule "modules/m_svsnolag"; /* /svsnolag command */
+loadmodule "modules/m_svsnoop"; /* /svsnoop command */
+loadmodule "modules/m_svsnline"; /* /svsnline command */
+loadmodule "modules/m_svso"; /* /svso command */
+loadmodule "modules/m_svspart"; /* /svspart command */
+loadmodule "modules/m_svssilence"; /* /svssilence command */
+loadmodule "modules/m_svswatch"; /* /svswatch command */
+
+/** Optional modules **/
+loadmodule "modules/m_addline"; /* /addline command */
+loadmodule "modules/m_addmotd"; /* /addmotd command */
+loadmodule "modules/m_addomotd"; /* /addmotd command */
+loadmodule "modules/m_adminchat"; /* /adminchat command */
+loadmodule "modules/m_botmotd"; /* /botmotd command */
+loadmodule "modules/m_chatops"; /* /chatops command */
+loadmodule "modules/m_chgname"; /* /chgname command */
+loadmodule "modules/m_cycle"; /* /cycle command */
+loadmodule "modules/m_dccallow"; /* /dccallow command */
+loadmodule "modules/m_dccdeny"; /* /dccdeny command */
+loadmodule "modules/m_globops"; /* /globops command */
+loadmodule "modules/m_lag"; /* /lag command */
+loadmodule "modules/m_locops"; /* /locops command */
+loadmodule "modules/m_mkpasswd"; /* /mkpasswd command */
+loadmodule "modules/m_nachat"; /* /nachat command */
+loadmodule "modules/m_opermotd"; /* /opermotd command */
+loadmodule "modules/m_sajoin"; /* /sajoin command */
+loadmodule "modules/m_samode"; /* /samode command */
+loadmodule "modules/m_sapart"; /* /sapart command */
+loadmodule "modules/m_sdesc"; /* /sdesc command */
+loadmodule "modules/m_setident"; /* /setident command */
+loadmodule "modules/m_setname"; /* /setname command */
+loadmodule "modules/m_swhois"; /* /swhois command */
+loadmodule "modules/m_undccdeny"; /* /undccdeny command */
+loadmodule "modules/m_vhost"; /* /vhost command */
 
 /*** Channel modes ***/
-loadmodule "modules/chanmodes/jointhrottle"; /* +j */
-loadmodule "modules/chanmodes/floodprot"; /* +f */
+loadmodule "modules/chanmodes/adminonly"; /* +A */
 loadmodule "modules/chanmodes/nocolor"; /* +c */
 loadmodule "modules/chanmodes/noctcp"; /* +C */
-loadmodule "modules/chanmodes/stripcolor"; /* +S */
-loadmodule "modules/chanmodes/issecure"; /* +Z */
-loadmodule "modules/chanmodes/permanent"; /* +P */
-loadmodule "modules/chanmodes/link"; /* +L */
-loadmodule "modules/chanmodes/censor"; /* +G */
 loadmodule "modules/chanmodes/delayjoin"; /* +D  */
+loadmodule "modules/chanmodes/floodprot"; /* +f */
+loadmodule "modules/chanmodes/censor"; /* +G */
+loadmodule "modules/chanmodes/jointhrottle"; /* +j */
 loadmodule "modules/chanmodes/noknock"; /* +K */
-loadmodule "modules/chanmodes/noinvite"; /* +V */
-loadmodule "modules/chanmodes/operonly"; /* +O */
-loadmodule "modules/chanmodes/adminonly"; /* +A */
-loadmodule "modules/chanmodes/nonotice"; /* +T */
-loadmodule "modules/chanmodes/regonly"; /* +R */
+loadmodule "modules/chanmodes/link"; /* +L */
+loadmodule "modules/chanmodes/regonlyspeak"; /* +M */
 loadmodule "modules/chanmodes/nonickchange"; /* +N */
+loadmodule "modules/chanmodes/operonly"; /* +O */
+loadmodule "modules/chanmodes/permanent"; /* +P */
 loadmodule "modules/chanmodes/nokick"; /* +Q */
-loadmodule "modules/chanmodes/regonlyspeak"; /* +M */
+loadmodule "modules/chanmodes/regonly"; /* +R */
+loadmodule "modules/chanmodes/stripcolor"; /* +S */
+loadmodule "modules/chanmodes/nonotice"; /* +T */
+loadmodule "modules/chanmodes/noinvite"; /* +V */
 loadmodule "modules/chanmodes/secureonly"; /* +z */
-
+loadmodule "modules/chanmodes/issecure"; /* +Z */
 
 /*** User modes ***/
-loadmodule "modules/usermodes/noctcp"; /* +T */
 loadmodule "modules/usermodes/censor"; /* +G */
+loadmodule "modules/usermodes/noctcp"; /* +T */