diff --git a/1.1/m_modesquish.cpp b/1.1/m_modesquish.cpp
index a197e3db..da5bed6f 100644
--- a/1.1/m_modesquish.cpp
+++ b/1.1/m_modesquish.cpp
@@ -1,209 +1,209 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
- *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
- *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
- *
- * ---------------------------------------------------
- */
-
-#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
-
-/* $ModDesc: Pre-parses MODE command to remove redundant modes */
-/* $ModAuthor: Skip */
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "users.h"
+#include "channels.h"
+#include "modules.h"
+#include "mode.h"
+
+/* $ModDesc: Pre-parses MODE command to remove redundant modes */
+/* $ModAuthor: Skip */
 /* $ModREMOVEAuthorMail: unknown */
 /* $ModDepends: core 1.1 */
-/* $ModVersion: $Rev: 78 $ */
-
-class module_modesquish : public Module
-{
- public:
-	
-	module_modesquish(InspIRCd* Me)
-		: Module(Me)
-	{
-	}
-
-	void Implements(char* List)
-	{
-		List[I_OnPreCommand] = 1;
-	}
-
-	virtual ~module_modesquish()
-	{
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,1,0,API_VERSION);
-	}
-
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
-	{
-		if (validated && command == "MODE" && pcnt > 1)
-		{
-			class squishy
-			{
-				public:
-				squishy() {};
-				~squishy() {};
-				bool adding;
-				unsigned char flag;
-				std::string *param;
-			};
-
-			/*
-			 * Find out what we are
-			 */
-			chanrec* targetchannel	= ServerInstance->FindChan(parameters[0]);
-			userrec* targetuser	= ServerInstance->FindNick(parameters[0]);
-			ModeType type;
-			ModeHandler* handler;
-			bool adding = true;
-			bool abort = false;
-
-			squishy* squish;
-			std::vector<void*> squish_list;
-
-			if (targetchannel)
-				type = MODETYPE_CHANNEL;
-			else if (targetuser)
-				type = MODETYPE_USER;
-			else	return 0;
-
-			std::string mode_sequence = parameters[1];
-
-			std::string parameter;
-			int parameter_index = 2;
-
-			/*
-			 * Loop through all the flags
-			 */
-			for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
-			{
-				unsigned char modechar = *letter;
-				switch (modechar)
-				{
-					case '+':
-					case '-':
-					adding = (modechar == '+' ? true : false );
-					break;
-
-					default:
-					handler = ServerInstance->Modes->FindMode(modechar, type);
-					parameter.clear();
-
-					/*
-					 * Grab us a param ?
-					 */
-					if (handler && handler->GetModeType() == type
-						&& handler->GetNumParams(adding) && parameter_index < pcnt)
-						parameter = parameters[parameter_index++];
-
-					squish = NULL;
-					abort = false;
-					for (std::vector<void*>::iterator i = squish_list.begin(); i != squish_list.end(); i++)
-					{
-						squish = (squishy*)(*i);
-						if (squish->flag == modechar && ((squish->param->empty() && parameter.empty())
-							|| !strcmp(squish->param->c_str(),parameter.c_str())))
-						{
-							abort = true;
-							if (adding != squish->adding)
-							{
-								squish_list.erase(i);
-								delete squish->param;
-								delete squish;
-							}
-							
-							break;
-						}
-					}
-					
-					if (abort)
-						break;
-
-					/*
-					 * Add it to our squish list
-					 */
-					squish = new squishy();
-					squish->flag = modechar;
-					squish->adding = adding;
-					squish_list.push_back((void*)squish);
-					if (!parameter.empty())
-						squish->param = new std::string (parameter);
-					else	squish->param = new std::string ();
-					
-					break;
-				}
-			}
-			
-
-			/*
-			 * Ok, build our mode string back from squish list
-			 */
-
-			const char *squish_p[127];
-			int squish_pcnt = 2;
-			std::string squish_mode_sequence;
-
-			squish_p[0] = parameters[0]; /* target */
-			adding = true;
-
-			for (std::vector<void*>::iterator i = squish_list.begin(); i != squish_list.end(); i++)
-			{
-				squish = (squishy*)(*i);
-				
-				if (squish_mode_sequence.empty() || adding != squish->adding)
-					squish_mode_sequence.append((squish->adding ? "+" : "-"));
-				adding = squish->adding;
-				squish_mode_sequence.append(1, squish->flag);
-
-				if (!squish->param->empty())
-					squish_p[squish_pcnt++] = squish->param->c_str();
-			}
-
-			squish_p[1] = squish_mode_sequence.c_str();
-
-			/*
-			 * Finally, send out our new and improved mode!
-			 * (provided we didn't squish it to nothingness)
-			 */
-			if (!squish_mode_sequence.empty())
-				ServerInstance->CallCommandHandler("MODE", squish_p, squish_pcnt, user);
-				
-
-			/*
-			 * Clean up
-			 */
-			for (std::vector<void*>::iterator i = squish_list.begin(); i != squish_list.end(); i++)
-			{
-				squish = (squishy*)(*i);
-
-				delete squish->param;
-				delete squish;
-			}
-			squish_list.clear();
-
-			/*
-			 * And stop *this* MODE getting through
-			 */
-			return 1;
-
-		}
-
-		return 0;
-	}
-};
-
-MODULE_INIT(module_modesquish)
-
+/* $ModVersion: $Rev: 78 $ */
+
+class module_modesquish : public Module
+{
+ public:
+	
+	module_modesquish(InspIRCd* Me)
+		: Module(Me)
+	{
+	}
+
+	void Implements(char* List)
+	{
+		List[I_OnPreCommand] = 1;
+	}
+
+	virtual ~module_modesquish()
+	{
+	}
+
+	virtual Version GetVersion()
+	{
+		return Version(1,1,0,1,0,API_VERSION);
+	}
+
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	{
+		if (validated && command == "MODE" && pcnt > 1)
+		{
+			class squishy
+			{
+				public:
+				squishy() {};
+				~squishy() {};
+				bool adding;
+				unsigned char flag;
+				std::string *param;
+			};
+
+			/*
+			 * Find out what we are
+			 */
+			chanrec* targetchannel	= ServerInstance->FindChan(parameters[0]);
+			userrec* targetuser	= ServerInstance->FindNick(parameters[0]);
+			ModeType type;
+			ModeHandler* handler;
+			bool adding = true;
+			bool abort = false;
+
+			squishy* squish;
+			std::vector<void*> squish_list;
+
+			if (targetchannel)
+				type = MODETYPE_CHANNEL;
+			else if (targetuser)
+				type = MODETYPE_USER;
+			else	return 0;
+
+			std::string mode_sequence = parameters[1];
+
+			std::string parameter;
+			int parameter_index = 2;
+
+			/*
+			 * Loop through all the flags
+			 */
+			for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
+			{
+				unsigned char modechar = *letter;
+				switch (modechar)
+				{
+					case '+':
+					case '-':
+					adding = (modechar == '+' ? true : false );
+					break;
+
+					default:
+					handler = ServerInstance->Modes->FindMode(modechar, type);
+					parameter.clear();
+
+					/*
+					 * Grab us a param ?
+					 */
+					if (handler && handler->GetModeType() == type
+						&& handler->GetNumParams(adding) && parameter_index < pcnt)
+						parameter = parameters[parameter_index++];
+
+					squish = NULL;
+					abort = false;
+					for (std::vector<void*>::iterator i = squish_list.begin(); i != squish_list.end(); i++)
+					{
+						squish = (squishy*)(*i);
+						if (squish->flag == modechar && ((squish->param->empty() && parameter.empty())
+							|| !strcmp(squish->param->c_str(),parameter.c_str())))
+						{
+							abort = true;
+							if (adding != squish->adding)
+							{
+								squish_list.erase(i);
+								delete squish->param;
+								delete squish;
+							}
+							
+							break;
+						}
+					}
+					
+					if (abort)
+						break;
+
+					/*
+					 * Add it to our squish list
+					 */
+					squish = new squishy();
+					squish->flag = modechar;
+					squish->adding = adding;
+					squish_list.push_back((void*)squish);
+					if (!parameter.empty())
+						squish->param = new std::string (parameter);
+					else	squish->param = new std::string ();
+					
+					break;
+				}
+			}
+			
+
+			/*
+			 * Ok, build our mode string back from squish list
+			 */
+
+			const char *squish_p[127];
+			int squish_pcnt = 2;
+			std::string squish_mode_sequence;
+
+			squish_p[0] = parameters[0]; /* target */
+			adding = true;
+
+			for (std::vector<void*>::iterator i = squish_list.begin(); i != squish_list.end(); i++)
+			{
+				squish = (squishy*)(*i);
+				
+				if (squish_mode_sequence.empty() || adding != squish->adding)
+					squish_mode_sequence.append((squish->adding ? "+" : "-"));
+				adding = squish->adding;
+				squish_mode_sequence.append(1, squish->flag);
+
+				if (!squish->param->empty())
+					squish_p[squish_pcnt++] = squish->param->c_str();
+			}
+
+			squish_p[1] = squish_mode_sequence.c_str();
+
+			/*
+			 * Finally, send out our new and improved mode!
+			 * (provided we didn't squish it to nothingness)
+			 */
+			if (!squish_mode_sequence.empty())
+				ServerInstance->CallCommandHandler("MODE", squish_p, squish_pcnt, user);
+				
+
+			/*
+			 * Clean up
+			 */
+			for (std::vector<void*>::iterator i = squish_list.begin(); i != squish_list.end(); i++)
+			{
+				squish = (squishy*)(*i);
+
+				delete squish->param;
+				delete squish;
+			}
+			squish_list.clear();
+
+			/*
+			 * And stop *this* MODE getting through
+			 */
+			return 1;
+
+		}
+
+		return 0;
+	}
+};
+
+MODULE_INIT(module_modesquish)
+
 
diff --git a/1.1/m_operflood.cpp b/1.1/m_operflood.cpp
index d45ac829..85ee0870 100644
--- a/1.1/m_operflood.cpp
+++ b/1.1/m_operflood.cpp
@@ -1,63 +1,63 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
- *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
- *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
- *
- * ---------------------------------------------------
- */
-
-#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "users.h"
+#include "channels.h"
 #include "modules.h"
 
-/* $ModDesc: Removes flood limits from users upon opering up. */
-/* $ModAuthor: ? */
+/* $ModDesc: Removes flood limits from users upon opering up. */
+/* $ModAuthor: ? */
 /* $ModAuthorMailXXX:  */
 /* $ModDepends: core 1.1 */
-/* $ModVersion: $Rev: 78 $ */
-
-class ModuleOperFlood : public Module
-{
-public:
-	ModuleOperFlood(InspIRCd * Me) : Module(Me) {}
-
-	void Implements(char * List)
-	{
-		List[I_OnPostOper] = 1;
-	}
-
-	Version GetVersion()
-	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-	}
-
-	void OnPostOper(userrec* user, const std::string &opertype)
-	{
-		if(!IS_LOCAL(user))
-			return;
-
-		user->flood = 0;
-		user->WriteServ("NOTICE %s :*** You are now free from flood limits.", user->nick);
-	}
-};
-
-class ModuleOperFloodFactory : public ModuleFactory
-{
-public:
-	Module * CreateModule(InspIRCd * Me)
-	{
-		return new ModuleOperFlood(Me);
-	}
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleOperFloodFactory;
-}
+/* $ModVersion: $Rev: 78 $ */
+
+class ModuleOperFlood : public Module
+{
+public:
+	ModuleOperFlood(InspIRCd * Me) : Module(Me) {}
+
+	void Implements(char * List)
+	{
+		List[I_OnPostOper] = 1;
+	}
+
+	Version GetVersion()
+	{
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+	}
+
+	void OnPostOper(userrec* user, const std::string &opertype)
+	{
+		if(!IS_LOCAL(user))
+			return;
+
+		user->flood = 0;
+		user->WriteServ("NOTICE %s :*** You are now free from flood limits.", user->nick);
+	}
+};
+
+class ModuleOperFloodFactory : public ModuleFactory
+{
+public:
+	Module * CreateModule(InspIRCd * Me)
+	{
+		return new ModuleOperFlood(Me);
+	}
+};
+
+extern "C" DllExport void * init_module( void )
+{
+	return new ModuleOperFloodFactory;
+}
 
diff --git a/2.2/m_changecap.cpp b/2.2/m_changecap.cpp
index 8f32cafe..01093109 100644
--- a/2.2/m_changecap.cpp
+++ b/2.2/m_changecap.cpp
@@ -18,21 +18,21 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides the CHANGECAP command that allows a channel op to change the capitalization of the channel name */
-/* $ModAuthor: Daniel Vassdasl */
-/* $ModAuthorMail: shutter@canternet.org */
-/* $ModDepends: core 2.2 */
+/* $ModDesc: Provides the CHANGECAP command that allows a channel op to change the capitalization of the channel name */
+/* $ModAuthor: Daniel Vassdasl */
+/* $ModAuthorMail: shutter@canternet.org */
+/* $ModDepends: core 2.2 */
 
 /** Handle /CHANGECAP
  */
 
 class ChangeCap : public Command
 {
- public:
+ public:
 	ChangeCap(Module* Creator) : Command(Creator, "CHANGECAP", 1)
 	{
 		allow_empty_last_param = false;
-		syntax = "<channel>";
+		syntax = "<channel>";
 	}
 
 	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
@@ -58,7 +58,7 @@ class ChangeCap : public Command
 				user->WriteNotice("*** CHANGECAP The channel is already using this capitalization");
 				return CMD_FAILURE;
 			}
-			user->WriteNotice("*** CHANGECAP Changed from " + chan->name + " to " + parameters[0]);
+			user->WriteNotice("*** CHANGECAP Changed from " + chan->name + " to " + parameters[0]);
 		}
 
 		ServerInstance->chanlist->erase(chan->name);
@@ -78,7 +78,7 @@ class ModuleChangeCap : public Module
 {
 	ChangeCap cmd;
 
- public:
+ public:
 	ModuleChangeCap() : cmd(this) {	}
 
 	void init()
@@ -88,7 +88,7 @@ class ModuleChangeCap : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides the CHANGECAP command that allows a channel op to change the capitalization of the channel name", VF_OPTCOMMON);
+		return Version("Provides the CHANGECAP command that allows a channel op to change the capitalization of the channel name", VF_OPTCOMMON);
 	}
 };