Merge branch '2.0' into 2.1.

50 files changed, 176 insertions, 136 deletions

diff --git a/cmake/Anope.cmake b/cmake/Anope.cmake
index 75e2a36dc..d8a8007c8 100644
--- a/cmake/Anope.cmake
+++ b/cmake/Anope.cmake
@@ -261,7 +261,7 @@ endmacro()
 # check_functions(<source filename> <output variable set to TRUE on success>)
 #
 # This macro is used in most of the module (sub)directories to calculate the
-#   fcuntion dependencies for the given source file.
+#   function dependencies for the given source file.
 ###############################################################################
 macro(check_functions SRC SUCCESS)
   # Default to true
diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
index b40e82761..d2df95e74 100644
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@@ -348,7 +348,7 @@ Function un.RemoveFromPath
 FunctionEnd
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
+; Uninstall stuff
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ###########################################
@@ -452,15 +452,15 @@ Done:
 	Exch $R1
 FunctionEnd
 
-Function ConditionalAddToRegisty
+Function ConditionalAddToRegistry
   Pop $0
   Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
+  StrCmp "$0" "" ConditionalAddToRegistry_EmptyString
     WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" \
     "$1" "$0"
     ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
     DetailPrint "Set install registry entry: '$1' to '$0'"
-  ConditionalAddToRegisty_EmptyString:
+  ConditionalAddToRegistry_EmptyString:
 FunctionEnd
 
 ;--------------------------------
@@ -558,44 +558,44 @@ Section "-Core installation"
   WriteUninstaller "$INSTDIR\Uninstall.exe"
   Push "DisplayName"
   Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "DisplayVersion"
   Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "Publisher"
   Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "UninstallString"
   Push "$INSTDIR\Uninstall.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "NoRepair"
   Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
 
   !ifdef CPACK_NSIS_ADD_REMOVE
   ;Create add/remove functionality
   Push "ModifyPath"
   Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !else
   Push "NoModify"
   Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !endif
 
   ; Optional registration
   Push "DisplayIcon"
   Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "HelpLink"
   Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "URLInfoAbout"
   Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "Contact"
   Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 
   ;Create shortcuts
@@ -607,19 +607,19 @@ Section "-Core installation"
   ; Write special uninstall registry entries
   Push "StartMenu"
   Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "DoNotAddToPath"
   Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "AddToPathAllUsers"
   Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "AddToPathCurrentUser"
   Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "InstallToDesktop"
   Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
 
 @CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
 
@@ -739,7 +739,7 @@ Section "Uninstall"
 @CPACK_NSIS_DELETE_ICONS@
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   startMenuDeleteLoop:
@@ -752,13 +752,13 @@ Section "Uninstall"
     StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
   startMenuDeleteLoopDone:
 
-  ; If the user changed the shortcut, then untinstall may not work. This should
+  ; If the user changed the shortcut, then uninstall may not work. This should
   ; try to fix it.
   StrCpy $MUI_TEMP "$START_MENU"
   Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   secondStartMenuDeleteLoop:
diff --git a/data/anope.example.conf b/data/anope.example.conf
index 88ac0a948..407bbe535 100644
--- a/data/anope.example.conf
+++ b/data/anope.example.conf
@@ -695,7 +695,7 @@ log
 	 * means "* ~operserv/*" would log everything because * matches everything.
 	 *
 	 * Valid admin, override, and command options are:
-	 *    pesudo-serv/commandname (e.g. operserv/akill, chanserv/set)
+	 *    pseudo-serv/commandname (e.g. operserv/akill, chanserv/set)
 	 *
 	 * Valid server options are:
 	 *    connect, quit, sync, squit
diff --git a/docs/CODING b/docs/CODING
index 31fa4e847..6c56d0ddf 100644
--- a/docs/CODING
+++ b/docs/CODING
@@ -59,7 +59,7 @@ yet follows these. This will be rectified with time.
 4. Braces
 
    Always put braces opening and closing blocks on separate lines, see the
-   identation example. For example, place braces like this:
+   indentation example. For example, place braces like this:
      if (apples == "green")
      {
          cout << "Apples are green" << endl;
diff --git a/docs/Changes b/docs/Changes
index 67674e156..4d4f25b4f 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -83,7 +83,7 @@ Fix chankill to not add duplicate akills
 Allow nickserv/maxemail to disregard gmail style aliases when comparing emails
 Fix chanserv/mode when setting listmodes with CIDR ranges
 Fix reported expiry time when the time is divisible by 1 year
-Clearify botserv repeat kicker help and allow setting repeat times to 1
+Clarify botserv repeat kicker help and allow setting repeat times to 1
 Send vident/vhost with SASL login
 Add support for SASL reauth
 Fix log and database backup directories to be properly created by the installer
@@ -255,7 +255,7 @@ Anope Version 1.9.3
 A Added italics BotServ kicks support
 A Tell users when their nicks expire in /ns glist and /ns info
 A Added SSL support
-A Prevent negaitve mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
+A Prevent negative mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
 A Added nickserv/auxpex permission
 A Added nickserv ungroup command
 A Renamed the SGLINE to be SNLINE
@@ -267,15 +267,15 @@ A Added m_mysql which uses threads to execute queries
 A Added many subcommand modules for some commands, eg ns_set_autoop, ns_set_email, etc
 A Added a new logging system that is a bit more flexible
 A Added cs_set_misc and ns_set_misc to add miscellaneous set commands
-A Added os_modreload, which allows reloading some modules not normally unloable, like the protocol module
+A Added os_modreload, which allows reloading some modules not normally unloadable, like the protocol module
 A Added FOUNDER access level
 A Made OperServ, Global, MemoServ, and ChanServ optional
 F Shutting down if a config reload fails
 F Autoid to live through restarts on Unreal
 F Storing vhosts in MySQL
-F Not flushing the anope_extra table before rewriting databaes
+F Not flushing the anope_extra table before rewriting database
 F Anoperc start/stop to send the globaloncycle global, and fixed anoperc rehash to really rehash
-F Fixed a potential crash if HostServ or BotServ was disbled
+F Fixed a potential crash if HostServ or BotServ was disabled
 
 Anope Version 1.9.2
 -------------------
@@ -299,7 +299,7 @@ F Unban command to accept an optional nick arg
 F Some typos in services.conf
 F Crash when users change their host that are identified to a group, but not a nick
 F Host length checking in HS SET(ALL) and HS REQUEST
-F Only show if a user is online in NS INFO if they are really identiifed for the group of the nick they are on
+F Only show if a user is online in NS INFO if they are really identified for the group of the nick they are on
 F Crash when using BSSmartJoin
 F Converting access entries to access from xop when a users access is below voice
 F A bad pointer passed to the OnDelEvent which could cause some 3rd party modules to crash
diff --git a/docs/Changes.conf b/docs/Changes.conf
index 4f0077413..de3e0bf44 100644
--- a/docs/Changes.conf
+++ b/docs/Changes.conf
@@ -69,7 +69,7 @@ mail:restrict removed
 
 Anope Version 1.9.9
 -------------------
-There is not many config changes betewen 1.9.8 and 1.9.9, however many of the
+There is not many config changes between 1.9.8 and 1.9.9, however many of the
 options have been moved around to make more sense, too many to list here,
 so get a new config.
 
@@ -170,7 +170,7 @@ options:enablelogchannel added to auto turn on the logchannel on startup
 options:mlock added to configure the default mlock modes on new channels
 options:database added for the database modules
 options:botmodes added to configure modes BotServ bots should use
-options:userlen added to configure maxiumum ident length
+options:userlen added to configure maximum ident length
 options:hostlen added to configure maximum hostname length
 options:database added to configure what database modules to use
 options:passlen added to specify the maximum length of passwords
diff --git a/docs/INSTALL b/docs/INSTALL
index 5046c6912..ffbf04906 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -80,7 +80,7 @@ Note: You should also read the README and FAQ files!
 
     The configuration varies depending on the IRCd, but you will probably need
     a link block (also called connect block, or C line), a U line (also called
-    a shared block), and be sure that the IRCd is listneing on the given port
+    a shared block), and be sure that the IRCd is listening on the given port
     in the link block.
 
     Example link configurations can be found in anope.example.conf for some of the
diff --git a/docs/LANGUAGE b/docs/LANGUAGE
index bb76ca485..3aab36b45 100644
--- a/docs/LANGUAGE
+++ b/docs/LANGUAGE
@@ -1,4 +1,4 @@
-Anope Mutli Language Support
+Anope Multi Language Support
 ----------------------------
 
 1) Building Anope with gettext support
@@ -36,7 +36,7 @@ Anope Mutli Language Support
 
     NOTE: There is no guarantee we will use your work so please do not be offended if we say no thanks.
 
-3) Using langages with modules
+3) Using languages with modules
 
     Module authors can easily add the ability to have their modules translated by adding _() around the strings they
     want translated (messages to the user, etc).
diff --git a/docs/REDIS b/docs/REDIS
index d18585979..8f7a076fd 100644
--- a/docs/REDIS
+++ b/docs/REDIS
@@ -32,7 +32,7 @@ Table of Contents
 
         hash -  The keys in hash are the actual objects, stored as hashes. For
                 example, if I had just looked up all BotInfo ids and wanted to iterate
-                over all of them, I woulld start by:
+                over all of them, I would start by:
 
                 redis 127.0.0.1:6379> HGETALL hash:BotInfo:1
 
@@ -73,7 +73,7 @@ Table of Contents
     (https://redis.io/topics/notifications). This allows Redis to notify Anope of
     any external changes to objects in the database. Once notified, Anope will
     immediately update the object. Otherwise, Anope keeps all objects in memory
-    and will not regularly read from the databaes once started.
+    and will not regularly read from the database once started.
 
     You can use this to modify objects in Redis and have them immediately reflected
     back into Anope. Additionally you can use this feature to run multiple Anope
@@ -93,7 +93,7 @@ Table of Contents
 
     The key space ids and value are managed entirely by Anope, you do
     not (and should not) modify them. Once you modify the object (hash), Anope will
-    update them for you to correctly refelect any changes made to the object.
+    update them for you to correctly reflect any changes made to the object.
 
     Finally, always use atomic operations. If you are inserting a new object with
     multiple commands, or inserting multiple objects at once, specifically if the
diff --git a/include/account.h b/include/account.h
index d4b255c29..1a6809d90 100644
--- a/include/account.h
+++ b/include/account.h
@@ -61,7 +61,7 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	 * @param ident The ident
 	 * @param host The host
 	 * @param creator Who created the vhost
-	 * @param time When the vhost was craated
+	 * @param time When the vhost was created
 	 */
 	void SetVhost(const Anope::string &ident, const Anope::string &host, const Anope::string &creator, time_t created = Anope::CurTime);
 
@@ -130,7 +130,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 	 */
 	Serialize::Checker<std::vector<NickAlias *> > aliases;
 
-	/* Set if this user is a services operattor. o->ot must exist. */
+	/* Set if this user is a services operator. o->ot must exist. */
 	Oper *o;
 
 	/* Unsaved data */
@@ -234,7 +234,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 class CoreExport IdentifyRequest
 {
 	/* Owner of this request, used to cleanup requests if a module is unloaded
-	 * while a reqyest us pending */
+	 * while a request us pending */
 	Module *owner;
 	Anope::string account;
 	Anope::string password;
@@ -262,17 +262,17 @@ class CoreExport IdentifyRequest
 	 * for the request to complete. Multiple modules may hold a request at any time,
 	 * but the request is not complete until every module has released it. If you do not
 	 * require holding this (eg, your password check is done in this thread and immediately)
-	 * then you don't need to hold the request before Successing it.
+	 * then you don't need to hold the request before calling `Success()`.
 	 * @param m The module holding this request
 	 */
 	void Hold(Module *m);
 
 	/** Releases a held request
-	 * @param m The module releaseing the hold
+	 * @param m The module releasing the hold
 	 */
 	void Release(Module *m);
 
-	/** Called by modules when this IdentifyRequest has successeded successfully.
+	/** Called by modules when this IdentifyRequest has succeeded.
 	 * If this request is behind held it must still be Released after calling this.
 	 * @param m The module confirming authentication
 	 */
diff --git a/include/anope.h b/include/anope.h
index aae043841..d998ce1a9 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -362,7 +362,7 @@ namespace Anope
 	 */
 	extern CoreExport int Debug;
 
-	/** Other comand line options.
+	/** Other command line options.
 	 */
 	extern CoreExport bool ReadOnly, NoFork, NoThird, NoExpire, ProtocolDebug;
 
@@ -403,7 +403,7 @@ namespace Anope
 
 	/** Used to "fork" the process and go into the background during initial startup
 	 * while we are AtTerm(). The actual fork is not done here, but earlier, and this
-	 * simply notifys the parent via kill() to exit().
+	 * simply notifies the parent via kill() to exit().
 	 */
 	extern void Fork();
 
@@ -413,7 +413,7 @@ namespace Anope
 
 	/** One of the first functions called, does general initialization such as reading
 	 * command line args, loading the configuration, doing the initial fork() if necessary,
-	 * initializating language support, loading modules, and loading databases.
+	 * initializing language support, loading modules, and loading databases.
 	 * @throws CoreException if something bad went wrong
 	 */
 	extern void Init(int ac, char **av);
@@ -566,7 +566,7 @@ class CoreExport sepstream
  public:
 	/** Create a sepstream and fill it with the provided data
 	 */
-	sepstream(const Anope::string &source, char seperator, bool allowempty = false);
+	sepstream(const Anope::string &source, char separator, bool allowempty = false);
 
 	/** Fetch the next token from the stream
 	 * @param token The next token from the stream is placed here
@@ -576,7 +576,7 @@ class CoreExport sepstream
 
 	/** Gets token number 'num' from the stream
 	 * @param token The token is placed here
-	 * @param num The token number to featch
+	 * @param num The token number to fetch
 	 * @return True if the token was able to be fetched
 	 */
 	bool GetToken(Anope::string &token, int num);
@@ -594,7 +594,7 @@ class CoreExport sepstream
 
 	/** Gets token number 'num' from the stream and all remaining tokens.
 	 * @param token The token is placed here
-	 * @param num The token number to featch
+	 * @param num The token number to fetch
 	 * @return True if the token was able to be fetched
 	 */
 	bool GetTokenRemainder(Anope::string &token, int num);
@@ -620,7 +620,7 @@ class CoreExport sepstream
 class commasepstream : public sepstream
 {
  public:
-	/** Initialize with comma seperator
+	/** Initialize with comma separator
 	 */
 	commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { }
 };
@@ -630,7 +630,7 @@ class commasepstream : public sepstream
 class spacesepstream : public sepstream
 {
  public:
-	/** Initialize with space seperator
+	/** Initialize with space separator
 	 */
 	spacesepstream(const Anope::string &source) : sepstream(source, ' ') { }
 };
@@ -651,7 +651,7 @@ class CoreException : public std::exception
 	 */
 	Anope::string source;
  public:
-	/** Default constructor, just uses the error mesage 'Core threw an exception'.
+	/** Default constructor, just uses the error message 'Core threw an exception'.
 	 */
 	CoreException() : err("Core threw an exception"), source("The core") { }
 	/** This constructor can be used to specify an error message before throwing.
@@ -683,7 +683,7 @@ class CoreException : public std::exception
 class ModuleException : public CoreException
 {
  public:
-	/** Default constructor, just uses the error mesage 'Module threw an exception'.
+	/** Default constructor, just uses the error message 'Module threw an exception'.
 	 */
 	ModuleException() : CoreException("Module threw an exception", "A Module") { }
 
@@ -758,7 +758,7 @@ template<typename T> inline T convertTo(const Anope::string &s, bool failIfLefto
 }
 
 /** Casts to be used instead of dynamic_cast, this uses dynamic_cast
- * for debug builds and static_cast on releass builds
+ * for debug builds and static_cast on release builds
  * to speed up the program because dynamic_cast relies on RTTI.
  */
 #ifdef DEBUG_BUILD
diff --git a/include/channels.h b/include/channels.h
index 2d9b848d8..838dd15c0 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -232,7 +232,7 @@ class CoreExport Channel : public Base, public Extensible
 	 * @param bi The sender, can be NULL for the service bot for this channel
 	 * @param u The user being kicked
 	 * @param reason The reason for the kick
-	 * @return true if the kick was scucessful, false if a module blocked the kick
+	 * @return true if the kick was successful, false if a module blocked the kick
 	 */
 	bool Kick(BotInfo *bi, User *u, const char *reason = NULL, ...);
 
@@ -249,7 +249,7 @@ class CoreExport Channel : public Base, public Extensible
 
 	/** Get a string of the modes set on this channel
 	 * @param complete Include mode parameters
-	 * @param plus If set to false (with complete), mode parameters will not be given for modes requring no parameters to be unset
+	 * @param plus If set to false (with complete), mode parameters will not be given for modes requiring no parameters to be unset
 	 * @return A mode string
 	 */
 	Anope::string GetModes(bool complete, bool plus);
diff --git a/include/commands.h b/include/commands.h
index 5f41d68e9..64335720f 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -40,7 +40,7 @@ struct CommandInfo
 	bool prepend_channel;
 };
 
-/* Where the replies from commands go to. User inheits from this and is the normal
+/* Where the replies from commands go to. User inherits from this and is the normal
  * source of a CommandReply
  */
 struct CoreExport CommandReply
@@ -101,7 +101,7 @@ class CoreExport Command : public Service
 	bool require_user;
 
  public:
-	/* Maximum paramaters accepted by this command */
+	/* Maximum parameters accepted by this command */
 	size_t max_params;
 	/* Minimum parameters required to use this command */
 	size_t min_params;
@@ -148,7 +148,7 @@ class CoreExport Command : public Service
 	 */
 	virtual void Execute(CommandSource &source, const std::vector<Anope::string> &params) = 0;
 
-	/** Called when HELP is requsted for the client this command is on.
+	/** Called when HELP is requested for the client this command is on.
 	 * @param source The source
 	 */
 	virtual void OnServHelp(CommandSource &source);
@@ -178,7 +178,7 @@ class CoreExport Command : public Service
 	 * Note that if the same command exists multiple places this will return the first one encountered
 	 * @param command_service The command service to lookup, eg, nickserv/register
 	 * @param bot If found, is set to the bot the command is on, eg NickServ
-	 * @param name If found, is set to the comand name, eg REGISTER
+	 * @param name If found, is set to the command name, eg REGISTER
 	 * @return true if the given command service exists
 	 */
 	static bool FindCommandFromService(const Anope::string &command_service, BotInfo* &bi, Anope::string &name);
diff --git a/include/config.h b/include/config.h
index e02cf0157..d8ef07695 100644
--- a/include/config.h
+++ b/include/config.h
@@ -165,7 +165,7 @@ namespace Configuration
 class ConfigException : public CoreException
 {
  public:
-	/** Default constructor, just uses the error mesage 'Config threw an exception'.
+	/** Default constructor, just uses the error message 'Config threw an exception'.
 	 */
 	ConfigException() : CoreException("Config threw an exception", "Config Parser") { }
 	/** This constructor can be used to specify an error message before throwing.
diff --git a/include/hashcomp.h b/include/hashcomp.h
index ed1937842..983115620 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -26,7 +26,7 @@ namespace Anope
 {
 	class string;
 
-	/* Casemap in use by Anope. ci::string's comparation functions use this (and thus Anope::string) */
+	/* Casemap in use by Anope. ci::string's comparison functions use this (and thus Anope::string) */
 	extern std::locale casemap;
 
 	extern void CaseMapRebuild();
diff --git a/include/language.h b/include/language.h
index 0b55c7f22..b6940ee99 100644
--- a/include/language.h
+++ b/include/language.h
@@ -40,7 +40,7 @@ namespace Language
 	extern CoreExport const char *Translate(const char *string);
 
 	/** Translates a string to the language of the given user.
-	 * @param u The user to transate the string for
+	 * @param u The user to translate the string for
 	 * @param string A string to translate
 	 * @return The translated string if found, else the original string.
 	 */
diff --git a/include/logger.h b/include/logger.h
index 41f715eb3..51868d917 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -17,9 +17,9 @@
 
 enum LogType
 {
-	/* Used whenever an administrator uses an administrative comand */
+	/* Used whenever an administrator uses an administrative command */
 	LOG_ADMIN,
-	/* Used whenever an administrator overides something, such as adding
+	/* Used whenever an administrator overrides something, such as adding
 	 * access to a channel where they don't have permission to.
 	 */
 	LOG_OVERRIDE,
diff --git a/include/modes.h b/include/modes.h
index ed55f5911..04fc97791 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -96,7 +96,7 @@ class CoreExport UserModeParam : public UserMode
 class CoreExport ChannelMode : public Mode
 {
  public:
-	/* channel modes that can posssibly unwrap this mode */
+	/* channel modes that can possibly unwrap this mode */
 	std::vector<ChannelMode *> listeners;
 
 	/** constructor
@@ -400,7 +400,7 @@ class CoreExport Entry
 
 	/** Constructor
 	 * @param mode What mode this host is for, can be empty for unknown/no mode
-	 * @param host A full or poartial nick!ident@host/cidr#real name mask
+	 * @param host A full or partial nick!ident@host/cidr#real name mask
 	 */
 	Entry(const Anope::string &mode, const Anope::string &host);
 
diff --git a/include/modules.h b/include/modules.h
index 5c96026b2..c3379bc6d 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -506,7 +506,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnChanExpire(ChannelInfo *ci) { throw NotImplementedException(); }
 
-	/** Called before Anope connecs to its uplink
+	/** Called before Anope connects to its uplink
 	 */
 	virtual void OnPreServerConnect() { throw NotImplementedException(); }
 
@@ -554,7 +554,7 @@ class CoreExport Module : public Extensible
 
 	/** Called before an exception is deleted
 	 * @param source The source deleting it
-	 * @param ex The exceotion
+	 * @param ex The exception
 	 */
 	virtual void OnExceptionDel(CommandSource &source, Exception *ex) { throw NotImplementedException(); }
 
@@ -775,7 +775,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnNickSuspend(NickAlias *na) { throw NotImplementedException(); }
 
-	/** Called when a nick is unsuspneded
+	/** Called when a nick is unsuspended
 	 * @param na The nick alias
 	 */
 	virtual void OnNickUnsuspended(NickAlias *na) { throw NotImplementedException(); }
@@ -938,12 +938,12 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnUserModeUnset(const MessageSource &setter, User *u, const Anope::string &mname) { throw NotImplementedException(); }
 
-	/** Called when a channel mode is introducted into Anope
+	/** Called when a channel mode is introduced into Anope
 	 * @param cm The mode
 	 */
 	virtual void OnChannelModeAdd(ChannelMode *cm) { throw NotImplementedException(); }
 
-	/** Called when a user mode is introducted into Anope
+	/** Called when a user mode is introduced into Anope
 	 * @param um The mode
 	 */
 	virtual void OnUserModeAdd(UserMode *um) { throw NotImplementedException(); }
@@ -1079,7 +1079,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual EventReturn OnMessage(MessageSource &source, Anope::string &command, std::vector<Anope::string> &param) { throw NotImplementedException(); }
 
-	/** Called to determine if a chnanel mode can be set by a user
+	/** Called to determine if a channel mode can be set by a user
 	 * @param u The user
 	 * @param cm The mode
 	 */
@@ -1092,7 +1092,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnExpireTick() { throw NotImplementedException(); }
 
-	/** Called when a nick is validated. That is, to determine if a user is permissted
+	/** Called when a nick is validated. That is, to determine if a user is permitted
 	 * to be on the given nick.
 	 * @param u The user
 	 * @param na The nick they are on
@@ -1176,7 +1176,7 @@ class CoreExport ModuleManager
 	/** Checks whether this version of Anope is at least major.minor.patch.build
 	 * Throws a ModuleException if not
 	 * @param major The major version
-	 * @param minor The minor vesion
+	 * @param minor The minor version
 	 * @param patch The patch version
 	 */
 	static void RequireVersion(int major, int minor, int patch);
diff --git a/include/modules/httpd.h b/include/modules/httpd.h
index 43f6a279c..6431534e3 100644
--- a/include/modules/httpd.h
+++ b/include/modules/httpd.h
@@ -80,7 +80,7 @@ struct HTTPReply
 	}
 };
 
-/* A message from soneone */
+/* A message from someone */
 struct HTTPMessage
 {
 	std::map<Anope::string, Anope::string> headers;
diff --git a/include/modules/ns_cert.h b/include/modules/ns_cert.h
index 0b06d8f5e..a84276b52 100644
--- a/include/modules/ns_cert.h
+++ b/include/modules/ns_cert.h
@@ -26,7 +26,7 @@ struct NSCertList
 
 	/** Get an entry from the nick's cert list by index
 	 *
-	 * @param entry Index in the certificaate list vector to retrieve
+	 * @param entry Index in the certificate list vector to retrieve
 	 * @return The fingerprint entry of the given index if within bounds, an empty string if the vector is empty or the index is out of bounds
 	 *
 	 * Retrieves an entry from the certificate list corresponding to the given index.
diff --git a/include/modules/pseudoclients/memoserv.h b/include/modules/pseudoclients/memoserv.h
index dcfdf8864..e64b2104a 100644
--- a/include/modules/pseudoclients/memoserv.h
+++ b/include/modules/pseudoclients/memoserv.h
@@ -25,7 +25,7 @@ class MemoServService : public Service
 	}
 
 	/** Sends a memo.
-	 * @param source The source of the memo, can be anythin.
+	 * @param source The source of the memo, can be anything.
 	 * @param target The target of the memo, nick or channel.
 	 * @param message Memo text
 	 * @param force true to force the memo, restrictions/delays etc are not checked
diff --git a/include/opertype.h b/include/opertype.h
index 632706027..58f6049ab 100644
--- a/include/opertype.h
+++ b/include/opertype.h
@@ -67,7 +67,7 @@ class CoreExport OperType
 	 */
 	std::set<OperType *> inheritances;
  public:
-	/** Modes to set when someone identifys using this opertype
+	/** Modes to set when someone identifies using this opertype
 	 */
 	Anope::string modes;
 
diff --git a/include/protocol.h b/include/protocol.h
index feef6a162..cc3329bf1 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -15,8 +15,9 @@
 #include "services.h"
 #include "anope.h"
 #include "service.h"
+#include "modes.h"
 
-/* Encapsultes the IRCd protocol we are speaking. */
+/* Encapsulates the IRCd protocol we are speaking. */
 class CoreExport IRCDProto : public Service
 {
 	Anope::string proto_name;
@@ -54,7 +55,7 @@ class CoreExport IRCDProto : public Service
 	bool CanSNLine;
 	/* Can we ban specific nicknames from being used? */
 	bool CanSQLine;
-	/* Can we ban sepcific channel names from being used? */
+	/* Can we ban specific channel names from being used? */
 	bool CanSQLineChannel;
 	/* Can we ban by IP? */
 	bool CanSZLine;
@@ -237,6 +238,7 @@ class CoreExport IRCDProto : public Service
 	 * Defaults to Config->ListSize
 	 */
 	virtual unsigned GetMaxListFor(Channel *c);
+	virtual unsigned GetMaxListFor(Channel *c, ChannelMode *cm);
 
 	virtual Anope::string NormalizeMask(const Anope::string &mask);
 };
diff --git a/include/regchannel.h b/include/regchannel.h
index ce56324c7..d0f0bf02f 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -97,7 +97,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	void Serialize(Serialize::Data &data) const anope_override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 
-	/** Change the founder of the channek
+	/** Change the founder of the channel
 	 * @params nc The new founder
 	 */
 	void SetFounder(NickCore *nc);
@@ -135,7 +135,7 @@ class CoreExport ChannelInfo : public Serializable, public Extensible
 	AccessGroup AccessFor(const User *u, bool updateLastUsed = true);
 	AccessGroup AccessFor(const NickCore *nc, bool updateLastUsed = true);
 
-	/** Get the size of the accss vector for this channel
+	/** Get the size of the access vector for this channel
 	 * @return The access vector size
 	 */
 	unsigned GetAccessCount() const;
diff --git a/include/serialize.h b/include/serialize.h
index 41ab41d9c..406b9698f 100644
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -46,7 +46,7 @@ namespace Serialize
 	template<typename T> class Reference;
 }
 
-/** A serialziable object. Serializable objects can be serialized into
+/** A serializable object. Serializable objects can be serialized into
  * abstract data types (Serialize::Data), and then reconstructed or
  * updated later at any time.
  */
@@ -105,7 +105,7 @@ class CoreExport Serializable : public virtual Base
 };
 
 /* A serializable type. There should be one of these classes for each type
- * of class that inherits from Serialiable. Used for unserializing objects
+ * of class that inherits from Serializable. Used for unserializing objects
  * of this type, as it requires a function pointer to a static member function.
  */
 class CoreExport Serialize::Type : public Base
@@ -123,7 +123,7 @@ class CoreExport Serialize::Type : public Base
 	 */
 	Module *owner;
 
-	/* The timesatmp for this type. All objects of this type are as up to date as
+	/* The timestamp for this type. All objects of this type are as up to date as
 	 * this timestamp. if curtime == timestamp then we have the most up to date
 	 * version of every object of this type.
 	 */
diff --git a/include/servers.h b/include/servers.h
index 81abacd35..f88f66187 100644
--- a/include/servers.h
+++ b/include/servers.h
@@ -170,7 +170,7 @@ class CoreExport Server : public Extensible
 	 */
 	bool IsQuitting() const;
 
-	/** Send a message to alll users on this server
+	/** Send a message to all users on this server
 	 * @param source The source of the message
 	 * @param message The message
 	 */
diff --git a/include/users.h b/include/users.h
index 72f786c57..f7756e7c2 100644
--- a/include/users.h
+++ b/include/users.h
@@ -46,7 +46,7 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 	bool on_access;
 	/* Map of user modes and the params this user has (if any) */
 	ModeList modes;
-	/* NickCore account the user is currently loggged in as, if they are logged in */
+	/* NickCore account the user is currently logged in as, if they are logged in */
 	Serialize::Reference<NickCore> nc;
 
 	/* # of invalid password attempts */
@@ -161,13 +161,13 @@ class CoreExport User : public virtual Base, public Extensible, public CommandRe
 
 	/** Update the real ident (username) of a user record.
 	 * @param ident The new ident to give this user.
-	 * NOTE: Where possible, you should use the Get/SetVIdent() equivilants.
+	 * NOTE: Where possible, you should use the Get/SetVIdent() equivalents.
 	 */
 	void SetIdent(const Anope::string &ident);
 
 	/** Get the real ident (username) of this user.
 	 * @return The displayed ident of this user.
-	 * NOTE: Where possible, you should use the Get/SetVIdent() equivilants.
+	 * NOTE: Where possible, you should use the Get/SetVIdent() equivalents.
 	 */
 	const Anope::string &GetIdent() const;
 
diff --git a/language/anope.en_US.po b/language/anope.en_US.po
index 58aed172c..76ae10f5d 100644
--- a/language/anope.en_US.po
+++ b/language/anope.en_US.po
@@ -9522,13 +9522,13 @@ msgstr ""
 
 #: modules/commands/ns_group.cpp:285
 msgid ""
-"This command ungroups your nick, or if given, the specificed nick,\n"
+"This command ungroups your nick, or if given, the specified nick,\n"
 "from the group it is in. The ungrouped nick keeps its registration\n"
 "time, password, email, greet, language, and url. Everything else\n"
 "is reset. You may not ungroup yourself if there is only one nick in\n"
 "your group."
 msgstr ""
-"This command ungroups your nick, or if given, the specificed nick,\n"
+"This command ungroups your nick, or if given, the specified nick,\n"
 "from the group it is in. The ungrouped nick keeps its registration\n"
 "time, password, email, greet, language, and url. Everything else\n"
 "is reset. You may not ungroup yourself if there is only one nick in\n"
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index efa48235c..28fab4171 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -115,7 +115,7 @@ macro(build_subdir)
 
       # Append this source file's linker flags to the subdirectoy's linker flags, if there are any to append
       if(TEMP_DEPENDENCIES)
-        list(APPEND SUBDIR_EXTRA_DEPENDS ${TEMP_DEPDENCIES})
+        list(APPEND SUBDIR_EXTRA_DEPENDS ${TEMP_DEPENDENCIES})
       endif()
     endif()
   endforeach()
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp
index 90842df01..1a0ec73df 100644
--- a/modules/commands/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
@@ -1335,7 +1335,7 @@ class BSKick : public Module
 			Anope::string nbuf = Anope::NormalizeBuffer(realbuf);
 			bool casesensitive = Config->GetModule("botserv")->Get<bool>("casesensitive");
 
-			/* Normalize can return an empty string if this only conains control codes etc */
+			/* Normalize can return an empty string if this only contains control codes etc */
 			if (badwords && !nbuf.empty())
 				for (unsigned i = 0; i < badwords->GetBadWordCount(); ++i)
 				{
diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp
index 113873d2c..648651dfa 100644
--- a/modules/commands/cs_ban.cpp
+++ b/modules/commands/cs_ban.cpp
@@ -42,10 +42,13 @@ class CommandCSBan : public Command
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
-		const Anope::string &chan = params[0];
 		Configuration::Block *block = Config->GetCommand(source);
 		const Anope::string &mode = block->Get<Anope::string>("mode", "BAN");
+		ChannelMode *cm = ModeManager::FindChannelModeByName(mode);
+		if (cm == NULL)
+			return;
 
+		const Anope::string &chan = params[0];
 		ChannelInfo *ci = ChannelInfo::Find(chan);
 		if (ci == NULL)
 		{
@@ -59,7 +62,7 @@ class CommandCSBan : public Command
 			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
 			return;
 		}
-		else if (IRCD->GetMaxListFor(c) && c->HasMode(mode) >= IRCD->GetMaxListFor(c))
+		else if (IRCD->GetMaxListFor(c, cm) && c->HasMode(mode) >= IRCD->GetMaxListFor(c, cm))
 		{
 			source.Reply(_("The %s list for %s is full."), mode.lower().c_str(), c->name.c_str());
 			return;
diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index d5129fdc6..0f6378036 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -336,7 +336,7 @@ class CommandCSMode : public Command
 							continue;
 						}
 
-						if (cm->type == MODE_LIST && ci->c && IRCD->GetMaxListFor(ci->c) && ci->c->HasMode(cm->name) >= IRCD->GetMaxListFor(ci->c))
+						if (cm->type == MODE_LIST && ci->c && IRCD->GetMaxListFor(ci->c, cm) && ci->c->HasMode(cm->name) >= IRCD->GetMaxListFor(ci->c, cm))
 						{
 							source.Reply(_("List for mode %c is full."), cm->mchar);
 							continue;
@@ -660,7 +660,7 @@ class CommandCSMode : public Command
 
 							if (adding)
 							{
-								if (IRCD->GetMaxListFor(ci->c) && ci->c->HasMode(cm->name) < IRCD->GetMaxListFor(ci->c))
+								if (IRCD->GetMaxListFor(ci->c, cm) && ci->c->HasMode(cm->name) < IRCD->GetMaxListFor(ci->c, cm))
 									ci->c->SetMode(NULL, cm, param);
 							}
 							else
diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp
index ab8957011..fec857109 100644
--- a/modules/commands/ns_cert.cpp
+++ b/modules/commands/ns_cert.cpp
@@ -55,7 +55,7 @@ struct NSCertListImpl : NSCertList
 
 	/** Get an entry from the nick's cert list by index
 	 *
-	 * @param entry Index in the certificaate list vector to retrieve
+	 * @param entry Index in the certificate list vector to retrieve
 	 * @return The fingerprint entry of the given index if within bounds, an empty string if the vector is empty or the index is out of bounds
 	 *
 	 * Retrieves an entry from the certificate list corresponding to the given index.
diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp
index c68e53157..aa2865776 100644
--- a/modules/commands/ns_group.cpp
+++ b/modules/commands/ns_group.cpp
@@ -282,7 +282,7 @@ class CommandNSUngroup : public Command
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
-		source.Reply(_("This command ungroups your nick, or if given, the specificed nick,\n"
+		source.Reply(_("This command ungroups your nick, or if given, the specified nick,\n"
 				"from the group it is in. The ungrouped nick keeps its registration\n"
 				"time, password, email, greet, language, and url. Everything else\n"
 				"is reset. You may not ungroup yourself if there is only one nick in\n"
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index 1e48ec42a..bf756678a 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -340,7 +340,7 @@ static dbFILE *open_db_read(const char *service, const char *filename, int versi
 	}
 	else if (myversion < version)
 	{
-		Log() << "Unsuported database version (" << myversion << ") on " << f->filename << ".";
+		Log() << "Unsupported database version (" << myversion << ") on " << f->filename << ".";
 		delete f;
 		return NULL;
 	}
diff --git a/modules/encryption/enc_sha256.cpp b/modules/encryption/enc_sha256.cpp
index 8690d513b..b425d6b9d 100644
--- a/modules/encryption/enc_sha256.cpp
+++ b/modules/encryption/enc_sha256.cpp
@@ -288,8 +288,8 @@ class ESHA256 : public Module
 		else
 			use_iv = false;
 
-		Encryption::IV initilization(this->iv, 8);
-		SHA256Context ctx(&initilization);
+		Encryption::IV initialization(this->iv, 8);
+		SHA256Context ctx(&initialization);
 		ctx.Update(reinterpret_cast<const unsigned char *>(src.c_str()), src.length());
 		ctx.Finalize();
 
diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp
index fa6d924da..dcac30ebd 100644
--- a/modules/extra/m_mysql.cpp
+++ b/modules/extra/m_mysql.cpp
@@ -24,7 +24,7 @@ using namespace SQL;
  *
  * This module spawns a single thread that is used to execute blocking MySQL queries.
  * When a module requests a query to be executed it is added to a list for the thread
- * (which never stops looping and sleeing) to pick up and execute, the result of which
+ * (which never stops looping and sleeping) to pick up and execute, the result of which
  * is inserted in to another queue to be picked up by the main thread. The main thread
  * uses Pipe to become notified through the socket engine when there are results waiting
  * to be sent back to the modules requesting the query
diff --git a/modules/protocol/inspircd.cpp b/modules/protocol/inspircd.cpp
index bedb30ca3..9329b1a70 100644
--- a/modules/protocol/inspircd.cpp
+++ b/modules/protocol/inspircd.cpp
@@ -13,6 +13,8 @@
 #include "modules/cs_mode.h"
 #include "modules/sasl.h"
 
+typedef std::map<char, unsigned> ListLimits;
+
 struct SASLUser
 {
 	Anope::string uid;
@@ -54,7 +56,9 @@ class InspIRCdProto : public IRCDProto
 	}
 
  public:
-	InspIRCdProto(Module *creator) : IRCDProto(creator, "InspIRCd 3+")
+	PrimitiveExtensibleItem<ListLimits> maxlist;
+
+	InspIRCdProto(Module *creator) : IRCDProto(creator, "InspIRCd 3+"), maxlist(creator, "maxlist")
 	{
 		DefaultPseudoclientModes = "+I";
 		CanSVSNick = true;
@@ -72,6 +76,20 @@ class InspIRCdProto : public IRCDProto
 		MaxLine = 4096;
 	}
 
+	unsigned GetMaxListFor(Channel *c, ChannelMode *cm)
+	{
+		ListLimits *limits = maxlist.Get(c);
+		if (limits)
+		{
+			ListLimits::const_iterator limit = limits->find(cm->mchar);
+			if (limit != limits->end())
+				return limit->second;
+		}
+
+		// Fall back to the config limit if we can't find the mode.
+		return IRCDProto::GetMaxListFor(c, cm);
+	}
+
 	void SendConnect() anope_override
 	{
 		UplinkSocket::Message() << "CAPAB START 1205";
@@ -1322,9 +1340,10 @@ class IRCDMessageMetadata : IRCDMessage
 {
 	const bool &do_topiclock;
 	const bool &do_mlock;
+	PrimitiveExtensibleItem<ListLimits> &maxlist;
 
  public:
-	IRCDMessageMetadata(Module *creator, const bool &handle_topiclock, const bool &handle_mlock) : IRCDMessage(creator, "METADATA", 3), do_topiclock(handle_topiclock), do_mlock(handle_mlock) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+	IRCDMessageMetadata(Module *creator, const bool &handle_topiclock, const bool &handle_mlock, PrimitiveExtensibleItem<ListLimits> &listlimits) : IRCDMessage(creator, "METADATA", 3), do_topiclock(handle_topiclock), do_mlock(handle_mlock), maxlist(listlimits) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) anope_override
 	{
@@ -1334,9 +1353,9 @@ class IRCDMessageMetadata : IRCDMessage
 		if ((params[0][0] == '#') && (params.size() > 3) && (!source.GetServer()->IsSynced()))
 		{
 			Channel *c = Channel::Find(params[0]);
-			if (c && c->ci)
+			if (c)
 			{
-				if ((do_mlock) && (params[2] == "mlock"))
+				if ((c->ci) && (do_mlock) && (params[2] == "mlock"))
 				{
 					ModeLocks *modelocks = c->ci->GetExt<ModeLocks>("modelocks");
 					Anope::string modes;
@@ -1347,13 +1366,24 @@ class IRCDMessageMetadata : IRCDMessage
 					if (modes != params[3])
 						UplinkSocket::Message(Me) << "METADATA " << c->name << " " << c->creation_time << " mlock :" << modes;
 				}
-				else if ((do_topiclock) && (params[2] == "topiclock"))
+				else if ((c->ci) && (do_topiclock) && (params[2] == "topiclock"))
 				{
 					bool mystate = c->ci->HasExt("TOPICLOCK");
 					bool serverstate = (params[3] == "1");
 					if (mystate != serverstate)
 						UplinkSocket::Message(Me) << "METADATA " << c->name << " " << c->creation_time << " topiclock :" << (mystate ? "1" : "");
 				}
+				else if (params[2] == "maxlist")
+				{
+					ListLimits limits;
+					spacesepstream limitstream(params[3]);
+					Anope::string modechr, modelimit;
+					while (limitstream.GetToken(modechr) && limitstream.GetToken(modelimit))
+					{
+						limits.insert(std::make_pair(modechr[0], convertTo<unsigned>(modelimit)));
+					}
+					maxlist.Set(c, limits);
+				}
 			}
 		}
 		else if (isdigit(params[0][0]))
@@ -1862,7 +1892,7 @@ class ProtoInspIRCd : public Module
 		message_part(this), message_privmsg(this), message_quit(this), message_stats(this),
 		message_away(this), message_capab(this), message_encap(this), message_endburst(this), message_fhost(this),
 		message_fident(this), message_fjoin(this), message_fmode(this), message_ftopic(this), message_idle(this),
-		message_ijoin(this), message_kick(this), message_metadata(this, use_server_side_topiclock, use_server_side_mlock),
+		message_ijoin(this), message_kick(this), message_metadata(this, use_server_side_topiclock, use_server_side_mlock, ircd_proto.maxlist),
 		message_mode(this), message_nick(this), message_opertype(this), message_ping(this), message_rsquit(this),
 		message_save(this), message_server(this), message_squit(this), message_time(this), message_uid(this)
 	{
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 5fd52fda3..0385f1046 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -115,7 +115,7 @@ class PlexusProto : public IRCDProto
 		 * KNOCK  - Supports KNOCK
 		 * TBURST - Supports TBURST
 		 * PARA   - Supports invite broadcasting for +p
-		 * ENCAP  - Supports encapsulization of protocol messages
+		 * ENCAP  - Supports encapsulation of protocol messages
 		 * SVS    - Supports services protocol extensions
 		 */
 		UplinkSocket::Message() << "CAPAB :QS EX CHW IE EOB KLN UNKLN GLN HUB KNOCK TBURST PARA ENCAP SVS";
diff --git a/modules/pseudoclients/botserv.cpp b/modules/pseudoclients/botserv.cpp
index cadcad4bb..6aa75919c 100644
--- a/modules/pseudoclients/botserv.cpp
+++ b/modules/pseudoclients/botserv.cpp
@@ -119,7 +119,7 @@ class BotServCore : public Module
 		if (inhabit && inhabit->HasExt(c))
 			return;
 
-		/* This is called prior to removing the user from the channnel, so c->users.size() - 1 should be safe */
+		/* This is called prior to removing the user from the channel, so c->users.size() - 1 should be safe */
 		if (c->ci && c->ci->bi && u != *c->ci->bi && c->users.size() - 1 <= Config->GetModule(this)->Get<unsigned>("minusers") && c->FindUser(c->ci->bi))
 			c->ci->bi->Part(c->ci->c);
 	}
diff --git a/modules/webcpanel/templates/default/chanserv/set.html b/modules/webcpanel/templates/default/chanserv/set.html
index 050c37f69..9437ca71a 100644
--- a/modules/webcpanel/templates/default/chanserv/set.html
+++ b/modules/webcpanel/templates/default/chanserv/set.html
@@ -25,7 +25,7 @@
 					{END IF}
 					{IF EXISTS SUCCESSOR}
 					<tr>
-						<td>Succsesor</td>
+						<td>Successor</td>
 						<td>{SUCCESSOR}</td>
 					</tr>
 					{END IF}
diff --git a/modules/webcpanel/webcpanel.cpp b/modules/webcpanel/webcpanel.cpp
index 16b61e673..f95307f22 100644
--- a/modules/webcpanel/webcpanel.cpp
+++ b/modules/webcpanel/webcpanel.cpp
@@ -268,7 +268,7 @@ namespace WebPanel
 		my_reply(r, key);
 
 		CommandSource source(user, NULL, nc, &my_reply, bi);
-		source.ip = client->clientaddr.addr();
+		source.ip = client->GetIP();
 
 		CommandInfo info;
 		info.name = c;
@@ -308,7 +308,7 @@ namespace WebPanel
 		my_reply(r, key);
 
 		CommandSource source(nc->display, NULL, nc, &my_reply, bi);
-		source.ip = client->clientaddr.addr();
+		source.ip = client->GetIP();
 
 		cmd->Run(source, cmdname, *info, params);
 	}
diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index df62db327..9fcf766f3 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -91,7 +91,7 @@ bool ci::less::operator()(const Anope::string &s1, const Anope::string &s2) cons
 	return s1.ci_str().compare(s2.ci_str()) < 0;
 }
 
-sepstream::sepstream(const Anope::string &source, char seperator, bool ae) : tokens(source), sep(seperator), pos(0), allow_empty(ae)
+sepstream::sepstream(const Anope::string &source, char separator, bool ae) : tokens(source), sep(separator), pos(0), allow_empty(ae)
 {
 }
 
diff --git a/src/init.cpp b/src/init.cpp
index 7186cccfc..42cba3f10 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -313,7 +313,7 @@ void Anope::Init(int ac, char **av)
 		Log(LOG_TERMINAL) << "Anope IRC Services (https://www.anope.org/)";
 		Log(LOG_TERMINAL) << "Usage ./" << Anope::ServicesBin << " [options] ...";
 		Log(LOG_TERMINAL) << "-c, --config=filename.conf";
-		Log(LOG_TERMINAL) << "    --confdir=conf file direcory";
+		Log(LOG_TERMINAL) << "    --confdir=conf file directory";
 		Log(LOG_TERMINAL) << "    --dbdir=database directory";
 		Log(LOG_TERMINAL) << "-d, --debug[=level]";
 		Log(LOG_TERMINAL) << "-h, --help";
diff --git a/src/misc.cpp b/src/misc.cpp
index 706c5f968..aa49b10bf 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -143,22 +143,22 @@ bool ListFormatter::IsEmpty() const
 void ListFormatter::Process(std::vector<Anope::string> &buffer)
 {
 	std::vector<Anope::string> tcolumns;
-	std::map<Anope::string, size_t> lenghts;
+	std::map<Anope::string, size_t> lengths;
 	std::set<Anope::string> breaks;
 	for (unsigned i = 0; i < this->columns.size(); ++i)
 	{
 		tcolumns.push_back(Language::Translate(this->nc, this->columns[i].c_str()));
-		lenghts[this->columns[i]] = tcolumns[i].length();
+		lengths[this->columns[i]] = tcolumns[i].length();
 	}
 	for (unsigned i = 0; i < this->entries.size(); ++i)
 	{
 		ListEntry &e = this->entries[i];
 		for (unsigned j = 0; j < this->columns.size(); ++j)
-			if (e[this->columns[j]].length() > lenghts[this->columns[j]])
-				lenghts[this->columns[j]] = e[this->columns[j]].length();
+			if (e[this->columns[j]].length() > lengths[this->columns[j]])
+				lengths[this->columns[j]] = e[this->columns[j]].length();
 	}
 	unsigned length = 0;
-	for (std::map<Anope::string, size_t>::iterator it = lenghts.begin(), it_end = lenghts.end(); it != it_end; ++it)
+	for (std::map<Anope::string, size_t>::iterator it = lengths.begin(), it_end = lengths.end(); it != it_end; ++it)
 	{
 		/* Break lines at 80 chars */
 		if (length > 80)
@@ -185,7 +185,7 @@ void ListFormatter::Process(std::vector<Anope::string> &buffer)
 				s += "  ";
 			s += tcolumns[i];
 			if (i + 1 != this->columns.size())
-				for (unsigned j = tcolumns[i].length(); j < lenghts[this->columns[i]]; ++j)
+				for (unsigned j = tcolumns[i].length(); j < lengths[this->columns[i]]; ++j)
 					s += " ";
 		}
 		buffer.push_back(s);
@@ -207,7 +207,7 @@ void ListFormatter::Process(std::vector<Anope::string> &buffer)
 				s += "  ";
 			s += e[this->columns[j]];
 			if (j + 1 != this->columns.size())
-				for (unsigned k = e[this->columns[j]].length(); k < lenghts[this->columns[j]]; ++k)
+				for (unsigned k = e[this->columns[j]].length(); k < lengths[this->columns[j]]; ++k)
 					s += " ";
 		}
 		buffer.push_back(s);
diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index 96e49fdbd..23b35e94e 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -53,7 +53,7 @@ void ModuleManager::CleanupRuntimeDirectory()
 /**
  * Copy the module from the modules folder to the runtime folder.
  * This will prevent module updates while the modules is loaded from
- * triggering a segfault, as the actaul file in use will be in the
+ * triggering a segfault, as the actual file in use will be in the
  * runtime folder.
  * @param name the name of the module to copy
  * @param output the destination to copy the module to
@@ -489,17 +489,17 @@ bool ModuleManager::SetPriority(Module *mod, Implementation i, Priority s, Modul
 	if (swap && swap_pos != source)
 	{
 		/* Suggestion from Phoenix, "shuffle" the modules to better retain call order */
-		int incrmnt = 1;
+		int increment = 1;
 
 		if (source > swap_pos)
-			incrmnt = -1;
+			increment = -1;
 
-		for (unsigned j = source; j != swap_pos; j += incrmnt)
+		for (unsigned j = source; j != swap_pos; j += increment)
 		{
-			if (j + incrmnt > EventHandlers[i].size() - 1 || (!j && incrmnt == -1))
+			if (j + increment > EventHandlers[i].size() - 1 || (!j && increment == -1))
 				continue;
 
-			std::swap(EventHandlers[i][j], EventHandlers[i][j + incrmnt]);
+			std::swap(EventHandlers[i][j], EventHandlers[i][j + increment]);
 		}
 	}
 
diff --git a/src/protocol.cpp b/src/protocol.cpp
index c81d18e5f..375104812 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -351,7 +351,7 @@ void IRCDProto::SendNumeric(int numeric, const Anope::string &dest, const char *
 bool IRCDProto::IsNickValid(const Anope::string &nick)
 {
 	/**
-	 * RFC: defination of a valid nick
+	 * RFC: definition of a valid nick
 	 * nickname =  ( letter / special ) ( letter / digit / special / "-" )
 	 * letter   =  A-Z / a-z
 	 * digit    =  0-9
@@ -438,6 +438,11 @@ unsigned IRCDProto::GetMaxListFor(Channel *c)
 	return c->HasMode("LBAN") ? 0 : Config->GetBlock("networkinfo")->Get<int>("modelistsize");
 }
 
+unsigned IRCDProto::GetMaxListFor(Channel *c, ChannelMode *cm)
+{
+	return GetMaxListFor(c);
+}
+
 Anope::string IRCDProto::NormalizeMask(const Anope::string &mask)
 {
 	if (IsExtbanValid(mask))
diff --git a/src/sockets.cpp b/src/sockets.cpp
index 0238b101d..e2191dbd8 100644
--- a/src/sockets.cpp
+++ b/src/sockets.cpp
@@ -332,7 +332,7 @@ bool cidr::operator<(const cidr &other) const
 			if (i || this->cidr_len >= 128)
 				return i < 0;
 
-			// Now all thats left is to compare 'remainig' bits at offset this->cidr_len / 8
+			// Now all thats left is to compare 'remaining' bits at offset this->cidr_len / 8
 			int remaining = this->cidr_len % 8;
 			unsigned char m = 0xFF << (8 - remaining);
 
diff --git a/src/tools/geoipupdate.sh b/src/tools/geoipupdate.sh
index 70ae26f67..5e6d9873e 100755
--- a/src/tools/geoipupdate.sh
+++ b/src/tools/geoipupdate.sh
@@ -6,7 +6,7 @@
 # by the irc2sql module on the first load.
 
 # Don't forget to rename this file or your changes
-# will be overwritte on the next 'make install'
+# will be overwritten on the next 'make install'
 
 ############################
 # Config