From 0a4975ed611db7d1bcfe501008085e420e743128 Mon Sep 17 00:00:00 2001
From: Shido <the.keikun@gmail.com>
Date: Fri, 30 May 2014 10:37:54 +0800
Subject: Fixed typos inside src/

---
 src/char/char.c          |  50 ++++++-------
 src/char/int_auction.c   |   2 +-
 src/char/int_guild.c     |  10 +--
 src/char/int_homun.c     |   4 +-
 src/char/int_party.c     |   4 +-
 src/char/int_quest.c     |   2 +-
 src/char/inter.c         |  18 ++---
 src/char/pincode.c       |   2 +-
 src/common/HPM.c         |   4 +-
 src/common/HPM.h         |   2 +-
 src/common/atomic.h      |   6 +-
 src/common/conf.h        |   2 +-
 src/common/db.c          |  14 ++--
 src/common/db.h          |   6 +-
 src/common/ers.c         |   8 +-
 src/common/ers.h         |  14 ++--
 src/common/grfio.c       |  10 +--
 src/common/malloc.c      |   4 +-
 src/common/mapindex.c    |   2 +-
 src/common/mmo.h         |   4 +-
 src/common/mutex.h       |  16 ++--
 src/common/showmsg.c     |   6 +-
 src/common/showmsg.h     |   4 +-
 src/common/socket.c      |  14 ++--
 src/common/spinlock.h    |   2 +-
 src/common/sql.c         |  10 +--
 src/common/sql.h         |   6 +-
 src/common/strlib.c      |  32 ++++----
 src/common/strlib.h      |  10 +--
 src/common/sysinfo.c     |   4 +-
 src/common/thread.c      |  14 ++--
 src/common/thread.h      |  16 ++--
 src/common/timer.c       |   6 +-
 src/common/utils.c       |   6 +-
 src/config/core.h        |   4 +-
 src/config/secure.h      |   2 +-
 src/login/account.h      |   2 +-
 src/login/account_sql.c  |   2 +-
 src/login/login.c        |  16 ++--
 src/login/login.h        |   2 +-
 src/login/loginlog_sql.c |   2 +-
 src/map/atcommand.c      |  66 ++++++++---------
 src/map/battle.c         |  66 ++++++++---------
 src/map/battle.h         |   6 +-
 src/map/battleground.c   |   4 +-
 src/map/chat.c           |   2 +-
 src/map/chrif.c          |  22 +++---
 src/map/chrif.h          |   2 +-
 src/map/clif.c           |  96 ++++++++++++------------
 src/map/clif.h           |   2 +-
 src/map/elemental.c      |   4 +-
 src/map/guild.c          |   8 +-
 src/map/homunculus.c     |   4 +-
 src/map/intif.c          |  10 +--
 src/map/itemdb.c         |   2 +-
 src/map/map.c            |  26 +++----
 src/map/map.h            |   8 +-
 src/map/mob.c            |  24 +++---
 src/map/mob.h            |   6 +-
 src/map/npc.c            |  10 +--
 src/map/npc_chat.c       |  12 +--
 src/map/party.c          |   4 +-
 src/map/script.c         |   2 +-
 src/map/skill.c          | 188 ++++++++++++++++++++++++-----------------------
 src/map/status.c         |  24 +++---
 src/map/status.h         |   2 +-
 src/map/storage.c        |  10 +--
 src/map/trade.c          |  12 +--
 src/map/unit.c           |  22 +++---
 src/map/vending.h        |   4 +-
 70 files changed, 497 insertions(+), 495 deletions(-)

(limited to 'src')

diff --git a/src/char/char.c b/src/char/char.c
index 57031e3ee..fe17fd14f 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -118,7 +118,7 @@ bool char_new = true;
 int char_new_display = 0;
 
 bool name_ignoring_case = false; // Allow or not identical name for characters but with a different case by [Yor]
-int char_name_option = 0; // Option to know which letters/symbols are authorised in the name of a character (0: all, 1: only those in char_name_letters, 2: all EXCEPT those in char_name_letters) by [Yor]
+int char_name_option = 0; // Option to know which letters/symbols are authorized in the name of a character (0: all, 1: only those in char_name_letters, 2: all EXCEPT those in char_name_letters) by [Yor]
 char unknown_char_name[NAME_LENGTH] = "Unknown"; // Name to use when the requested name cannot be determined
 #define TRIM_CHARS "\255\xA0\032\t\x0A\x0D " //The following characters are trimmed regardless because they cause confusion and problems on the servers. [Skotlex]
 char char_name_letters[1024] = ""; // list of letters/symbols allowed (or not) in a character name. by [Yor]
@@ -126,8 +126,8 @@ char char_name_letters[1024] = ""; // list of letters/symbols allowed (or not) i
 int char_del_level = 0; //From which level u can delete character [Lupus]
 int char_del_delay = 86400;
 
-int log_char = 1;	// loggin char or not [devil]
-int log_inter = 1;	// loggin inter or not [devil]
+int log_char = 1;	// logging char or not [devil]
+int log_inter = 1;	// logging inter or not [devil]
 
 int char_aegis_delete = 0; // Verify if char is in guild/party or char and reacts as Aegis does (doesn't allow deletion), see char_delete2_req for more information
 
@@ -1387,7 +1387,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 	if( SQL_SUCCESS == SQL->StmtNextRow(stmt) )
 		strcat(t_msg, " accdata");
 
-	if (save_log) ShowInfo("Loaded char (%d - %s): %s\n", char_id, p->name, t_msg);	//ok. all data load successfuly!
+	if (save_log) ShowInfo("Loaded char (%d - %s): %s\n", char_id, p->name, t_msg);	//ok. all data load successfully!
 	SQL->StmtFree(stmt);
 	StrBuf->Destroy(&buf);
 
@@ -1413,7 +1413,7 @@ int mmo_char_sql_init(void)
 	//and send the loginserver the new state....
 
 	// Force all users offline in sql when starting char-server
-	// (useful when servers crashs and don't clean the database)
+	// (useful when servers crashes and don't clean the database)
 	set_all_offline_sql();
 
 	return 0;
@@ -1468,7 +1468,7 @@ bool char_slotchange(struct char_session_data *sd, int fd, unsigned short from,
 }
 
 //-----------------------------------
-// Function to change chararcter's names
+// Function to change character's names
 //-----------------------------------
 int rename_char_sql(struct char_session_data *sd, int char_id)
 {
@@ -1540,9 +1540,9 @@ int check_char_name(char * name, char * esc_name)
 	if( strcmpi(name, wisp_server_name) == 0 )
 		return -1; // nick reserved for internal server messages
 
-	// Check Authorised letters/symbols in the name of the character
+	// Check Authorized letters/symbols in the name of the character
 	if( char_name_option == 1 )
-	{ // only letters/symbols in char_name_letters are authorised
+	{ // only letters/symbols in char_name_letters are authorized
 		for( i = 0; i < NAME_LENGTH && name[i]; i++ )
 			if( strchr(char_name_letters, name[i]) == NULL )
 				return -2;
@@ -1576,7 +1576,7 @@ int check_char_name(char * name, char * esc_name)
  *  -1: 'Charname already exists'
  *  -2: 'Char creation denied'/ Unknown error
  *  -3: 'You are underaged'
- *  -4: 'You are not elegible to open the Character Slot.'
+ *  -4: 'You are not eligible to open the Character Slot.'
  *  -5: 'Symbols in Character Names are forbidden'
  *  char_id: Success
  **/
@@ -2202,7 +2202,7 @@ void mapif_server_reset(int id);
 void loginif_reset(void)
 {
 	int id;
-	// TODO kick everyone out and reset everything or wait for connect and try to reaquire locks [FlavioJS]
+	// TODO kick everyone out and reset everything or wait for connect and try to reacquire locks [FlavioJS]
 	for( id = 0; id < ARRAYLENGTH(server); ++id )
 		mapif_server_reset(id);
 	flush_fifos();
@@ -2286,7 +2286,7 @@ int parse_fromlogin(int fd) {
 		
 		switch( command ) {
 
-			// acknowledgement of connect-to-loginserver request
+			// acknowledgment of connect-to-loginserver request
 			case 0x2711:
 				if (RFIFOREST(fd) < 3)
 					return 0;
@@ -2306,7 +2306,7 @@ int parse_fromlogin(int fd) {
 				RFIFOSKIP(fd,3);
 			break;
 
-			// acknowledgement of account authentication request
+			// acknowledgment of account authentication request
 			case 0x2713:
 				if (RFIFOREST(fd) < 33)
 					return 0;
@@ -2526,7 +2526,7 @@ int parse_fromlogin(int fd) {
 				unsigned char buf[11];
 				WBUFW(buf,0) = 0x2b14;
 				WBUFL(buf,2) = RFIFOL(fd,2);
-				WBUFB(buf,6) = RFIFOB(fd,6); // 0: change of statut, 1: ban
+				WBUFB(buf,6) = RFIFOB(fd,6); // 0: change of status, 1: ban
 				WBUFL(buf,7) = RFIFOL(fd,7); // status or final date of a banishment
 				mapif_sendall(buf, 11);
 			}
@@ -3161,7 +3161,7 @@ int parse_frommap(int fd)
 					memcpy(&char_dat, RFIFOP(fd,13), sizeof(struct mmo_charstatus));
 					mmo_char_tosql(cid, &char_dat);
 				} else {	//This may be valid on char-server reconnection, when re-sending characters that already logged off.
-					ShowError("parse_from_map (save-char): Received data for non-existant/offline character (%d:%d).\n", aid, cid);
+					ShowError("parse_from_map (save-char): Received data for non-existing/offline character (%d:%d).\n", aid, cid);
 					set_char_online(id, cid, aid);
 				}
 
@@ -4174,7 +4174,7 @@ int parse_char(int fd)
 				ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", account_id, login_id1, login_id2);
 
 				if (sd) {
-					//Received again auth packet for already authentified account?? Discard it.
+					//Received again auth packet for already authenticated account?? Discard it.
 					//TODO: Perhaps log this as a hack attempt?
 					//TODO: and perhaps send back a reply?
 					break;
@@ -4201,7 +4201,7 @@ int parse_char(int fd)
 					break;
 				}
 
-				// search authentification
+				// search authentication
 				node = (struct auth_node*)idb_get(auth_db, account_id);
 				if( node != NULL &&
 					node->account_id == account_id &&
@@ -4232,7 +4232,7 @@ int parse_char(int fd)
 				{// authentication not found (coming from login server)
 					if (login_fd > 0) { // don't send request if no login-server
 						WFIFOHEAD(login_fd,23);
-						WFIFOW(login_fd,0) = 0x2712; // ask login-server to authentify an account
+						WFIFOW(login_fd,0) = 0x2712; // ask login-server to authenticate an account
 						WFIFOL(login_fd,2) = sd->account_id;
 						WFIFOL(login_fd,6) = sd->login_id1;
 						WFIFOL(login_fd,10) = sd->login_id2;
@@ -4317,7 +4317,7 @@ int parse_char(int fd)
 					break;
 				}
 				
-				/* set char as online prior to loading its data so 3rd party applications will realise the sql data is not reliable */
+				/* set char as online prior to loading its data so 3rd party applications will realize the sql data is not reliable */
 				set_char_online(-2,char_id,sd->account_id);
 				if( !mmo_char_fromsql(char_id, &char_dat, true) ) { /* failed? set it back offline */
 					set_char_offline(char_id, sd->account_id);
@@ -4459,13 +4459,13 @@ int parse_char(int fd)
 					WFIFOW(fd,0) = 0x6e;
 					/* Others I found [Ind] */
 					/* 0x02 = Symbols in Character Names are forbidden */
-					/* 0x03 = You are not elegible to open the Character Slot. */
+					/* 0x03 = You are not eligible to open the Character Slot. */
 					/* 0x0B = This service is only available for premium users.  */
 					switch (result) {
 						case -1: WFIFOB(fd,2) = 0x00; break; // 'Charname already exists'
 						case -2: WFIFOB(fd,2) = 0xFF; break; // 'Char creation denied'
 						case -3: WFIFOB(fd,2) = 0x01; break; // 'You are underaged'
-						case -4: WFIFOB(fd,2) = 0x03; break; // 'You are not elegible to open the Character Slot.'
+						case -4: WFIFOB(fd,2) = 0x03; break; // 'You are not eligible to open the Character Slot.'
 						case -5: WFIFOB(fd,2) = 0x02; break; // 'Symbols in Character Names are forbidden'
 
 						default:
@@ -4641,7 +4641,7 @@ int parse_char(int fd)
 			//Confirm change name.
 			// 0x28f <char_id>.L
 			case 0x28f:
-				// 0: Sucessfull
+				// 0: Successful
 				// 1: This character's name has already been changed. You cannot change a character's name more than once.
 				// 2: User information is not correct.
 				// 3: You have failed to change this character's name.
@@ -4746,7 +4746,7 @@ int parse_char(int fd)
 
 				RFIFOSKIP(fd,60);
 			}
-			return 0; // avoid processing of followup packets here
+			return 0; // avoid processing of follow-up packets here
 				
 			// checks the entered pin
 			case 0x8b8:
@@ -5006,8 +5006,8 @@ static int online_data_cleanup(int tid, int64 tick, int id, intptr_t data) {
 }
 
 //----------------------------------
-// Reading Lan Support configuration
-// Rewrote: Anvanced subnet check [LuzZza]
+// Reading LAN Support configuration
+// Rewrote: Advanced subnet check [LuzZza]
 //----------------------------------
 int char_lan_config_read(const char *lancfgName)
 {
@@ -5479,7 +5479,7 @@ int do_init(int argc, char **argv) {
 	timer->add_func_list(online_data_cleanup, "online_data_cleanup");
 	timer->add_interval(timer->gettick() + 1000, online_data_cleanup, 0, 0, 600 * 1000);
 
-	//Cleaning the tables for NULL entrys @ startup [Sirius]
+	//Cleaning the tables for NULL entries @ startup [Sirius]
 	//Chardb clean
 	if( SQL_ERROR == SQL->Query(sql_handle, "DELETE FROM `%s` WHERE `account_id` = '0'", char_db) )
 		Sql_ShowDebug(sql_handle);
diff --git a/src/char/int_auction.c b/src/char/int_auction.c
index d246e9851..8cd870647 100644
--- a/src/char/int_auction.c
+++ b/src/char/int_auction.c
@@ -230,7 +230,7 @@ void inter_auctions_fromsql(void)
 		if( auction->timestamp > now )
 			endtick = ((int64)(auction->timestamp - now) * 1000) + tick;
 		else
-			endtick = tick + 10000; // 10 Second's to process ended auctions
+			endtick = tick + 10000; // 10 seconds to process ended auctions
 
 		auction->auction_end_timer = timer->add(endtick, auction_end_timer, auction->auction_id, 0);
 		idb_put(auction_db_, auction->auction_id, auction);
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index ffbe48e10..a6fcfe48c 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -117,7 +117,7 @@ int inter_guild_tosql(struct guild *g,int flag)
 	// GS_EXPULSION `guild_expulsion` (`guild_id`,`account_id`,`name`,`mes`)
 	// GS_SKILL `guild_skill` (`guild_id`,`id`,`lv`)
 
-	// temporary storage for str convertion. They must be twice the size of the
+	// temporary storage for str conversion. They must be twice the size of the
 	// original string to ensure no overflows will occur. [Skotlex]
 	char t_info[256];
 	char esc_name[NAME_LENGTH*2+1];
@@ -836,7 +836,7 @@ int guild_calcinfo(struct guild *g)
 	// Save next exp step
 	g->next_exp = nextexp;
 
-	// Set the max number of members, Guild Extention skill - currently adds 6 to max per skill lv.
+	// Set the max number of members, Guild Extension skill - currently adds 6 to max per skill lv.
 	g->max_member = 16 + guild_checkskill(g, GD_EXTENSION) * 6;
 	if(g->max_member > MAX_GUILD)
 	{
@@ -1142,8 +1142,8 @@ int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member
 		mapif_guild_created(fd,account_id,NULL);
 		return 0;
 	}
-	// Check Authorised letters/symbols in the name of the character
-	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
+	// Check Authorized letters/symbols in the name of the character
+	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorized
 		for (i = 0; i < NAME_LENGTH && name[i]; i++)
 			if (strchr(char_name_letters, name[i]) == NULL) {
 				mapif_guild_created(fd,account_id,NULL);
@@ -1212,7 +1212,7 @@ int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member
 // Return guild info to client
 int mapif_parse_GuildInfo(int fd,int guild_id)
 {
-	struct guild * g = inter_guild_fromsql(guild_id); //We use this because on start-up the info of castle-owned guilds is requied. [Skotlex]
+	struct guild * g = inter_guild_fromsql(guild_id); //We use this because on start-up the info of castle-owned guilds is required. [Skotlex]
 	if(g)
 	{
 		if (!guild_calcinfo(g))
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index 795a6b927..acde9eb38 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -248,9 +248,9 @@ bool mapif_homunculus_rename(char *name)
 {
 	int i;
 
-	// Check Authorised letters/symbols in the name of the homun
+	// Check Authorized letters/symbols in the name of the homun
 	if( char_name_option == 1 )
-	{// only letters/symbols in char_name_letters are authorised
+	{// only letters/symbols in char_name_letters are authorized
 		for( i = 0; i < NAME_LENGTH && name[i]; i++ )
 			if( strchr(char_name_letters, name[i]) == NULL )
 				return false;
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 5dd64a32b..a8722fbe3 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -475,8 +475,8 @@ int mapif_parse_CreateParty(int fd, char *name, int item, int item2, struct part
 		mapif_party_created(fd,leader->account_id,leader->char_id,NULL);
 		return 0;
 	}
-	// Check Authorised letters/symbols in the name of the character
-	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
+	// Check Authorized letters/symbols in the name of the character
+	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorized
 		for (i = 0; i < NAME_LENGTH && name[i]; i++)
 			if (strchr(char_name_letters, name[i]) == NULL) {
 				if( name[i] == '"' ) { /* client-special-char */
diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index 61b43c57d..d4155b0d6 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -197,7 +197,7 @@ int mapif_parse_quest_save(int fd) {
 		if (j < old_n) {
 			// Update existing quests
 
-			// Only states and counts are changable.
+			// Only states and counts are changeable.
 			ARR_FIND( 0, MAX_QUEST_OBJECTIVES, k, new_qd[i].count[k] != old_qd[j].count[k] );
 			if (k != MAX_QUEST_OBJECTIVES || new_qd[i].state != old_qd[j].state)
 				success &= mapif_quest_update(char_id, new_qd[i]);
diff --git a/src/char/inter.c b/src/char/inter.c
index 972407ef3..c2d8de37a 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -589,7 +589,7 @@ void mapif_parse_accinfo(int fd) {
 				inter_msg_to_fd(fd, u_fd, aid, "No matches were found for your criteria, '%s'",query);
 			} else {
 				Sql_ShowDebug(sql_handle);
-				inter_msg_to_fd(fd, u_fd, aid, "An error occured, bother your admin about it.");
+				inter_msg_to_fd(fd, u_fd, aid, "An error occurred, bother your admin about it.");
 			}
 			SQL->FreeResult(sql_handle);
 			return;
@@ -658,7 +658,7 @@ void mapif_parse_accinfo2(bool success, int map_fd, int u_fd, int u_aid, int acc
 		if (SQL->NumRows(sql_handle) == 0) {
 			inter_msg_to_fd(map_fd, u_fd, u_aid, "This account doesn't have characters.");
 		} else {
-			inter_msg_to_fd(map_fd, u_fd, u_aid, "An error occured, bother your admin about it.");
+			inter_msg_to_fd(map_fd, u_fd, u_aid, "An error occurred, bother your admin about it.");
 			Sql_ShowDebug(sql_handle);
 		}
 	} else {
@@ -1165,7 +1165,7 @@ int check_ttl_wisdata(void)
 			struct WisData *wd = (struct WisData*)idb_get(wis_db, wis_dellist[i]);
 			ShowWarning("inter: wis data id=%d time out : from %s to %s\n", wd->id, wd->src, wd->dst);
 			// removed. not send information after a timeout. Just no answer for the player
-			//mapif_wis_end(wd, 1); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+			//mapif_wis_end(wd, 1); // flag: 0: success to send whisper, 1: target character is not logged in?, 2: ignored by target
 			idb_remove(wis_db, wd->id);
 		}
 	} while(wis_delnum >= WISDELLIST_MAX);
@@ -1199,7 +1199,7 @@ int mapif_parse_WisRequest(int fd)
 	if (RFIFOW(fd,2)-52 >= sizeof(wd->msg)) {
 		ShowWarning("inter: Wis message size too long.\n");
 		return 0;
-	} else if (RFIFOW(fd,2)-52 <= 0) { // normaly, impossible, but who knows...
+	} else if (RFIFOW(fd,2)-52 <= 0) { // normally, impossible, but who knows...
 		ShowError("inter: Wis message doesn't exist.\n");
 		return 0;
 	}
@@ -1216,7 +1216,7 @@ int mapif_parse_WisRequest(int fd)
 		unsigned char buf[27];
 		WBUFW(buf, 0) = 0x3802;
 		memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), NAME_LENGTH);
-		WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+		WBUFB(buf,26) = 1; // flag: 0: success to send whisper, 1: target character is not logged in?, 2: ignored by target
 		mapif_send(fd, buf, 27);
 	}
 	else
@@ -1231,7 +1231,7 @@ int mapif_parse_WisRequest(int fd)
 			uint8 buf[27];
 			WBUFW(buf, 0) = 0x3802;
 			memcpy(WBUFP(buf, 2), RFIFOP(fd, 4), NAME_LENGTH);
-			WBUFB(buf,26) = 1; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+			WBUFB(buf,26) = 1; // flag: 0: success to send whisper, 1: target character is not logged in?, 2: ignored by target
 			mapif_send(fd, buf, 27);
 		}
 		else
@@ -1272,7 +1272,7 @@ int mapif_parse_WisReply(int fd)
 		return 0;	// This wisp was probably suppress before, because it was timeout of because of target was found on another map-server
 
 	if ((--wd->count) <= 0 || flag != 1) {
-		mapif_wis_end(wd, flag); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+		mapif_wis_end(wd, flag); // flag: 0: success to send whisper, 1: target character is not logged in?, 2: ignored by target
 		idb_remove(wis_db, id);
 	}
 
@@ -1376,8 +1376,8 @@ int mapif_parse_NameChangeRequest(int fd)
 	type = RFIFOB(fd,10);
 	name = (char*)RFIFOP(fd,11);
 
-	// Check Authorised letters/symbols in the name
-	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
+	// Check Authorized letters/symbols in the name
+	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorized
 		for (i = 0; i < NAME_LENGTH && name[i]; i++)
 		if (strchr(char_name_letters, name[i]) == NULL) {
 			mapif_namechange_ack(fd, account_id, char_id, type, 0, name);
diff --git a/src/char/pincode.c b/src/char/pincode.c
index 59182f12d..18ad0ffc8 100644
--- a/src/char/pincode.c
+++ b/src/char/pincode.c
@@ -33,7 +33,7 @@ void pincode_handle ( int fd, struct char_session_data* sd ) {
 	}
 	
 	if( strlen(sd->pincode) == 4 ){
-		if( *pincode->changetime && time(NULL) > (sd->pincode_change+*pincode->changetime) ){ // User hasnt changed his PIN code for a long time
+		if( *pincode->changetime && time(NULL) > (sd->pincode_change+*pincode->changetime) ){ // User hasn't changed his PIN code for a long time
 			pincode->sendstate( fd, sd, PINCODE_EXPIRED );
 		} else { // Ask user for his PIN code
 			pincode->sendstate( fd, sd, PINCODE_ASK );
diff --git a/src/common/HPM.c b/src/common/HPM.c
index d33a4c1aa..f39954175 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -410,7 +410,7 @@ void hplugins_addToHPData(enum HPluginDataTypes type, unsigned int pluginID, voi
 	*(action.hdatac) += 1;
 	RECREATE(*(action.HPDataSRCPtr),struct HPluginData *,*(action.hdatac));
 	
-	/* RECREATE modified the addresss */
+	/* RECREATE modified the address */
 	HPDataSRC = *(action.HPDataSRCPtr);
 	HPDataSRC[*(action.hdatac) - 1] = HPData;
 }
@@ -578,7 +578,7 @@ void* HPM_reallocz(void *p, size_t size, const char *file, int line, const char
 char* HPM_astrdup(const char *p, const char *file, int line, const char *func) {
 	return iMalloc->astrdup(p,HPM_file2ptr(file),line,func);
 }
-/* todo: add ability for tracking using pID for the upcoming runtime load/unload support. */
+/* TODO: add ability for tracking using pID for the upcoming runtime load/unload support. */
 bool HPM_AddHook(enum HPluginHookType type, const char *target, void *hook, unsigned int pID) {
 	if( !HPM->hooking ) {
 		ShowError("HPM:AddHook Fail! '%s' tried to hook to '%s' but HPMHooking is disabled!\n",HPM->pid2name(pID),target);
diff --git a/src/common/HPM.h b/src/common/HPM.h
index 9c176cfd6..5667f605a 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -24,7 +24,7 @@
 	#define DLL                   HINSTANCE
 #else // ! WIN32
 	#include <dlfcn.h>
-	#ifdef RTLD_DEEPBIND // Certain linux ditributions require this, but it's not available everywhere
+	#ifdef RTLD_DEEPBIND // Certain linux distributions require this, but it's not available everywhere
 		#define plugin_open(x) dlopen((x),RTLD_NOW|RTLD_DEEPBIND)
 	#else // ! RTLD_DEEPBIND
 		#define plugin_open(x) dlopen((x),RTLD_NOW)
diff --git a/src/common/atomic.h b/src/common/atomic.h
index 1349d0887..526811a09 100644
--- a/src/common/atomic.h
+++ b/src/common/atomic.h
@@ -12,7 +12,7 @@
 //	- Compiler
 //	- Operating System
 //
-// our Abstraction is fully API-Compatible to Microsofts implementation @ NT5.0+
+// our Abstraction is fully API-Compatible to Microsoft's implementation @ NT5.0+
 //
 #include "../common/cbasetypes.h"
 
@@ -23,7 +23,7 @@
 #if _MSC_VER < 1800
 
 #if !defined(_M_X64)
-// When compiling for windows 32bit, the 8byte interlocked operations are not provided by microsoft
+// When compiling for windows 32bit, the 8byte interlocked operations are not provided by Microsoft
 // (because they need at least i586 so its not generic enough.. ... )
 forceinline int64 InterlockedCompareExchange64(volatile int64 *dest, int64 exch, int64 _cmp){
 	_asm{
@@ -143,7 +143,7 @@ static forceinline int32 InterlockedExchange(volatile int32 *target, int32 val){
 }//end: InterlockedExchange()
 
 
-#endif //endif compiler decission
+#endif //endif compiler decision
 
 
 #endif /* _COMMON_ATOMIC_H_ */
diff --git a/src/common/conf.h b/src/common/conf.h
index e5b637e47..7c275bec2 100644
--- a/src/common/conf.h
+++ b/src/common/conf.h
@@ -10,7 +10,7 @@
 #include "../../3rdparty/libconfig/libconfig.h"
 
 /**
- * The libconfig interface -- specially for plugins, but we enforce it throughought the core to be consistent
+ * The libconfig interface -- specially for plugins, but we enforce it throughout the core to be consistent
  **/
 struct libconfig_interface {
 	int (*read) (config_t *config, FILE *stream);
diff --git a/src/common/db.c b/src/common/db.c
index bbeaf0b61..11ac06c93 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -3,7 +3,7 @@
  *  For more information, see LICENCE in the main folder
  *
  *  This file is separated in five sections:
- *  (1) Private typedefs, enums, structures, defines and gblobal variables
+ *  (1) Private typedefs, enums, structures, defines and global variables
  *  (2) Private functions
  *  (3) Protected functions used internally
  *  (4) Protected functions used in the interface of the database
@@ -89,15 +89,15 @@
  *  DBNColor        - Enumeration of colors of the nodes.                    *
  *  DBNode          - Structure of a node in RED-BLACK trees.                *
  *  struct db_free  - Structure that holds a deleted node to be freed.       *
- *  DBMap_impl      - Struture of the database.                              *
+ *  DBMap_impl      - Structure of the database.                              *
  *  stats           - Statistics about the database system.                  *
 \*****************************************************************************/
 
 /**
  * If defined statistics about database nodes, database creating/destruction
- * and function usage are keept and displayed when finalizing the database
+ * and function usage are kept and displayed when finalizing the database
  * system.
- * WARNING: This adds overhead to every database operation (not shure how much).
+ * WARNING: This adds overhead to every database operation (not sure how much).
  * @private
  * @see #DBStats
  * @see #stats
@@ -511,7 +511,7 @@ static void db_rebalance_erase(DBNode node, DBNode *root)
 	}
 
 	// Remove the node from the tree
-	if (y != node) { // both childs existed
+	if (y != node) { // both child existed
 		// put the left of 'node' in the left of 'y'
 		node->left->parent = y;
 		y->left = node->left;
@@ -2066,7 +2066,7 @@ static int db_obj_vforeach(DBMap* self, DBApply func, va_list args)
  * Apply <code>func</code> to every entry in the database.
  * Returns the sum of values returned by func.
  * @param self Interface of the database
- * @param func Function to be applyed
+ * @param func Function to be applied
  * @param ... Extra arguments for func
  * @return Sum of the values returned by func
  * @protected
@@ -2345,7 +2345,7 @@ static DBOptions db_obj_options(DBMap* self)
  *  db_default_cmp     - Get the default comparator for a type of database.
  *  db_default_hash    - Get the default hasher for a type of database.
  *  db_default_release - Get the default releaser for a type of database with the specified options.
- *  db_custom_release  - Get a releaser that behaves a certains way.
+ *  db_custom_release  - Get a releaser that behaves a certain way.
  *  db_alloc           - Allocate a new database.
  *  db_i2key           - Manual cast from 'int' to 'DBKey'.
  *  db_ui2key          - Manual cast from 'unsigned int' to 'DBKey'.
diff --git a/src/common/db.h b/src/common/db.h
index f5714ceaf..4f8d6be79 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -106,7 +106,7 @@ typedef enum DBType {
 } DBType;
 
 /**
- * Bitfield of options that define the behaviour of the database.
+ * Bitfield of options that define the behavior of the database.
  * See {@link #db_fix_options(DBType,DBOptions)} for restrictions of the
  * types of databases.
  * @param DB_OPT_BASE Base options: does not duplicate keys, releases nothing
@@ -116,7 +116,7 @@ typedef enum DBType {
  * @param DB_OPT_RELEASE_KEY Releases the key.
  * @param DB_OPT_RELEASE_DATA Releases the data whenever an entry is removed
  *          from the database.
- *          WARNING: for funtions that return the data (like DBMap::remove),
+ *          WARNING: for functions that return the data (like DBMap::remove),
  *          a dangling pointer will be returned.
  * @param DB_OPT_RELEASE_BOTH Releases both key and data.
  * @param DB_OPT_ALLOW_NULL_KEY Allow NULL keys in the database.
@@ -365,7 +365,7 @@ struct DBIterator
 };
 
 /**
- * Public interface of a database. Only contains funtions.
+ * Public interface of a database. Only contains functions.
  * All the functions take the interface as the first argument.
  * @public
  * @see #db_alloc(const char*,int,DBType,DBOptions,unsigned short)
diff --git a/src/common/ers.c b/src/common/ers.c
index 39e05a14c..0842d9e15 100644
--- a/src/common/ers.c
+++ b/src/common/ers.c
@@ -13,16 +13,16 @@
  *  If it has reusable entries (freed entry), it uses one.                   *
  *  So no assumption should be made about the data of the entry.             *
  *  Entries should be freed in the manager they where allocated from.        *
- *  Failure to do so can lead to unexpected behaviours.                      *
+ *  Failure to do so can lead to unexpected behaviors.                      *
  *                                                                           *
  *  <H2>Advantages:</H2>                                                     *
  *  - The same manager is used for entries of the same size.                 *
  *    So entries freed in one instance of the manager can be used by other   *
  *    instances of the manager.                                              *
  *  - Much less memory allocation/deallocation - program will be faster.     *
- *  - Avoids memory fragmentaion - program will run better for longer.       *
+ *  - Avoids memory fragmentation - program will run better for longer.       *
  *                                                                           *
- *  <H2>Disavantages:</H2>                                                   *
+ *  <H2>Disadvantages:</H2>                                                   *
  *  - Unused entries are almost inevitable - memory being wasted.            *
  *  - A  manager will only auto-destroy when all of its instances are        *
  *    destroyed so memory will usually only be recovered near the end.       *
@@ -104,7 +104,7 @@ struct ers_instance_t {
 	// Interface to ERS
 	struct eri VTable;
 	
-	// Name, used for debbuging purpouses
+	// Name, used for debugging purposes
 	char *Name;
 		
 	// Misc options
diff --git a/src/common/ers.h b/src/common/ers.h
index 7eceaf87a..f32680339 100644
--- a/src/common/ers.h
+++ b/src/common/ers.h
@@ -13,16 +13,16 @@
  *  If it has reusable entries (freed entry), it uses one.                   *
  *  So no assumption should be made about the data of the entry.             *
  *  Entries should be freed in the manager they where allocated from.        *
- *  Failure to do so can lead to unexpected behaviours.                      *
+ *  Failure to do so can lead to unexpected behaviors.                      *
  *                                                                           *
  *  <H2>Advantages:</H2>                                                     *
  *  - The same manager is used for entries of the same size.                 *
  *    So entries freed in one instance of the manager can be used by other   *
  *    instances of the manager.                                              *
  *  - Much less memory allocation/deallocation - program will be faster.     *
- *  - Avoids memory fragmentaion - program will run better for longer.       *
+ *  - Avoids memory fragmentation - program will run better for longer.       *
  *                                                                           *
- *  <H2>Disavantages:</H2>                                                   *
+ *  <H2>Disadvantages:</H2>                                                   *
  *  - Unused entries are almost inevitable - memory being wasted.            *
  *  - A  manager will only auto-destroy when all of its instances are        *
  *    destroyed so memory will usually only be recovered near the end.       *
@@ -49,7 +49,7 @@
  *  ERS                   - Entry manager.                                   *
  *  ers_new               - Allocate an instance of an entry manager.        *
  *  ers_report            - Print a report about the current state.          *
- *  ers_final             - Clears the remainder of the manangers.           *
+ *  ers_final             - Clears the remainder of the managers.           *
 \*****************************************************************************/
 
 /**
@@ -64,7 +64,7 @@
  * By default it aligns to one byte, using the "natural order" of the entries.
  * This should NEVER be set to zero or less.
  * If greater than one, some memory can be wasted. This should never be needed
- * but is here just in case some aligment issues arise.
+ * but is here just in case some alignment issues arise.
  */
 #ifndef ERS_ALIGNED
 #	define ERS_ALIGNED 1
@@ -102,7 +102,7 @@ typedef struct eri {
 	/**
 	 * Free an entry allocated from this manager.
 	 * WARNING: Does not check if the entry was allocated by this manager.
-	 * Freeing such an entry can lead to unexpected behaviour.
+	 * Freeing such an entry can lead to unexpected behavior.
 	 * @param self Interface of the entry manager
 	 * @param entry Entry to be freed
 	 */
@@ -170,7 +170,7 @@ ERS ers_new(uint32 size, char *name, enum ERSOptions options);
 void ers_report(void);
 
 /**
- * Clears the remainder of the manangers
+ * Clears the remainder of the managers
  **/
 void ers_final(void);
 #endif /* DISABLE_ERS / not DISABLE_ERS */
diff --git a/src/common/grfio.c b/src/common/grfio.c
index 1111fb3f3..f592812f6 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -418,7 +418,7 @@ void* grfio_reads(const char* fname, int* size)
 			declen = (int)ftell(in);
 			fseek(in,0,SEEK_SET);
 			buf2 = (unsigned char *)aMalloc(declen+1);  // +1 for resnametable zero-termination
-			if(fread(buf2, 1, declen, in) != (size_t)declen) ShowError("An error occured in fread grfio_reads, fname=%s \n",fname);
+			if(fread(buf2, 1, declen, in) != (size_t)declen) ShowError("An error occurred in fread grfio_reads, fname=%s \n",fname);
 			fclose(in);
 
 			if( size )
@@ -440,7 +440,7 @@ void* grfio_reads(const char* fname, int* size)
 			int fsize = entry->srclen_aligned;
 			unsigned char *buf = (unsigned char *)aMalloc(fsize);
 			fseek(in, entry->srcpos, 0);
-			if(fread(buf, 1, fsize, in) != (size_t)fsize) ShowError("An error occured in fread in grfio_reads, grfname=%s\n",grfname);
+			if(fread(buf, 1, fsize, in) != (size_t)fsize) ShowError("An error occurred in fread in grfio_reads, grfname=%s\n",grfname);
 			fclose(in);
 
 			buf2 = (unsigned char *)aMalloc(entry->declen+1);  // +1 for resnametable zero-termination
@@ -583,7 +583,7 @@ static int grfio_entryread(const char* grfname, int gentry)
 		unsigned char *rBuf;
 		uLongf rSize, eSize;
 
-		if(fread(eheader,1,8,fp) != 8) ShowError("An error occured in fread while reading eheader buffer\n");
+		if(fread(eheader,1,8,fp) != 8) ShowError("An error occurred in fread while reading header buffer\n");
 		rSize = getlong(eheader);	// Read Size
 		eSize = getlong(eheader+4);	// Extend Size
 
@@ -595,7 +595,7 @@ static int grfio_entryread(const char* grfname, int gentry)
 
 		rBuf = (unsigned char *)aMalloc(rSize);	// Get a Read Size
 		grf_filelist = (unsigned char *)aMalloc(eSize);	// Get a Extend Size
-		if(fread(rBuf,1,rSize,fp) != rSize) ShowError("An error occured in fread \n");
+		if(fread(rBuf,1,rSize,fp) != rSize) ShowError("An error occurred in fread \n");
 		fclose(fp);
 		decode_zip(grf_filelist, &eSize, rBuf, rSize);	// Decode function
 		aFree(rBuf);
@@ -827,7 +827,7 @@ void grfio_init(const char* fname)
 	if( grf_num == 0 )
 		ShowInfo("No GRF loaded, using default data directory\n");
 
-	// Unneccessary area release of filelist
+	// Unnecessary area release of filelist
 	filelist_compact();
 
 	// Resource check
diff --git a/src/common/malloc.c b/src/common/malloc.c
index 74303fa92..83d1d6656 100644
--- a/src/common/malloc.c
+++ b/src/common/malloc.c
@@ -776,7 +776,7 @@ static void memmgr_init (void)
 {
 #ifdef LOG_MEMMGR
 	sprintf(memmer_logfile, "log/%s.leaks", SERVER_NAME);
-	ShowStatus("Memory manager initialised: "CL_WHITE"%s"CL_RESET"\n", memmer_logfile);
+	ShowStatus("Memory manager initialized: "CL_WHITE"%s"CL_RESET"\n", memmer_logfile);
 	memset(hash_unfill, 0, sizeof(hash_unfill));
 #endif /* LOG_MEMMGR */
 }
@@ -784,7 +784,7 @@ static void memmgr_init (void)
 
 
 /*======================================
-* Initialise
+* Initialize
 *--------------------------------------
 */
 
diff --git a/src/common/mapindex.c b/src/common/mapindex.c
index 5c69c7063..644f2f619 100644
--- a/src/common/mapindex.c
+++ b/src/common/mapindex.c
@@ -70,7 +70,7 @@ const char* mapindex_getmapname_ext(const char* string, char* output) {
 }
 
 /// Adds a map to the specified index
-/// Returns 1 if successful, 0 oherwise
+/// Returns 1 if successful, 0 otherwise
 int mapindex_addmap(int index, const char* name) {
 	char map_name[MAP_NAME_LENGTH];
 
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 4ac7ee793..6ef5b50f5 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -26,7 +26,7 @@
 // 20071106 - 2007-11-06aSakexe+   - 0x78, 0x7c, 0x22c
 // 20080102 - 2008-01-02aSakexe+   - 0x2ec, 0x2ed , 0x2ee
 // 20081126 - 2008-11-26aSakexe+   - 0x1a2
-// 20090408 - 2009-04-08aSakexe+   - 0x44a (dont use as it overlaps with RE client packets)
+// 20090408 - 2009-04-08aSakexe+   - 0x44a (don't use as it overlaps with RE client packets)
 // 20080827 - 2008-08-27aRagexeRE+ - First RE Client
 // 20081217 - 2008-12-17aRagexeRE+ - 0x6d (Note: This one still use old Char Info Packet Structure)
 // 20081218 - 2008-12-17bRagexeRE+ - 0x6d (Note: From this one client use new Char Info Packet Structure)
@@ -120,7 +120,7 @@
 #define MAX_GUILD_STORAGE 600
 #define MAX_PARTY 12
 #define MAX_GUILD (16+10*6)     // Increased max guild members +6 per 1 extension levels [Lupus]
-#define MAX_GUILDPOSITION 20    // Increased max guild positions to accomodate for all members [Valaris] (removed) [PoW]
+#define MAX_GUILDPOSITION 20    // Increased max guild positions to accommodate for all members [Valaris] (removed) [PoW]
 #define MAX_GUILDEXPULSION 32
 #define MAX_GUILDALLIANCE 16
 #define MAX_GUILDSKILL 15       // Increased max guild skills because of new skills [Sara-chan]
diff --git a/src/common/mutex.h b/src/common/mutex.h
index f78e31841..ce13a28b7 100644
--- a/src/common/mutex.h
+++ b/src/common/mutex.h
@@ -57,23 +57,23 @@ racond racond_create();
 /**
  * Destroy a Condition variable
  *
- * @param c - the condition varaible to destroy
+ * @param c - the condition variable to destroy
  */
 void racond_destroy( racond c );
 
 /**
- * Waits Until state is signalled
+ * Waits Until state is signaled
  *
- * @param c - the condition var to wait for signalled state
- * @param m - the mutex used for syncronization
+ * @param c - the condition var to wait for signaled state
+ * @param m - the mutex used for synchronization
  * @param timeout_ticks - timeout in ticks ( -1 = INFINITE )
  */
 void racond_wait( racond c,  ramutex m,  sysint timeout_ticks);
 
 /**
- * Sets the given condition var to signalled state
+ * Sets the given condition var to signaled state
  *
- * @param c - condition var to set in signalled state.
+ * @param c - condition var to set in signaled state.
  *
  * @note:
  *  Only one waiter gets notified.
@@ -81,8 +81,8 @@ void racond_wait( racond c,  ramutex m,  sysint timeout_ticks);
 void racond_signal( racond c );
 
 /**
- * Sets notifys all waiting threads thats signalled.
- * @param c - condition var to set in signalled state
+ * Sets notifies all waiting threads thats signaled.
+ * @param c - condition var to set in signaled state
  *
  * @note:
  *  All Waiters getting notified.
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 2a8e2d5f8..ece10c1a8 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -88,7 +88,7 @@ int console_msg_log = 0;//[Ind] msg error logging
 // XXX adapted from eApp (comments are left untouched) [flaviojs]
 
 ///////////////////////////////////////////////////////////////////////////////
-//  ansi compatible printf with control sequence parser for windows
+//  ANSI compatible printf with control sequence parser for windows
 //  fast hack, handle with care, not everything implemented
 //
 // \033[#;...;#m - Set Graphics Rendition (SGR)
@@ -147,7 +147,7 @@ int console_msg_log = 0;//[Ind] msg error logging
 //
 // \033[u - Restore cursor position (RCP)
 //    Restores the cursor position saved with the (SCP) sequence \033[s.
-//    (addition, restore to 0,0 if nothinh was saved before)
+//    (addition, restore to 0,0 if nothing was saved before)
 //
 
 // \033[#J - Erase Display (ED)
@@ -282,7 +282,7 @@ int	VFPRINTF(HANDLE handle, const char *fmt, va_list argptr)
 							}
 							//case '2': // not existing
 							//case '3':	// blinking (not implemented)
-							//case '4':	// unterline (not implemented)
+							//case '4':	// underline (not implemented)
 							//case '6': // not existing
 							//case '8': // concealed (not implemented)
 							//case '9': // not existing
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index 5b32f39ae..8008acf5a 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -72,9 +72,9 @@
 #define CL_XXBL			"\033[0;44m"	// default on blue
 #define CL_PASS			"\033[0;32;42m"	// green on green
 
-#define CL_SPACE		"           "	// space aquivalent of the print messages
+#define CL_SPACE		"           "	// space equivalent of the print messages
 
-extern int stdout_with_ansisequence; //If the color ansi sequences are to be used. [flaviojs]
+extern int stdout_with_ansisequence; //If the color ANSI sequences are to be used. [flaviojs]
 extern int msg_silent; //Specifies how silent the console is. [Skotlex]
 extern int console_msg_log; //Specifies what error messages to log. [Ind]
 extern char timestamp_format[20]; //For displaying Timestamps [Skotlex]
diff --git a/src/common/socket.c b/src/common/socket.c
index ac6be68fe..58c2d5bf9 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -360,7 +360,7 @@ int recv_to_fifo(int fd)
 	len = sRecv(fd, (char *) session[fd]->rdata + session[fd]->rdata_size, (int)RFIFOSPACE(fd), 0);
 
 	if( len == SOCKET_ERROR )
-	{//An exception has occured
+	{//An exception has occurred
 		if( sErrno != S_EWOULDBLOCK ) {
 			//ShowDebug("recv_to_fifo: %s, closing connection #%d\n", error_msg(), fd);
 			set_eof(fd);
@@ -400,7 +400,7 @@ int send_from_fifo(int fd)
 	len = sSend(fd, (const char *) session[fd]->wdata, (int)session[fd]->wdata_size, MSG_NOSIGNAL);
 
 	if( len == SOCKET_ERROR )
-	{//An exception has occured
+	{//An exception has occurred
 		if( sErrno != S_EWOULDBLOCK ) {
 			//ShowDebug("send_from_fifo: %s, ending connection #%d\n", error_msg(), fd);
 #ifdef SHOW_SERVER_STATS
@@ -845,7 +845,7 @@ int do_sockets(int next)
 			session[i]->func_send(i);
 
 		if(session[i]->flag.eof) //func_send can't free a session, this is safe.
-		{	//Finally, even if there is no data to parse, connections signalled eof should be closed, so we call parse_func [Skotlex]
+		{	//Finally, even if there is no data to parse, connections signaled eof should be closed, so we call parse_func [Skotlex]
 			session[i]->func_parse(i); //This should close the session immediately.
 		}
 	}
@@ -1234,7 +1234,7 @@ void socket_final(void)
 		if(session[i])
 			sockt->close(i);
 
-	// session[0] のダミーデータを削除
+	// session[0]
 	aFree(session[0]->rdata);
 	aFree(session[0]->wdata);
 	aFree(session[0]);
@@ -1364,7 +1364,7 @@ void socket_init(void)
 		}
 	}
 #elif defined(HAVE_SETRLIMIT) && !defined(CYGWIN)
-	// NOTE: getrlimit and setrlimit have bogus behaviour in cygwin.
+	// NOTE: getrlimit and setrlimit have bogus behavior in cygwin.
 	//       "Number of fds is virtually unlimited in cygwin" (sys/param.h)
 	{// set socket limit to FD_SETSIZE
 		struct rlimit rlp;
@@ -1405,7 +1405,7 @@ void socket_init(void)
 	
 	socket_config_read(SOCKET_CONF_FILENAME);
 
-	// initialise last send-receive tick
+	// initialize last send-receive tick
 	sockt->last_tick = time(NULL);
 
 	// session[0] is now currently used for disconnected sessions of the map server, and as such,
@@ -1458,7 +1458,7 @@ uint32 str2ip(const char* ip_str)
 }
 
 // Reorders bytes from network to little endian (Windows).
-// Neccessary for sending port numbers to the RO client until Gravity notices that they forgot ntohs() calls.
+// Necessary for sending port numbers to the RO client until Gravity notices that they forgot ntohs() calls.
 uint16 ntows(uint16 netshort)
 {
 	return ((netshort & 0xFF) << 8) | ((netshort & 0xFF00) >> 8);
diff --git a/src/common/spinlock.h b/src/common/spinlock.h
index 1c0825181..fe0da6669 100644
--- a/src/common/spinlock.h
+++ b/src/common/spinlock.h
@@ -4,7 +4,7 @@
 //
 // CAS based Spinlock Implementation
 //
-// CamelCase names are choosen to be consistent with microsofts winapi
+// CamelCase names are chosen to be consistent with Microsoft's WinAPI
 // which implements CriticalSection by this naming...
 //
 // Author: Florian Wilkemeyer <fw@f-ws.de>
diff --git a/src/common/sql.c b/src/common/sql.c
index ffc4d63ef..a562478ea 100644
--- a/src/common/sql.c
+++ b/src/common/sql.c
@@ -38,7 +38,7 @@ struct Sql {
 
 
 // Column length receiver.
-// Takes care of the possible size missmatch between uint32 and unsigned long.
+// Takes care of the possible size mismatch between uint32 and unsigned long.
 struct s_column_length {
 	uint32* out_length;
 	unsigned long length;
@@ -569,7 +569,7 @@ static void SqlStmt_P_ShowDebugTruncatedColumn(SqlStmt* self, size_t i)
 	Sql_P_ShowDebugMysqlFieldInfo("data   - ", field->type, field->flags&UNSIGNED_FLAG, self->column_lengths[i].length, "");
 	column = &self->columns[i];
 	if( column->buffer_type == MYSQL_TYPE_STRING )
-		Sql_P_ShowDebugMysqlFieldInfo("buffer - ", column->buffer_type, column->is_unsigned, column->buffer_length, "+1(nul-terminator)");
+		Sql_P_ShowDebugMysqlFieldInfo("buffer - ", column->buffer_type, column->is_unsigned, column->buffer_length, "+1(null-terminator)");
 	else
 		Sql_P_ShowDebugMysqlFieldInfo("buffer - ", column->buffer_type, column->is_unsigned, column->buffer_length, "");
 	mysql_free_result(meta);
@@ -765,10 +765,10 @@ int SqlStmt_BindColumn(SqlStmt* self, size_t idx, enum SqlDataType buffer_type,
 	{
 		if( buffer_len < 1 )
 		{
-			ShowDebug("SqlStmt_BindColumn: buffer_len(%d) is too small, no room for the nul-terminator\n", buffer_len);
+			ShowDebug("SqlStmt_BindColumn: buffer_len(%d) is too small, no room for the null-terminator\n", buffer_len);
 			return SQL_ERROR;
 		}
-		--buffer_len;// nul-terminator
+		--buffer_len;// null-terminator
 	}
 	if( !self->bind_columns )
 	{// initialize the bindings
@@ -891,7 +891,7 @@ int SqlStmt_NextRow(SqlStmt* self)
 		if( self->column_lengths[i].out_length )
 			*self->column_lengths[i].out_length = (uint32)length;
 		if( column->buffer_type == MYSQL_TYPE_STRING )
-		{// clear unused part of the string/enum buffer (and nul-terminate)
+		{// clear unused part of the string/enum buffer (and null-terminate)
 			memset((char*)column->buffer + length, 0, column->buffer_length - length + 1);
 		}
 		else if( column->buffer_type == MYSQL_TYPE_BLOB && length < column->buffer_length )
diff --git a/src/common/sql.h b/src/common/sql.h
index 64d8307fc..3bdb76c74 100644
--- a/src/common/sql.h
+++ b/src/common/sql.h
@@ -166,7 +166,7 @@ struct sql_interface {
 	/// It uses the connection of the parent Sql handle.
 	/// Queries in Sql and SqlStmt are independent and don't affect each other.
 	///
-	/// @return SqlStmt handle or NULL if an error occured
+	/// @return SqlStmt handle or NULL if an error occurred
 	struct SqlStmt* (*StmtMalloc)(Sql* sql);
 
 
@@ -198,7 +198,7 @@ struct sql_interface {
 
 	/// Returns the number of parameters in the prepared statement.
 	///
-	/// @return Number or paramenters
+	/// @return Number or parameters
 	size_t (*StmtNumParams)(SqlStmt* self);
 
 
@@ -237,7 +237,7 @@ struct sql_interface {
 	/// Binds the result of a column to a buffer.
 	/// The buffer will be filled with data when the next row is fetched.
 	/// For string/enum buffer types there has to be enough space for the data
-	/// and the nul-terminator (an extra byte).
+	/// and the null-terminator (an extra byte).
 	///
 	/// @return SQL_SUCCESS or SQL_ERROR
 	int (*StmtBindColumn)(SqlStmt* self, size_t idx, SqlDataType buffer_type, void* buffer, size_t buffer_len, uint32* out_length, int8* out_is_null);
diff --git a/src/common/strlib.c b/src/common/strlib.c
index 10e893c3a..2ce8fd347 100644
--- a/src/common/strlib.c
+++ b/src/common/strlib.c
@@ -147,15 +147,15 @@ char* trim(char* str)
 	if( start == end )
 		*str = '\0';// empty string
 	else
-	{// move string with nul terminator
+	{// move string with null-terminator
 		str[end] = '\0';
 		memmove(str,str+start,end-start+1);
 	}
 	return str;
 }
 
-// Converts one or more consecutive occurences of the delimiters into a single space
-// and removes such occurences from the beginning and end of string
+// Converts one or more consecutive occurrences of the delimiters into a single space
+// and removes such occurrences from the beginning and end of string
 // NOTE: make sure the string is not const!!
 char* normalize_name(char* str,const char* delims)
 {
@@ -358,18 +358,18 @@ int config_switch(const char* str) {
 	return (int)strtol(str, NULL, 0);
 }
 
-/// strncpy that always nul-terminates the string
+/// strncpy that always null-terminates the string
 char* safestrncpy(char* dst, const char* src, size_t n)
 {
 	if( n > 0 )
 	{
 		char* d = dst;
 		const char* s = src;
-		d[--n] = '\0';/* nul-terminate string */
+		d[--n] = '\0';/* null-terminate string */
 		for( ; n > 0; --n )
 		{
 			if( (*d++ = *s++) == '\0' )
-			{/* nul-pad remaining bytes */
+			{/* null-pad remaining bytes */
 				while( --n > 0 )
 					*d++ = '\0';
 				break;
@@ -385,12 +385,12 @@ size_t safestrnlen(const char* string, size_t maxlen)
 	return ( string != NULL ) ? strnlen(string, maxlen) : 0;
 }
 
-/// Works like snprintf, but always nul-terminates the buffer.
-/// Returns the size of the string (without nul-terminator)
+/// Works like snprintf, but always null-terminates the buffer.
+/// Returns the size of the string (without null-terminator)
 /// or -1 if the buffer is too small.
 ///
 /// @param buf Target buffer
-/// @param sz Size of the buffer (including nul-terminator)
+/// @param sz Size of the buffer (including null-terminator)
 /// @param fmt Format string
 /// @param ... Format arguments
 /// @return The size of the string or -1 if the buffer is too small
@@ -404,7 +404,7 @@ int safesnprintf(char* buf, size_t sz, const char* fmt, ...)
 	va_end(ap);
 	if( ret < 0 || (size_t)ret >= sz )
 	{// overflow
-		buf[sz-1] = '\0';// always nul-terminate
+		buf[sz-1] = '\0';// always null-terminate
 		return -1;
 	}
 	return ret;
@@ -631,8 +631,8 @@ int sv_parse_next(struct s_svstate* svstate)
 /// @param delim Field delimiter
 /// @param out_pos Array of resulting positions
 /// @param npos Size of the pos array
-/// @param opt Options that determine the parsing behaviour
-/// @return Number of fields found in the string or -1 if an error occured
+/// @param opt Options that determine the parsing behavior
+/// @return Number of fields found in the string or -1 if an error occurred
 int sv_parse(const char* str, int len, int startoff, char delim, int* out_pos, int npos, enum e_svopt opt) {
 	struct s_svstate svstate;
 	int count;
@@ -666,11 +666,11 @@ int sv_parse(const char* str, int len, int startoff, char delim, int* out_pos, i
 /// WARNING: this function modifies the input string
 /// Starts splitting at startoff and fills the out_fields array.
 /// out_fields[0] is the start of the next line.
-/// Other entries are the start of fields (nul-teminated).
+/// Other entries are the start of fields (null-terminated).
 /// Returns the number of fields found or -1 if an error occurs.
 ///
 /// out_fields can be NULL.
-/// Fields that don't fit in out_fields are not nul-terminated.
+/// Fields that don't fit in out_fields are not null-terminated.
 /// Extra entries in out_fields are filled with the end of the last field (empty string).
 ///
 /// @param str String to parse
@@ -679,8 +679,8 @@ int sv_parse(const char* str, int len, int startoff, char delim, int* out_pos, i
 /// @param delim Field delimiter
 /// @param out_fields Array of resulting fields
 /// @param nfields Size of the field array
-/// @param opt Options that determine the parsing behaviour
-/// @return Number of fields found in the string or -1 if an error occured
+/// @param opt Options that determine the parsing behavior
+/// @return Number of fields found in the string or -1 if an error occurred
 int sv_split(char* str, int len, int startoff, char delim, char** out_fields, int nfields, enum e_svopt opt) {
 	int pos[1024];
 	int i;
diff --git a/src/common/strlib.h b/src/common/strlib.h
index f93d8ad67..f39f27789 100644
--- a/src/common/strlib.h
+++ b/src/common/strlib.h
@@ -16,7 +16,7 @@
 	char *_strtok_r(char* s1, const char* s2, char** lasts);
 #endif
 
-/// Bitfield determining the behaviour of sv_parse and sv_split.
+/// Bitfield determining the behavior of sv_parse and sv_split.
 typedef enum e_svopt {
 	// default: no escapes and no line terminator
 	SV_NOESCAPE_NOTERMINATE = 0,
@@ -73,14 +73,14 @@ struct strlib_interface {
 	int (*e_mail_check) (char* email);
 	int (*config_switch) (const char* str);
 	
-	/// strncpy that always nul-terminates the string
+	/// strncpy that always null-terminates the string
 	char *(*safestrncpy) (char* dst, const char* src, size_t n);
 	
 	/// doesn't crash on null pointer
 	size_t (*safestrnlen) (const char* string, size_t maxlen);
 	
-	/// Works like snprintf, but always nul-terminates the buffer.
-	/// Returns the size of the string (without nul-terminator)
+	/// Works like snprintf, but always null-terminates the buffer.
+	/// Returns the size of the string (without null-terminator)
 	/// or -1 if the buffer is too small.
 	int (*safesnprintf) (char* buf, size_t sz, const char* fmt, ...);
 	
@@ -131,7 +131,7 @@ struct sv_interface {
 	/// WARNING: this function modifies the input string
 	/// Starts splitting at startoff and fills the out_fields array.
 	/// out_fields[0] is the start of the next line.
-	/// Other entries are the start of fields (nul-teminated).
+	/// Other entries are the start of fields (null-terminated).
 	/// Returns the number of fields found or -1 if an error occurs.
 	int (*split) (char* str, int len, int startoff, char delim, char** out_fields, int nfields, enum e_svopt opt);
 	
diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c
index 3fdfadb41..40ef6cfc0 100644
--- a/src/common/sysinfo.c
+++ b/src/common/sysinfo.c
@@ -226,7 +226,7 @@ bool sysinfo_svn_get_revision(char **out) {
 	// - since it's a cache column, the data might not even exist
 	if ((fp = fopen(".svn"PATHSEP_STR"wc.db", "rb")) != NULL || (fp = fopen(".."PATHSEP_STR".svn"PATHSEP_STR"wc.db", "rb")) != NULL) {
 
-#ifndef SVNNODEPATH //not sure how to handle branches, so i'll leave this overridable define until a better solution comes up
+#ifndef SVNNODEPATH //not sure how to handle branches, so I'll leave this overridable define until a better solution comes up
 #define SVNNODEPATH trunk
 #endif // SVNNODEPATH
 
@@ -709,7 +709,7 @@ void sysinfo_vcsrevision_src_retrieve(void) {
 #endif // WIN32
 
 /**
- * Retrieevs the VCS type name.
+ * Retrieves the VCS type name.
  *
  * Once retrieved, the value is stored in sysinfo->p->vcstype_name.
  */
diff --git a/src/common/thread.c b/src/common/thread.c
index 91360537f..4be37d576 100644
--- a/src/common/thread.c
+++ b/src/common/thread.c
@@ -68,7 +68,7 @@ void rathread_init(){
 		l_threads[i].myID = i;
 	}
 
-	// now lets init thread id 0, which represnts the main thread
+	// now lets init thread id 0, which represents the main thread
 #ifdef HAS_TLS
 	g_rathread_ID = 0;
 #endif
@@ -83,7 +83,7 @@ void rathread_final(){
 	register unsigned int i;
 	
 	// Unterminated Threads Left?
-	// Should'nt happen ..
+	// Shouldn't happen ..
 	// Kill 'em all!
 	//
 	for(i = 1; i < RA_THREADS_MAX; i++){
@@ -121,9 +121,9 @@ static void *_raThreadMainRedirector( void *p ){
 
 #ifndef WIN32
 	// When using posix threads
-	// the threads inherits the Signal mask from the thread which's spawned
+	// the threads inherits the Signal mask from the thread which spawned
 	// this thread
-	// so we've to block everything we dont care about.
+	// so we've to block everything we don't care about.
 	sigemptyset(&set);
 	sigaddset(&set, SIGINT);
 	sigaddset(&set, SIGTERM);
@@ -222,10 +222,10 @@ void rathread_destroy ( rAthread handle ){
 #else
 	if( pthread_cancel( handle->hThread ) == 0){
 	
-		// We have to join it, otherwise pthread wont re-cycle its internal ressources assoc. with this thread.
+		// We have to join it, otherwise pthread wont re-cycle its internal resources assoc. with this thread.
 		pthread_join( handle->hThread, NULL );
 		
-		// Tell our manager to release ressources ;)
+		// Tell our manager to release resources ;)
 		rat_thread_terminated(handle);
 	}
 #endif
@@ -265,7 +265,7 @@ int rathread_get_tid(){
 #ifdef HAS_TLS
 	return g_rathread_ID;
 #else
-	// todo
+	// TODO
 	#ifdef WIN32
 		return (int)GetCurrentThreadId();
 	#else
diff --git a/src/common/thread.h b/src/common/thread.h
index 7ad326509..992e3e6c8 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -20,7 +20,7 @@ typedef enum RATHREAD_PRIO {
  * Creates a new Thread
  *
  * @param entyPoint  - entryProc,
- * @param param - general purpose parameter, would be given as parameter to the thread's entrypoint.
+ * @param param - general purpose parameter, would be given as parameter to the thread's entry point.
  *
  * @return not NULL if success
  */
@@ -31,7 +31,7 @@ rAthread rathread_create( rAthreadProc entryPoint,  void *param );
  * Creates a new Thread (with more creation options)
  *
  * @param entyPoint  - entryProc,
- * @param param - general purpose parameter, would be given as parameter to the thread's entrypoint
+ * @param param - general purpose parameter, would be given as parameter to the thread's entry point
  * @param szStack - stack Size in bytes
  * @param prio - Priority of the Thread @ OS Scheduler..
  *
@@ -41,9 +41,9 @@ rAthread rathread_createEx( rAthreadProc entryPoint,  void *param,  size_t szSta
 
 
 /**
- * Destroys the given Thread immediatly
+ * Destroys the given Thread immediately
  *
- * @note The Handle gets invalid after call! dont use it afterwards.
+ * @note The Handle gets invalid after call! don't use it afterwards.
  *
  * @param handle - thread to destroy.
  */
@@ -53,7 +53,7 @@ void rathread_destroy ( rAthread handle );
 /**
  * Returns the thread handle of the thread calling this function
  *
- * @note this wont work @ programms main thread
+ * @note this wont work @ programs main thread
  * @note the underlying implementation might not perform very well, cache the value received!
  *
  * @return not NULL if success
@@ -62,10 +62,10 @@ rAthread rathread_self( );
 
 
 /**
- * Returns own thrad id (TID)
+ * Returns own thread id (TID)
  *
  * @note this is an unique identifier for the calling thread, and
- *        depends on platfrom / compiler, and may not be the systems Thread ID!
+ *        depends on platform/ compiler, and may not be the systems Thread ID!
  *
  * @return -1 when fails, otherwise >= 0
  */
@@ -93,7 +93,7 @@ void rathread_prio_set( rAthread handle, RATHREAD_PRIO prio );
 
 
 /**
- * Gets the current Prio of the given trhead
+ * Gets the current Prio of the given thread
  *
  * @param handle - the thread to get the prio for.
  */
diff --git a/src/common/timer.c b/src/common/timer.c
index 5240ec202..ab0471d51 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -170,14 +170,14 @@ static int64 sys_tick(void) {
 	}
 	if (pGetTickCount64)
 		return (int64)pGetTickCount64();
-	// 32-bit fallback. Note: This will wrap around every ~49 days since system startup!!!
+	// 32-bit fall back. Note: This will wrap around every ~49 days since system startup!!!
 	return (int64)GetTickCount();
 #elif defined(ENABLE_RDTSC)
 	// RDTSC: Returns the number of CPU cycles since reset. Unreliable if
 	//   the CPU frequency is variable.
 	return (int64)((_rdtsc() - RDTSC_BEGINTICK) / RDTSC_CLOCK);
 #elif defined(HAVE_MONOTONIC_CLOCK)
-	// Monotinic clock: Implementation-defined.
+	// Monotonic clock: Implementation-defined.
 	//   Clock that cannot be set and represents monotonic time since some
 	//   unspecified starting point.  This clock is not affected by
 	//   discontinuous jumps in the system time (e.g., if the system
@@ -188,7 +188,7 @@ static int64 sys_tick(void) {
 	// int64 cast to avoid overflows on platforms where time_t is 32 bit
 	return (int64)tval.tv_sec * 1000 + tval.tv_nsec / 1000000;
 #else
-	// Fallback, regular clock: Number of milliseconds since epoch.
+	// Fall back, regular clock: Number of milliseconds since epoch.
 	//   The time returned by gettimeofday() is affected by discontinuous
 	//   jumps in the system time (e.g., if the system  administrator
 	//   manually  changes  the system time).  If you need a monotonically
diff --git a/src/common/utils.c b/src/common/utils.c
index 80954f848..4e6cb49c2 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -200,7 +200,7 @@ void findfile(const char *p, const char *pat, void (func)(const char*))
 
 		sprintf(tmppath,"%s%c%s",path, PATHSEP, entry->d_name);
 
-		// check if the pattern matchs.
+		// check if the pattern matches.
 		if (entry->d_name && strstr(entry->d_name, pattern)) {
 			func( tmppath );
 		}
@@ -211,7 +211,7 @@ void findfile(const char *p, const char *pat, void (func)(const char*))
 		}
 		// is this a directory?
 		if (S_ISDIR(dir_stat.st_mode)) {
-			// decent recursivly
+			// decent recursively
 			findfile(tmppath, pat, func);
 		}
 	}//end while
@@ -326,7 +326,7 @@ unsigned int get_percentage(const unsigned int A, const unsigned int B)
 
 	if( B == 0 )
 	{
-		ShowError("get_percentage(): divison by zero! (A=%u,B=%u)\n", A, B);
+		ShowError("get_percentage(): division by zero! (A=%u,B=%u)\n", A, B);
 		return ~0U;
 	}
 
diff --git a/src/config/core.h b/src/config/core.h
index 157d94b2f..24e9de710 100644
--- a/src/config/core.h
+++ b/src/config/core.h
@@ -27,7 +27,7 @@
 /// CONSOLE_INPUT allows you to type commands into the server's console,
 /// Disabling it saves one thread.
 #define CONSOLE_INPUT
-/// Maximum number of caracters 'CONSOLE_INPUT' will support per line.
+/// Maximum number of characters 'CONSOLE_INPUT' will support per line.
 #define MAX_CONSOLE_INPUT 150
 
 /// Uncomment to disable Hercules' anonymous stat report
@@ -43,7 +43,7 @@
 /// By default, all range checks in Aegis are of Square shapes, so a weapon range
 /// - of 10 allows you to attack from anywhere within a 21x21 area.
 /// Enabling this changes such checks to circular checks, which is more realistic,
-/// - but is not the official behaviour.
+/// - but is not the official behavior.
 //#define CIRCULAR_AREA
 
 //This is the distance at which @autoloot works,
diff --git a/src/config/secure.h b/src/config/secure.h
index e5e3662d1..1a89e36cf 100644
--- a/src/config/secure.h
+++ b/src/config/secure.h
@@ -49,7 +49,7 @@
 
 /**
  * Uncomment to disable
- * while enabled, movement of invisible (cloaking, hide, etca [not chase walk]) units is not informed to nearby foes,
+ * while enabled, movement of invisible (cloaking, hide, etc [not chase walk]) units is not informed to nearby foes,
  * rendering any client-side cheat, that would otherwise make these units visible, to not function.
  * - "Why is this a setting?" because theres a cost, while enabled if a hidden character uses a skill with cast time,
  * - for example "cloaking -> walk a bit -> soul break another player" the character display will be momentarily abrupted
diff --git a/src/login/account.h b/src/login/account.h
index 329ae31c8..a14595519 100644
--- a/src/login/account.h
+++ b/src/login/account.h
@@ -25,7 +25,7 @@ struct mmo_account
 	char email[40];             // e-mail (by default: a@a.com)
 	int group_id;               // player group id
 	uint8 char_slots;           // this accounts maximum character slots (maximum is limited to MAX_CHARS define in char server)
-	unsigned int state;         // packet 0x006a value + 1 (0: compte OK)
+	unsigned int state;         // packet 0x006a value + 1 (0: complete OK)
 	time_t unban_time;          // (timestamp): ban time limit of the account (0 = no ban)
 	time_t expiration_time;     // (timestamp): validity limit of the account (0 = unlimited)
 	unsigned int logincount;    // number of successful auth attempts
diff --git a/src/login/account_sql.c b/src/login/account_sql.c
index 2e4ed7ab9..51e499369 100644
--- a/src/login/account_sql.c
+++ b/src/login/account_sql.c
@@ -454,7 +454,7 @@ static bool account_db_sql_load_str(AccountDB* self, struct mmo_account* acc, co
 	}
 
 	if( SQL->NumRows(sql_handle) > 1 )
-	{// serious problem - duplicit account
+	{// serious problem - duplicate account
 		ShowError("account_db_sql_load_str: multiple accounts found when retrieving data for account '%s'!\n", userid);
 		SQL->FreeResult(sql_handle);
 		return false;
diff --git a/src/login/login.c b/src/login/login.c
index 43883c6ce..c3f2f6000 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -287,7 +287,7 @@ int lan_subnetcheck(uint32 ip)
 }
 
 //----------------------------------
-// Reading Lan Support configuration
+// Reading LAN Support configuration
 //----------------------------------
 int login_lan_config_read(const char *lancfgName)
 {
@@ -724,13 +724,13 @@ int parse_fromchar(int fd)
 			RFIFOSKIP(fd,6);
 
 			if( !accounts->load_num(accounts, &acc, account_id) )
-				ShowNotice("Char-server '%s': Error of UnBan request (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);
+				ShowNotice("Char-server '%s': Error of Unban request (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);
 			else
 			if( acc.unban_time == 0 )
-				ShowNotice("Char-server '%s': Error of UnBan request (account: %d, no change for unban date, ip: %s).\n", server[id].name, account_id, ip);
+				ShowNotice("Char-server '%s': Error of Unban request (account: %d, no change for unban date, ip: %s).\n", server[id].name, account_id, ip);
 			else
 			{
-				ShowNotice("Char-server '%s': UnBan request (account: %d, ip: %s).\n", server[id].name, account_id, ip);
+				ShowNotice("Char-server '%s': Unban request (account: %d, ip: %s).\n", server[id].name, account_id, ip);
 				acc.unban_time = 0;
 				accounts->save(accounts, &acc);
 			}
@@ -912,7 +912,7 @@ int mmo_auth_new(const char* userid, const char* pass, const char sex, const cha
 
 	// check if the account doesn't exist already
 	if( accounts->load_str(accounts, &acc, userid) ) {
-		ShowNotice("Attempt of creation of an already existant account (account: %s_%c, pass: %s, received pass: %s)\n", userid, sex, acc.pass, pass);
+		ShowNotice("Attempt of creation of an already existing account (account: %s_%c, pass: %s, received pass: %s)\n", userid, sex, acc.pass, pass);
 		return 1; // 1 = Incorrect Password
 	}
 
@@ -1104,7 +1104,7 @@ void login_auth_ok(struct login_session_data* sd)
 		WFIFOSET(fd,3);
 		return;
 	} else if( login_config.min_group_id_to_connect >= 0 && login_config.group_id_to_connect == -1 && sd->group_id < login_config.min_group_id_to_connect ) {
-		ShowStatus("Connection refused: the minium group id required for connection is %d (account: %s, group: %d).\n", login_config.min_group_id_to_connect, sd->userid, sd->group_id);
+		ShowStatus("Connection refused: the minimum group id required for connection is %d (account: %s, group: %d).\n", login_config.min_group_id_to_connect, sd->userid, sd->group_id);
 		WFIFOHEAD(fd,3);
 		WFIFOW(fd,0) = 0x81;
 		WFIFOB(fd,2) = 1; // 01 = Server closed
@@ -1309,7 +1309,7 @@ int parse_login(int fd)
 		// Perform ip-ban check
 		if( login_config.ipban && ipban_check(ipl) )
 		{
-			ShowStatus("Connection refused: IP isn't authorised (deny/allow, ip: %s).\n", ip);
+			ShowStatus("Connection refused: IP isn't authorized (deny/allow, ip: %s).\n", ip);
 			login_log(ipl, "unknown", -3, "ip banned");
 			WFIFOHEAD(fd,23);
 			WFIFOW(fd,0) = 0x6a;
@@ -1772,7 +1772,7 @@ int do_init(int argc, char** argv)
 {
 	int i;
 
-	// intialize engine (to accept config settings)
+	// initialize engine (to accept config settings)
 	account_engine[0].db = account_engine[0].constructor();
 
 	// read login-server configuration
diff --git a/src/login/login.h b/src/login/login.h
index e77b96a0e..447301ea4 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -72,7 +72,7 @@ struct Login_Config {
 	unsigned int ip_sync_interval;                  // interval (in minutes) to execute a DNS/IP update (for dynamic IPs)
 	bool log_login;                                 // whether to log login server actions or not
 	char date_format[32];                           // date format used in messages
-	bool new_account_flag,new_acc_length_limit;     // autoregistration via _M/_F ? / if yes minimum length is 4?
+	bool new_account_flag,new_acc_length_limit;     // auto-registration via _M/_F ? / if yes minimum length is 4?
 	int start_limited_time;                         // new account expiration time (-1: unlimited)
 	bool use_md5_passwds;                           // work with password hashes instead of plaintext passwords?
 	int group_id_to_connect;                        // required group id to connect
diff --git a/src/login/loginlog_sql.c b/src/login/loginlog_sql.c
index 2cbc02c93..2c0b1cc03 100644
--- a/src/login/loginlog_sql.c
+++ b/src/login/loginlog_sql.c
@@ -35,7 +35,7 @@ static Sql* sql_handle = NULL;
 static bool enabled = false;
 
 
-// Returns the number of failed login attemps by the ip in the last minutes.
+// Returns the number of failed login attempts by the ip in the last minutes.
 unsigned long loginlog_failedattempts(uint32 ip, unsigned int minutes)
 {
 	unsigned long failures = 0;
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index a7e4cef39..2acea5872 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -947,7 +947,7 @@ ACMD(jobchange) {
 				}
 			}
 			
-			// High Jobs, Babys and Third
+			// High Jobs, Babies and Third
 			for( i = JOB_NOVICE_HIGH; i < JOB_MAX && !found; i++ ){
 				if (strncmpi(message, pc->job_name(i), 16) == 0) {
 					job = i;
@@ -1329,7 +1329,7 @@ ACMD(baselevelup)
 			clif->message(fd, msg_txt(47)); // Base level can't go any higher.
 			return false;
 		} // End Addition
-		if ((unsigned int)level > pc->maxbaselv(sd) || (unsigned int)level > pc->maxbaselv(sd) - sd->status.base_level) // fix positiv overflow
+		if ((unsigned int)level > pc->maxbaselv(sd) || (unsigned int)level > pc->maxbaselv(sd) - sd->status.base_level) // fix positive overflow
 			level = pc->maxbaselv(sd) - sd->status.base_level;
 		for (i = 0; i < level; i++)
 			status_point += pc->gets_status_point(sd->status.base_level + i);
@@ -1389,7 +1389,7 @@ ACMD(joblevelup)
 			clif->message(fd, msg_txt(23)); // Job level can't go any higher.
 			return false;
 		}
-		if ((unsigned int)level > pc->maxjoblv(sd) || (unsigned int)level > pc->maxjoblv(sd) - sd->status.job_level) // fix positiv overflow
+		if ((unsigned int)level > pc->maxjoblv(sd) || (unsigned int)level > pc->maxjoblv(sd) - sd->status.job_level) // fix positive overflow
 			level = pc->maxjoblv(sd) - sd->status.job_level;
 		sd->status.job_level += (unsigned int)level;
 		sd->status.skill_point += level;
@@ -1401,11 +1401,11 @@ ACMD(joblevelup)
 			return false;
 		}
 		level *=-1;
-		if ((unsigned int)level >= sd->status.job_level) // fix negativ overflow
+		if ((unsigned int)level >= sd->status.job_level) // fix negative overflow
 			level = sd->status.job_level-1;
 		sd->status.job_level -= (unsigned int)level;
 		if (sd->status.skill_point < level)
-			pc->resetskill(sd,0);	//Reset skills since we need to substract more points.
+			pc->resetskill(sd,0);	//Reset skills since we need to subtract more points.
 		if (sd->status.skill_point < level)
 			sd->status.skill_point = 0;
 		else
@@ -1631,7 +1631,7 @@ ACMD(model)
 		pc->changelook(sd, LOOK_HAIR, hair_style);
 		pc->changelook(sd, LOOK_HAIR_COLOR, hair_color);
 		pc->changelook(sd, LOOK_CLOTHES_COLOR, cloth_color);
-		clif->message(fd, msg_txt(36)); // Appearence changed.
+		clif->message(fd, msg_txt(36)); // Appearance changed.
 	} else {
 		clif->message(fd, msg_txt(37)); // An invalid number was specified.
 		return false;
@@ -1657,7 +1657,7 @@ ACMD(dye)
 	
 	if (cloth_color >= MIN_CLOTH_COLOR && cloth_color <= MAX_CLOTH_COLOR) {
 		pc->changelook(sd, LOOK_CLOTHES_COLOR, cloth_color);
-		clif->message(fd, msg_txt(36)); // Appearence changed.
+		clif->message(fd, msg_txt(36)); // Appearance changed.
 	} else {
 		clif->message(fd, msg_txt(37)); // An invalid number was specified.
 		return false;
@@ -1683,7 +1683,7 @@ ACMD(hair_style)
 	
 	if (hair_style >= MIN_HAIR_STYLE && hair_style <= MAX_HAIR_STYLE) {
 		pc->changelook(sd, LOOK_HAIR, hair_style);
-		clif->message(fd, msg_txt(36)); // Appearence changed.
+		clif->message(fd, msg_txt(36)); // Appearance changed.
 	} else {
 		clif->message(fd, msg_txt(37)); // An invalid number was specified.
 		return false;
@@ -1709,7 +1709,7 @@ ACMD(hair_color)
 	
 	if (hair_color >= MIN_HAIR_COLOR && hair_color <= MAX_HAIR_COLOR) {
 		pc->changelook(sd, LOOK_HAIR_COLOR, hair_color);
-		clif->message(fd, msg_txt(36)); // Appearence changed.
+		clif->message(fd, msg_txt(36)); // Appearance changed.
 	} else {
 		clif->message(fd, msg_txt(37)); // An invalid number was specified.
 		return false;
@@ -1896,7 +1896,7 @@ ACMD(monster)
 		return false;
 	}
 	
-	if ((mob_id = mob->db_searchname(monster)) == 0) // check name first (to avoid possible name begining by a number)
+	if ((mob_id = mob->db_searchname(monster)) == 0) // check name first (to avoid possible name beginning by a number)
 		mob_id = mob->db_checkid(atoi(monster));
 	
 	if (mob_id == 0) {
@@ -2711,7 +2711,7 @@ ACMD(char_block)
  *     mn: minute
  *     s:  second
  * <example> @ban +1m-2mn1s-6y test_player
- *           this example adds 1 month and 1 second, and substracts 2 minutes and 6 years at the same time.
+ *           this example adds 1 month and 1 second, and subtracts 2 minutes and 6 years at the same time.
  *------------------------------------------*/
 ACMD(char_ban)
 {
@@ -2879,12 +2879,12 @@ ACMD(doom)
 		{
 			status_kill(&pl_sd->bl);
 			clif->specialeffect(&pl_sd->bl,450,AREA);
-			clif->message(pl_sd->fd, msg_txt(61)); // The holy messenger has given judgement.
+			clif->message(pl_sd->fd, msg_txt(61)); // The holy messenger has given judgment.
 		}
 	}
 	mapit->free(iter);
 	
-	clif->message(fd, msg_txt(62)); // Judgement was made.
+	clif->message(fd, msg_txt(62)); // Judgment was made.
 	
 	return true;
 }
@@ -2904,12 +2904,12 @@ ACMD(doommap)
 		{
 			status_kill(&pl_sd->bl);
 			clif->specialeffect(&pl_sd->bl,450,AREA);
-			clif->message(pl_sd->fd, msg_txt(61)); // The holy messenger has given judgement.
+			clif->message(pl_sd->fd, msg_txt(61)); // The holy messenger has given judgment.
 		}
 	}
 	mapit->free(iter);
 	
-	clif->message(fd, msg_txt(62)); // Judgement was made.
+	clif->message(fd, msg_txt(62)); // Judgment was made.
 	
 	return true;
 }
@@ -2984,7 +2984,7 @@ ACMD(kick)
 	
 	if ( pc_get_group_level(sd) < pc_get_group_level(pl_sd) )
 	{
-		clif->message(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+		clif->message(fd, msg_txt(81)); // Your GM level don't authorize you to do this action on this player.
 		return false;
 	}
 	
@@ -3287,7 +3287,7 @@ ACMD(mapexit) {
 }
 
 /*==========================================
- * idsearch <part_of_name>: revrited by [Yor]
+ * idsearch <part_of_name>: rewrite by [Yor]
  *------------------------------------------*/
 ACMD(idsearch)
 {
@@ -3333,7 +3333,7 @@ ACMD(recallall)
 	memset(atcmd_output, '\0', sizeof(atcmd_output));
 	
 	if (sd->bl.m >= 0 && map->list[sd->bl.m].flag.nowarpto && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) {
-		clif->message(fd, msg_txt(1032)); // You are not authorized to warp somenone to your current map.
+		clif->message(fd, msg_txt(1032)); // You are not authorized to warp someone to your current map.
 		return false;
 	}
 	
@@ -3385,7 +3385,7 @@ ACMD(guildrecall)
 	}
 	
 	if (sd->bl.m >= 0 && map->list[sd->bl.m].flag.nowarpto && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) {
-		clif->message(fd, msg_txt(1032)); // You are not authorized to warp somenone to your current map.
+		clif->message(fd, msg_txt(1032)); // You are not authorized to warp someone to your current map.
 		return false;
 	}
 	
@@ -3442,7 +3442,7 @@ ACMD(partyrecall)
 	}
 	
 	if (sd->bl.m >= 0 && map->list[sd->bl.m].flag.nowarpto && !pc_has_permission(sd, PC_PERM_WARP_ANYWHERE)) {
-		clif->message(fd, msg_txt(1032)); // You are not authorized to warp somenone to your current map.
+		clif->message(fd, msg_txt(1032)); // You are not authorized to warp someone to your current map.
 		return false;
 	}
 	
@@ -4089,7 +4089,7 @@ ACMD(nuke) {
 			skill->castend_nodamage_id(&pl_sd->bl, &pl_sd->bl, NPC_SELFDESTRUCTION, 99, timer->gettick(), 0);
 			clif->message(fd, msg_txt(109)); // Player has been nuked!
 		} else {
-			clif->message(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+			clif->message(fd, msg_txt(81)); // Your GM level don't authorize you to do this action on this player.
 			return false;
 		}
 	} else {
@@ -4286,7 +4286,7 @@ ACMD(servertime) {
 		const struct TimerData * timer_data2 = timer->get(pc->day_timer_tid);
 		
 		if (map->night_flag == 0) {
-			sprintf(temp, msg_txt(235), // Game time: The game is actualy in daylight for %s.
+			sprintf(temp, msg_txt(235), // Game time: The game is actually in daylight for %s.
 			        txt_time((unsigned int)(DIFF_TICK(timer_data->tick,timer->gettick())/1000)));
 			clif->message(fd, temp);
 			if (DIFF_TICK(timer_data->tick, timer_data2->tick) > 0)
@@ -4297,7 +4297,7 @@ ACMD(servertime) {
 				        txt_time((unsigned int)(DIFF_TICK(timer_data2->tick,timer_data->tick)/1000)));
 			clif->message(fd, temp);
 		} else {
-			sprintf(temp, msg_txt(233), // Game time: The game is actualy in night for %s.
+			sprintf(temp, msg_txt(233), // Game time: The game is actually in night for %s.
 			        txt_time((unsigned int)(DIFF_TICK(timer_data2->tick,timer->gettick()) / 1000)));
 			clif->message(fd, temp);
 			if (DIFF_TICK(timer_data2->tick,timer_data->tick) > 0)
@@ -4371,7 +4371,7 @@ ACMD(jail) {
 	
 	if (pc_get_group_level(sd) < pc_get_group_level(pl_sd))
   	{ // you can jail only lower or same GM
-		clif->message(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+		clif->message(fd, msg_txt(81)); // Your GM level don't authorize you to do this action on this player.
 		return false;
 	}
 	
@@ -4422,7 +4422,7 @@ ACMD(unjail) {
 	
 	if (pc_get_group_level(sd) < pc_get_group_level(pl_sd)) { // you can jail only lower or same GM
 		
-		clif->message(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+		clif->message(fd, msg_txt(81)); // Your GM level don't authorize you to do this action on this player.
 		return false;
 	}
 	
@@ -4499,7 +4499,7 @@ ACMD(jailfor) {
 	}
 	
 	if (pc_get_group_level(pl_sd) > pc_get_group_level(sd)) {
-		clif->message(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+		clif->message(fd, msg_txt(81)); // Your GM level don't authorize you to do this action on this player.
 		return false;
 	}
 	
@@ -5245,7 +5245,7 @@ ACMD(useskill) {
 	
 	if ( pc_get_group_level(sd) < pc_get_group_level(pl_sd) )
 	{
-		clif->message(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+		clif->message(fd, msg_txt(81)); // Your GM level don't authorized you to do this action on this player.
 		return false;
 	}
 	
@@ -5460,7 +5460,7 @@ ACMD(autotrade) {
 		status->change_start(NULL,&sd->bl, SC_AUTOTRADE, 10000, 0, 0, 0, 0, ((timeout > 0) ? min(timeout,battle_config.at_timeout) : battle_config.at_timeout) * 60000, 0);
 	}
 
-	/* currently standalones are not supporting buyingstores, so we rely on the previous method */
+	/* currently standalone is not supporting buyingstores, so we rely on the previous method */
 	if( sd->state.buyingstore ) {
 		clif->authfail_fd(fd, 15);
 		return true;
@@ -6385,7 +6385,7 @@ ACMD(changesex)
 	int i;
 
 	pc->resetskill(sd,4);
-	// to avoid any problem with equipment and invalid sex, equipment is unequiped.
+	// to avoid any problem with equipment and invalid sex, equipment is unequipped.
 	for( i=0; i<EQI_MAX; i++ )
 		if( sd->equip_index[i] >= 0 ) pc->unequipitem(sd, sd->equip_index[i], 3);
 	chrif->changesex(sd);
@@ -6411,7 +6411,7 @@ ACMD(mute) {
 	
 	if ( pc_get_group_level(sd) < pc_get_group_level(pl_sd) )
 	{
-		clif->message(fd, msg_txt(81)); // Your GM level don't authorise you to do this action on this player.
+		clif->message(fd, msg_txt(81)); // Your GM level don't authorize you to do this action on this player.
 		return false;
 	}
 	
@@ -7700,7 +7700,7 @@ ACMD(accept) {
 	}
 	
 	if(sd->duel_invite <= 0) {
-		// "Duel: @accept without invititation."
+		// "Duel: @accept without invitation."
 		clif->message(fd, msg_txt(360));
 		return false;
 	}
@@ -7720,7 +7720,7 @@ ACMD(accept) {
 
 ACMD(reject) {
 	if(sd->duel_invite <= 0) {
-		// "Duel: @reject without invititation."
+		// "Duel: @reject without invitation."
 		clif->message(fd, msg_txt(362));
 		return false;
 	}
@@ -8632,7 +8632,7 @@ ACMD(join) {
 	if( hChSys.local && strcmpi(name + 1, hChSys.local_name) == 0 ) {
 		if( !map->list[sd->bl.m].channel ) {
 			clif->chsys_mjoin(sd);
-			if( map->list[sd->bl.m].channel ) /* mjoin might have refused, map has chatting capabilities disabled */
+			if( map->list[sd->bl.m].channel ) /* join might have refused, map has chatting capabilities disabled */
 				return true;
 		} else
 			channel = map->list[sd->bl.m].channel;
diff --git a/src/map/battle.c b/src/map/battle.c
index 57302166e..810bebae9 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -58,7 +58,7 @@ int battle_getcurrentskill(struct block_list *bl) { //Returns the current/last s
 }
 
 /*==========================================
- * Get random targetting enemy
+ * Get random targeting enemy
  *------------------------------------------*/
 int battle_gettargeted_sub(struct block_list *bl, va_list ap) {
 	struct block_list **bl_list;
@@ -102,7 +102,7 @@ struct block_list* battle_gettargeted(struct block_list *target) {
 }
 
 
-//Returns the id of the current targetted character of the passed bl. [Skotlex]
+//Returns the id of the current targeted character of the passed bl. [Skotlex]
 int battle_gettarget(struct block_list* bl) {
 
 	switch (bl->type) {
@@ -262,7 +262,7 @@ int battle_delay_damage(int64 tick, int amotion, struct block_list *src, struct
 
 	if ( !battle_config.delay_battle_damage || amotion <= 1 ) {
 		map->freeblock_lock();
-		status_fix_damage(src, target, damage, ddelay); // We have to seperate here between reflect damage and others [icescope]
+		status_fix_damage(src, target, damage, ddelay); // We have to separate here between reflect damage and others [icescope]
 		if( attack_type && !status->isdead(target) && additional_effects )
 			skill->additional_effect(src, target, skill_id, skill_lv, attack_type, dmg_lv, timer->gettick());
 		if( dmg_lv > ATK_BLOCK && attack_type )
@@ -358,7 +358,7 @@ int64 battle_attr_fix(struct block_list *src, struct block_list *target, int64 d
 			}
 		}
 	}
-	if( tsc && tsc->count ) { //since an atk can only have one type let's optimise this a bit
+	if( tsc && tsc->count ) { //since an atk can only have one type let's optimize this a bit
 		switch(atk_elem){
 		case ELE_FIRE:
 			if( tsc->data[SC_SPIDERWEB]) {
@@ -463,7 +463,7 @@ int64 battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, u
 	damage = battle->calc_elefix(src, bl, skill_id, skill_lv, damage + eatk, nk, n_ele, s_ele, s_ele_, type == EQI_HAND_L, flag);
 
 	/**
-	 * In RE Shield Bommerang takes weapon element only for damage calculation,
+	 * In RE Shield Boomerang takes weapon element only for damage calculation,
 	 * - resist calculation is always against neutral
 	**/
 	if ( skill_id == CR_SHIELDBOOMERANG )
@@ -482,7 +482,7 @@ int64 battle_calc_weapon_damage(struct block_list *src, struct block_list *bl, u
 }
 /*==========================================
  * Calculates the standard damage of a normal attack assuming it hits,
- * it calculates nothing extra fancy, is needed for magnum break's WATK_ELEMENT bonus. [Skotlex]
+ * it calculates nothing extra fancy, is needed for magnum breaks WATK_ELEMENT bonus. [Skotlex]
  *------------------------------------------
  * Pass damage2 as NULL to not calc it.
  * Flag values:
@@ -567,7 +567,7 @@ int64 battle_calc_base_damage2(struct status_data *st, struct weapon_atk *wa, st
 	else
 		damage += st->batk;
 
-	//rodatazone says that Overrefine bonuses are part of baseatk
+	//rodatazone says that Overrefined bonuses are part of baseatk
 	//Here we also apply the weapon_atk_rate bonus so it is correctly applied on left/right hands.
 	if(sd) {
 		if (type == EQI_HAND_L) {
@@ -604,7 +604,7 @@ int64 battle_addmastery(struct map_session_data *sd,struct block_list *target,in
 	nullpo_ret(sd);
 
 	if((skill_lv = pc->checkskill(sd,AL_DEMONBANE)) > 0 &&
-		target->type == BL_MOB && //This bonus doesnt work against players.
+		target->type == BL_MOB && //This bonus doesn't work against players.
 		(battle->check_undead(st->race,st->def_ele) || st->race==RC_DEMON) )
 		damage += (int)(skill_lv*(3+sd->status.base_level/20.0));
 		//damage += (skill_lv * 3);
@@ -676,7 +676,7 @@ int64 battle_addmastery(struct map_session_data *sd,struct block_list *target,in
 		case W_FIST:
 			if((skill_lv = pc->checkskill(sd,TK_RUN)) > 0)
 				damage += (skill_lv * 10);
-			// No break, fallthrough to Knuckles
+			// No break, fall through to Knuckles
 		case W_KNUCKLE:
 			if((skill_lv = pc->checkskill(sd,MO_IRONHAND)) > 0)
 				damage += (skill_lv * 3);
@@ -1272,9 +1272,9 @@ int64 battle_calc_defense(int attack_type, struct block_list *src, struct block_
 #else
 				vit_def = def2;
 #endif
-				if((battle->check_undead(sstatus->race,sstatus->def_ele) || sstatus->race==RC_DEMON) && //This bonus already doesnt work vs players
+				if((battle->check_undead(sstatus->race,sstatus->def_ele) || sstatus->race==RC_DEMON) && //This bonus already doesn't work vs players
 					src->type == BL_MOB && (i=pc->checkskill(tsd,AL_DP)) > 0)
-					vit_def += i*(int)(3 +(tsd->status.base_level+1)*0.04);   // submitted by orn
+					vit_def += i*(int)(3 +(tsd->status.base_level+1)*0.04);   // [orn]
 				if( src->type == BL_MOB && (i=pc->checkskill(tsd,RA_RANGERMAIN))>0 &&
 					(sstatus->race == RC_BRUTE || sstatus->race == RC_FISH || sstatus->race == RC_PLANT) )
 					vit_def += i*5;
@@ -1296,7 +1296,7 @@ int64 battle_calc_defense(int attack_type, struct block_list *src, struct block_
 		#ifdef RENEWAL
 			/**
 			* RE DEF Reduction
-			* Pierce defence gains 1 atk per def/2
+			* Pierce defense gains 1 atk per def/2
 			**/
 
 			if( def1 < -399 ) // it stops at -399
@@ -1384,7 +1384,7 @@ int battle_calc_chorusbonus(struct map_session_data *sd) {
 	if (members < 3)
 		return 0; // Bonus remains 0 unless 3 or more Minstrel's/Wanderer's are in the party.
 	if (members > 7)
-		return 5; // Maximum effect possiable from 7 or more Minstrel's/Wanderer's
+		return 5; // Maximum effect possible from 7 or more Minstrel's/Wanderer's
 	return members - 2; // Effect bonus from additional Minstrel's/Wanderer's if not above the max possible
 }
 
@@ -2005,7 +2005,7 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
 					skillratio += 50 * skill_lv;
 					break;
 				case GS_BULLSEYE:
-					//Only works well against brute/demihumans non bosses.
+					//Only works well against brute/demi-humans non bosses.
 					if((tst->race == RC_BRUTE || tst->race == RC_DEMIHUMAN)
 						&& !(tst->mode&MD_BOSS))
 						skillratio += 400;
@@ -2117,7 +2117,7 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
 					RE_LVL_DMOD(150);
 					break;
 				/**
-					* GC Guilotine Cross
+					* GC Guillotine Cross
 					**/
 				case GC_CROSSIMPACT:
 					skillratio += 900 + 100 * skill_lv;
@@ -2401,7 +2401,7 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
 				{
 					int chorusbonus = battle->calc_chorusbonus(sd);
 					skillratio += 300 + 200 * skill_lv;
-					//Chorus bonus dont count the first 2 Minstrel's/Wanderer's and only increases when their's 3 or more. [Rytech]
+					//Chorus bonus don't count the first 2 Minstrel's/Wanderer's and only increases when their's 3 or more. [Rytech]
 					if (chorusbonus >= 1 && chorusbonus <= 5)
 						skillratio += 100<<(chorusbonus-1); // 1->100; 2->200; 3->400; 4->800; 5->1600
 					RE_LVL_DMOD(100);
@@ -2454,7 +2454,7 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
 					if( sc && sc->data[SC_BLAST_OPTION] )
 						skillratio += (sd ? sd->status.job_level * 5 : 0);
 					break;
-					// Physical Elemantal Spirits Attack Skills
+					// Physical Elemental Spirits Attack Skills
 				case EL_CIRCLE_OF_FIRE:
 				case EL_FIRE_BOMB_ATK:
 				case EL_STONE_RAIN:
@@ -2557,8 +2557,8 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
 	return skillratio;
 }
 /*==========================================
- * Check dammage trough status.
- * ATK may be MISS, BLOCKED FAIL, reduc, increase, end status...
+ * Check damage trough status.
+ * ATK may be MISS, BLOCKED FAIL, reduce, increase, end status...
  * After this we apply bg/gvg reduction
  *------------------------------------------*/
 int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Damage *d,int64 damage,uint16 skill_id,uint16 skill_lv) {
@@ -2715,7 +2715,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 			clif->skill_nodamage(bl, bl, RK_MILLENNIUMSHIELD, 1, 1);
 			sce->val3 -= (int)cap_value(damage,INT_MIN,INT_MAX); // absorb damage
 			d->dmg_lv = ATK_BLOCK;
-			sc_start(src,bl,SC_STUN,15,0,skill->get_time2(RK_MILLENNIUMSHIELD,sce->val1)); // There is a chance to be stuned when one shield is broken.
+			sc_start(src,bl,SC_STUN,15,0,skill->get_time2(RK_MILLENNIUMSHIELD,sce->val1)); // There is a chance to be stunned when one shield is broken.
 			if( sce->val3 <= 0 ) { // Shield Down
 				sce->val2--;
 				if( sce->val2 > 0 ) {
@@ -3029,7 +3029,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 			short rate = 100;
 			struct status_data *tstatus = status->get_status_data(bl);
 			if ( !(flag&BF_SKILL) && (flag&BF_WEAPON) && damage > 0 && rnd()%100 < tsc->data[SC_POISONINGWEAPON]->val3 ) {
-				if ( tsc->data[SC_POISONINGWEAPON]->val1 == 9 ) // Oblivion Curse gives a 2nd success chance after the 1st one passes which is reduceable. [Rytech]
+				if ( tsc->data[SC_POISONINGWEAPON]->val1 == 9 ) // Oblivion Curse gives a 2nd success chance after the 1st one passes which is reducible. [Rytech]
 					rate = 100 - tstatus->int_ * 4 / 5;
 				sc_start(src,bl,tsc->data[SC_POISONINGWEAPON]->val2,rate,tsc->data[SC_POISONINGWEAPON]->val1,skill->get_time2(GC_POISONINGWEAPON,1) - (tstatus->vit + tstatus->luk) / 2 * 1000);
 			}
@@ -3046,7 +3046,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
 	/* no data claims these settings affect anything other than players */
 	if( damage && sd && bl->type == BL_PC ) {
 		switch( skill_id ) {
-			//case PA_PRESSURE: /* pressure also belongs to this list but it doesn't reach this area -- so dont worry about it */
+			//case PA_PRESSURE: /* pressure also belongs to this list but it doesn't reach this area -- so don't worry about it */
 			case HW_GRAVITATION:
 			case NJ_ZENYNAGE:
 			case KO_MUCHANAGE:
@@ -3254,7 +3254,7 @@ int battle_blewcount_bonus(struct map_session_data *sd, uint16 skill_id) {
 	int i;
 	if (!sd->skillblown[0].id)
 		return 0;
-	//Apply the bonus blewcount. [Skotlex]
+	//Apply the bonus blow count. [Skotlex]
 	for (i = 0; i < ARRAYLENGTH(sd->skillblown) && sd->skillblown[i].id; i++) {
 		if (sd->skillblown[i].id == skill_id)
 			return sd->skillblown[i].val;
@@ -3335,7 +3335,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 	ad.flag |= battle->range_type(src, target, skill_id, skill_lv);
 	flag.infdef=(tstatus->mode&MD_PLANT?1:0);
 	if( !flag.infdef && target->type == BL_SKILL && ((TBL_SKILL*)target)->group->unit_id == UNT_REVERBERATION )
-		flag.infdef = 1; // Reberberation takes 1 damage
+		flag.infdef = 1; // Reverberation takes 1 damage
 
 	switch(skill_id) {
 		case MG_FIREWALL:
@@ -3600,7 +3600,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 }
 
 /*==========================================
- * Calculate Misc dammage for skill_id
+ * Calculate Misc damage for skill_id
  *------------------------------------------*/
 struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv,int mflag) {
 	int temp;
@@ -3908,7 +3908,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
 				{
 					if (battle_config.agi_penalty_type == 1)
 						flee = (flee * (100 - (attacker_count - (battle_config.agi_penalty_count - 1))*battle_config.agi_penalty_num))/100;
-					else //asume type 2: absolute reduction
+					else // assume type 2: absolute reduction
 						flee -= (attacker_count - (battle_config.agi_penalty_count - 1))*battle_config.agi_penalty_num;
 					if(flee < 1) flee = 1;
 				}
@@ -4046,7 +4046,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 		unsigned lh : 1;		//Attack considers left hand (wd.damage2)
 		unsigned weapon : 1; //It's a weapon attack (consider VVS, and all that)
 #ifdef RENEWAL
-		unsigned tdef : 1; //Total defence reduction
+		unsigned tdef : 1; //Total defense reduction
 #endif
 	}	flag;
 
@@ -4065,7 +4065,7 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
 #endif
 		?1:0);
 	if( !flag.infdef && target->type == BL_SKILL && ((TBL_SKILL*)target)->group->unit_id == UNT_REVERBERATION )
-		flag.infdef = 1; // Reberberation takes 1 damage
+		flag.infdef = 1; // Reverberation takes 1 damage
 
 	//Initial Values
 	wd.type=0; //Normal attack
@@ -5694,7 +5694,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
 
 			/**
 			 * We need to calculate the DMG before the hp reduction, because it can kill the source.
-			 * For futher information: bugreport:4950
+			 * For further information: bugreport:4950
 			 **/
 			ret_val = (damage_lv)skill->attack(BF_WEAPON,src,src,target,PA_SACRIFICE,skill_lv,tick,0);
 
@@ -6058,7 +6058,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 			if(((((TBL_MOB*)target)->special_state.ai == 2 || //Marine Spheres
 				(((TBL_MOB*)target)->special_state.ai == 3 && battle_config.summon_flora&1)) && //Floras
 				s_bl->type == BL_PC && src->type != BL_MOB) || (((TBL_MOB*)target)->special_state.ai == 4 && t_bl->id != s_bl->id)) //Zanzoe
-			{	//Targettable by players
+			{	//Targetable by players
 				state |= BCT_ENEMY;
 				strip_enemy = 0;
 			}
@@ -6137,7 +6137,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 			sd = BL_CAST(BL_PC, t_bl);
 
 			if( sd->state.monster_ignore && flag&BCT_ENEMY )
-				return 0; // Global inminuty only to Attacks
+				return 0; // Global immunity only to Attacks
 			if( sd->status.karma && s_bl->type == BL_PC && ((TBL_PC*)s_bl)->status.karma )
 				state |= BCT_ENEMY; // Characters with bad karma may fight amongst them
 			if( sd->state.killable ) {
@@ -6231,7 +6231,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
 			break;
 		}
 		default:
-		//Need some sort of default behaviour for unhandled types.
+		//Need some sort of default behavior for unhandled types.
 			if (t_bl->type != s_bl->type)
 				state |= BCT_ENEMY;
 			break;
@@ -6351,7 +6351,7 @@ bool battle_check_range(struct block_list *src, struct block_list *bl, int range
 		return true;  // No need for path checking.
 
 	if( d > AREA_SIZE )
-		return false; // Avoid targetting objects beyond your range of sight.
+		return false; // Avoid targeting objects beyond your range of sight.
 
 	return path->search_long(NULL,src->m,src->x,src->y,bl->x,bl->y,CELL_CHKWALL);
 }
diff --git a/src/map/battle.h b/src/map/battle.h
index 433dca95f..fc916597d 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -79,7 +79,7 @@ enum e_battle_check_target { //New definitions [Skotlex]
  * Structures
  **/
 
-// dammage structure
+// damage structure
 struct Damage {
 	int64 damage,damage2; //right, left dmg
 	int type,div_; //chk clif_damage for type @TODO add an enum ? ;  nb of hit
@@ -489,7 +489,7 @@ enum e_battle_config_idletime {
 	BCIDLE_ATCOMMAND     = 0x200,
 };
 
-// Dammage delayed info
+// Damage delayed info
 struct delay_damage {
 	int src_id;
 	int target_id;
@@ -571,7 +571,7 @@ struct battle_interface {
 	int (*check_target) (struct block_list *src, struct block_list *target,int flag);
 	/* is src and bl within range? */
 	bool (*check_range) (struct block_list *src,struct block_list *bl,int range);
-	/* consume amo for this skill and lv */
+	/* consume ammo for this skill and lv */
 	void (*consume_ammo) (struct map_session_data* sd, int skill_id, int lv);
 	int (*get_targeted_sub) (struct block_list *bl, va_list ap);
 	int (*get_enemy_sub) (struct block_list *bl, va_list ap);
diff --git a/src/map/battleground.c b/src/map/battleground.c
index 4558f32c3..f7131513d 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -541,7 +541,7 @@ void bg_match_over(struct bg_arena *arena, bool canceled) {
 				bg->queue_pc_cleanup(sd);
 			}
 			if( canceled )
-				clif->colormes(sd->fd,COLOR_RED,"BG Match Cancelled: not enough players");
+				clif->colormes(sd->fd,COLOR_RED,"BG Match Canceled: not enough players");
 			else {
 				pc_setglobalreg(sd, script->add_str(arena->delay_var), (unsigned int)time(NULL));
 			}
@@ -579,7 +579,7 @@ void bg_begin(struct bg_arena *arena) {
 		if( bg->afk_timer_id == INVALID_TIMER && bg->mafksec > 0 )
 			bg->afk_timer_id = timer->add(timer->gettick()+10000,bg->afk_timer,0,0);
 		
-		/* TODO: make this a arena-independant var? or just .@? */
+		/* TODO: make this a arena-independent var? or just .@? */
 		mapreg->setreg(script->add_str("$@bg_queue_id"),arena->queue_id);
 		mapreg->setregstr(script->add_str("$@bg_delay_var$"),bg->gdelay_var);
 		
diff --git a/src/map/chat.c b/src/map/chat.c
index 40a9d2348..cd7b5f811 100644
--- a/src/map/chat.c
+++ b/src/map/chat.c
@@ -32,7 +32,7 @@ struct chat_data* chat_createchat(struct block_list* bl, const char* title, cons
 	struct chat_data* cd;
 	nullpo_retr(NULL, bl);
 
-	/* Given the overhead and the numerous instances (npc allocatted or otherwise) wouldn't it be benefitial to have it use ERS? [Ind] */
+	/* Given the overhead and the numerous instances (npc allocated or otherwise) wouldn't it be beneficial to have it use ERS? [Ind] */
 	cd = (struct chat_data *) aMalloc(sizeof(struct chat_data));
 
 	safestrncpy(cd->title, title, sizeof(cd->title));
diff --git a/src/map/chrif.c b/src/map/chrif.c
index a69cca573..54cc139f4 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -55,7 +55,7 @@ struct chrif_interface chrif_s;
 //2b03: Incoming, clif_charselectok -> '' (i think its the packet after enterworld?) (not sure)
 //2b04: Incoming, chrif_recvmap -> 'getting maps from charserver of other mapserver's'
 //2b05: Outgoing, chrif_changemapserver -> 'Tell the charserver the mapchange / quest for ok...'
-//2b06: Incoming, chrif_changemapserverack -> 'awnser of 2b05, ok/fail, data: dunno^^'
+//2b06: Incoming, chrif_changemapserverack -> 'answer of 2b05, ok/fail, data: dunno^^'
 //2b07: Outgoing, chrif_removefriend -> 'Tell charserver to remove friend_id from char_id friend list'
 //2b08: Outgoing, chrif_searchcharid -> '...'
 //2b09: Incoming, map_addchariddb -> 'Adds a name to the nick db'
@@ -79,7 +79,7 @@ struct chrif_interface chrif_s;
 //2b1b: Incoming, chrif_recvfamelist -> 'Receive fame ranking lists'
 //2b1c: Outgoing, chrif_save_scdata -> 'Send sc_data of player for saving.'
 //2b1d: Incoming, chrif_load_scdata -> 'received sc_data of player for loading.'
-//2b1e: Incoming, chrif_update_ip -> 'Reqest forwarded from char-server for interserver IP sync.' [Lance]
+//2b1e: Incoming, chrif_update_ip -> 'Request forwarded from char-server for interserver IP sync.' [Lance]
 //2b1f: Incoming, chrif_disconnectplayer -> 'disconnects a player (aid X) with the message XY ... 0x81 ..' [Sirius]
 //2b20: Incoming, chrif_removemap -> 'remove maps of a server (sample: its going offline)' [Sirius]
 //2b21: Incoming, chrif_save_ack. Returned after a character has been "final saved" on the char-server. [Skotlex]
@@ -393,7 +393,7 @@ bool chrif_changemapserver(struct map_session_data* sd, uint32 ip, uint16 port)
 	return true;
 }
 
-/// map-server change request acknowledgement (positive or negative)
+/// map-server change request acknowledgment (positive or negative)
 /// R 2b06 <account_id>.L <login_id1>.L <login_id2>.L <char_id>.L <map_index>.W <x>.W <y>.W <ip>.L <port>.W
 bool chrif_changemapserverack(int account_id, int login_id1, int login_id2, int char_id, short map_index, short x, short y, uint32 ip, uint16 port) {
 	struct auth_node *node;
@@ -853,9 +853,9 @@ void chrif_changedsex(int fd) {
 	// Path to activate this response:
 	// Map(start) (0x2b0e) -> Char(0x2727) -> Login
 	// Login(0x2723) [ALL] -> Char (0x2b0d)[ALL] -> Map (HERE)
-	// Char will usually be "logged in" despite being forced to log-out in the begining
+	// Char will usually be "logged in" despite being forced to log-out in the beginning
 	// of this process, but there's no need to perform map-server specific response
-	// as everything should've been changed through char-server [Panikon]
+	// as everything should been changed through char-server [Panikon]
 }
 /*==========================================
  * Request Char Server to Divorce Players
@@ -944,14 +944,14 @@ void chrif_idbanned(int fd) {
 	}
 
 	sd->login_id1++; // change identify, because if player come back in char within the 5 seconds, he can change its characters
-	if (RFIFOB(fd,6) == 0) { // 0: change of statut
+	if (RFIFOB(fd,6) == 0) { // 0: change of status
 		int ret_status = RFIFOL(fd,7); // status or final date of a banishment
 		if(0<ret_status && ret_status<=9)
 			clif->message(sd->fd, msg_txt(411+ret_status)); // Message IDs (for search convenience): 412, 413, 414, 415, 416, 417, 418, 419, 420
 		else if(ret_status==100)
 			clif->message(sd->fd, msg_txt(421));
 		else
-			clif->message(sd->fd, msg_txt(420)); //"Your account has not more authorised."
+			clif->message(sd->fd, msg_txt(420)); //"Your account has not more authorized."
 	} else if (RFIFOB(fd,6) == 1) { // 1: ban
 		time_t timestamp;
 		char tmpstr[2048];
@@ -1206,7 +1206,7 @@ bool chrif_ragsrvinfo(int base_rate, int job_rate, int drop_rate) {
 
 
 /*=========================================
- * Tell char-server charcter disconnected [Wizputer]
+ * Tell char-server character disconnected [Wizputer]
  *-----------------------------------------*/
 bool chrif_char_offline_nsd(int account_id, int char_id) {
 	chrif_check(false);
@@ -1247,7 +1247,7 @@ bool chrif_char_reset_offline(void) {
 }
 
 /*=========================================
- * Tell char-server charcter is online [Wizputer]
+ * Tell char-server character is online [Wizputer]
  *-----------------------------------------*/
 bool chrif_char_online(struct map_session_data *sd) {
 	chrif_check(false);
@@ -1533,7 +1533,7 @@ void chrif_send_report(char* buf, int len) {
 }
 
 /**
- * Sends a single scdata for saving into char server, meant to ensure integrity of durationless conditions
+ * Sends a single scdata for saving into char server, meant to ensure integrity of duration-less conditions
  **/
 void chrif_save_scdata_single(int account_id, int char_id, short type, struct status_change_entry *sce) {
 	
@@ -1555,7 +1555,7 @@ void chrif_save_scdata_single(int account_id, int char_id, short type, struct st
 	
 }
 /**
- * Sends a single scdata deletion request into char server, meant to ensure integrity of durationless conditions
+ * Sends a single scdata deletion request into char server, meant to ensure integrity of duration-less conditions
  **/
 void chrif_del_scdata_single(int account_id, int char_id, short type) {
 	
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 661ba8f84..51ab0e9b9 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -53,7 +53,7 @@ struct chrif_interface {
 	int other_mapserver_count; //Holds count of how many other map servers are online (apart of this instance) [Skotlex]
 
 	/* */
-	struct eri *auth_db_ers; //For reutilizing player login structures.
+	struct eri *auth_db_ers; //For re-utilizing player login structures.
 	DBMap* auth_db; // int id -> struct auth_node*
 	/* */
 	int packet_len_table[CHRIF_PACKET_LEN_TABLE_SIZE];
diff --git a/src/map/clif.c b/src/map/clif.c
index d1ae2eb07..d8714dda0 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2588,7 +2588,7 @@ void clif_cartlist(struct map_session_data *sd) {
 
 /// Removes cart (ZC_CARTOFF).
 /// 012b
-/// Client behaviour:
+/// Client behavior:
 /// Closes the cart storage and removes all it's items from memory.
 /// The Num & Weight values of the cart are left untouched and the cart is NOT removed.
 void clif_clearcart(int fd)
@@ -5047,7 +5047,7 @@ void clif_skillcastcancel(struct block_list* bl)
 ///     4 = "no party" MsgStringTable[163]
 ///     5 = "no shout" MsgStringTable[164]
 ///     6 = "no PKing" MsgStringTable[165]
-///     7 = "no alligning" MsgStringTable[383]
+///     7 = "no aligning" MsgStringTable[383]
 ///     ? = ignored
 /// cause:
 ///     0 = "not enough skill level" MsgStringTable[214] (AL_WARP)
@@ -5425,7 +5425,7 @@ void clif_skill_estimation(struct map_session_data *sd,struct block_list *dst) {
 }
 
 
-/// Presents a textual list of producable items (ZC_MAKABLEITEMLIST).
+/// Presents a textual list of producible items (ZC_MAKABLEITEMLIST).
 /// 018d <packet len>.W { <name id>.W { <material id>.W }*3 }*
 /// material id:
 ///     unused by the client
@@ -5467,7 +5467,7 @@ void clif_skill_produce_mix_list(struct map_session_data *sd, int skill_id , int
 }
 
 
-/// Present a list of producable items (ZC_MAKINGITEM_LIST).
+/// Present a list of producible items (ZC_MAKINGITEM_LIST).
 /// 025a <packet len>.W <mk type>.W { <name id>.W }*
 /// mk type:
 ///     1 = cooking
@@ -5603,7 +5603,7 @@ void clif_displaymessage(const int fd, const char* mes) {
 		if ( ( len = strnlen(mes, 255) ) > 0 ) { // don't send a void message (it's not displaying on the client chat). @help can send void line.
 			WFIFOHEAD(fd, 5 + len);
 			WFIFOW(fd,0) = 0x8e;
-			WFIFOW(fd,2) = 5 + len; // 4 + len + NULL teminate
+			WFIFOW(fd,2) = 5 + len; // 4 + len + NULL terminate
 			safestrncpy((char *)WFIFOP(fd,4), mes, len + 1);
 			WFIFOSET(fd, 5 + len);
 		}
@@ -5632,7 +5632,7 @@ void clif_displaymessage2(const int fd, const char* mes) {
 				} else {
 					WFIFOHEAD(fd, 5 + len);
 					WFIFOW(fd,0) = 0x8e;
-					WFIFOW(fd,2) = 5 + len; // 4 + len + NULL teminate
+					WFIFOW(fd,2) = 5 + len; // 4 + len + NULL terminate
 					safestrncpy((char *)WFIFOP(fd,4), line, len + 1);
 					WFIFOSET(fd, 5 + len);
 				}
@@ -5669,7 +5669,7 @@ void clif_displaymessage_sprintf(const int fd, const char* mes, ...) {
 
 		/* */
 		WFIFOW(fd,0) = 0x8e;
-		WFIFOW(fd,2) = 5 + len; // 4 + len + NULL teminate
+		WFIFOW(fd,2) = 5 + len; // 4 + len + NULL terminate
 
 		WFIFOSET(fd, 5 + len);
 	}
@@ -5924,8 +5924,8 @@ void clif_wis_message(int fd, const char* nick, const char* mes, size_t mes_len)
 /// Inform the player about the result of his whisper action (ZC_ACK_WHISPER).
 /// 0098 <result>.B
 /// result:
-///     0 = success to send wisper
-///     1 = target character is not loged in
+///     0 = success to send whisper
+///     1 = target character is not logged in
 ///     2 = ignored by target
 ///     3 = everyone ignored by target
 void clif_wis_end(int fd, int flag) {
@@ -6191,7 +6191,7 @@ void clif_item_refine_list(struct map_session_data *sd)
 
 
 /// Notification of an auto-casted skill (ZC_AUTORUN_SKILL).
-/// 0147 <skill id>.W <type>.L <level>.W <sp cost>.W <atk range>.W <skill name>.24B <upgradable>.B
+/// 0147 <skill id>.W <type>.L <level>.W <sp cost>.W <atk range>.W <skill name>.24B <upgradeable>.B
 void clif_item_skill(struct map_session_data *sd,uint16 skill_id,uint16 skill_lv)
 {
 	int fd;
@@ -7276,7 +7276,7 @@ void clif_mvp_noitem(struct map_session_data* sd)
 ///     0 = "Guild has been created."
 ///     1 = "You are already in a Guild."
 ///     2 = "That Guild Name already exists."
-///     3 = "You need the neccessary item to create a Guild."
+///     3 = "You need the necessary item to create a Guild."
 void clif_guild_created(struct map_session_data *sd,int flag)
 {
 	int fd;
@@ -7669,7 +7669,7 @@ void clif_guild_emblem_area(struct block_list* bl)
 
 
 /// Sends guild skills (ZC_GUILD_SKILLINFO).
-/// 0162 <packet len>.W <skill points>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <atk range>.W <skill name>.24B <upgradable>.B }*
+/// 0162 <packet len>.W <skill points>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <atk range>.W <skill name>.24B <upgradeable>.B }*
 void clif_guild_skillinfo(struct map_session_data* sd)
 {
 	int fd;
@@ -8186,7 +8186,7 @@ void clif_manner_message(struct map_session_data* sd, uint32 type)
 }
 
 
-/// Followup to 0x14a type 3/5, informs who did the manner adjustment action (ZC_NOTIFY_MANNER_POINT_GIVEN).
+/// Follow-up to 0x14a type 3/5, informs who did the manner adjustment action (ZC_NOTIFY_MANNER_POINT_GIVEN).
 /// 014b <type>.B <GM name>.24B
 /// type:
 ///     0 = positive (unmute)
@@ -8277,7 +8277,7 @@ void clif_playBGM(struct map_session_data* sd, const char* name)
 /// term:
 ///     unknown purpose, only relevant to act = 1
 /// npc id:
-///     The accustic direction of the sound is determined by the
+///     The acoustic direction of the sound is determined by the
 ///     relative position of the NPC to the player (3D sound).
 void clif_soundeffect(struct map_session_data* sd, struct block_list* bl, const char* name, int type)
 {
@@ -8643,7 +8643,7 @@ void clif_charnameack (int fd, struct block_list *bl)
 			return;
 	}
 
-	// if no receipient specified just update nearby clients
+	// if no recipient specified just update nearby clients
 	if (fd == 0)
 		clif->send(buf, packet_len(cmd), bl, AREA);
 	else {
@@ -8738,7 +8738,7 @@ void clif_slide(struct block_list *bl, int x, int y)
 /// 008d <packet len>.W <id>.L <message>.?B
 void clif_disp_overhead(struct block_list *bl, const char* mes)
 {
-	unsigned char buf[256]; //This should be more than sufficient, the theorical max is CHAT_SIZE + 8 (pads and extra inserted crap)
+	unsigned char buf[256]; //This should be more than sufficient, the theoretical max is CHAT_SIZE + 8 (pads and extra inserted crap)
 	size_t len_mes = strlen(mes)+1; //Account for \0
 
 	if (len_mes > sizeof(buf)-8) {
@@ -8846,7 +8846,7 @@ void clif_starskill(struct map_session_data* sd, const char* mapname, int monste
 }
 
 /*==========================================
- * Info about Star Glaldiator save map [Komurka]
+ * Info about Star Gladiator save map [Komurka]
  * type: 1: Information, 0: Map registered
  *------------------------------------------*/
 void clif_feel_info(struct map_session_data* sd, unsigned char feel_level, unsigned char type)
@@ -8858,7 +8858,7 @@ void clif_feel_info(struct map_session_data* sd, unsigned char feel_level, unsig
 }
 
 /*==========================================
- * Info about Star Glaldiator hate mob [Komurka]
+ * Info about Star Gladiator hate mob [Komurka]
  * type: 1: Register mob, 0: Information.
  *------------------------------------------*/
 void clif_hate_info(struct map_session_data *sd, unsigned char hate_level,int class_, unsigned char type)
@@ -9052,7 +9052,7 @@ bool clif_process_message(struct map_session_data *sd, int format, char **name_,
 		if( strncmp(name, sd->status.name, namelen) || // the text must start with the speaker's name
 			name[namelen] != ' ' || name[namelen+1] != ':' || name[namelen+2] != ' ' ) // followed by ' : '
 		{
-			//Hacked message, or infamous "client desynch" issue where they pick one char while loading another.
+			//Hacked message, or infamous "client desynchronize" issue where they pick one char while loading another.
 			ShowWarning("clif_process_message: Player '%s' sent a message using an incorrect name! Forcing a relog...\n", sd->status.name);
 			set_eof(fd); // Just kick them out to correct it.
 			return false;
@@ -10323,7 +10323,7 @@ void clif_hercules_chsys_quit(struct map_session_data *sd) {
 ///     1 = pick up item
 ///     2 = sit down
 ///     3 = stand up
-///     7 = continous attack
+///     7 = continuous attack
 ///     12 = (touch skill?)
 /// There are various variants of this packet, some of them have padding between fields.
 void clif_parse_ActionRequest(int fd, struct map_session_data *sd)
@@ -11037,7 +11037,7 @@ void clif_parse_ChatLeave(int fd, struct map_session_data* sd)
 }
 
 
-//Handles notifying asker and rejecter of what has just ocurred.
+//Handles notifying asker and rejecter of what has just occurred.
 //Type is used to determine the correct msg_txt to use:
 //0:
 void clif_noask_sub(struct map_session_data *src, struct map_session_data *target, int type) {
@@ -12239,7 +12239,7 @@ void clif_parse_PartyChangeLeader(int fd, struct map_session_data* sd) {
 /// Party Booking in KRO [Spiria]
 ///
 
-/// Request to register a party booking advertisment (CZ_PARTY_BOOKING_REQ_REGISTER).
+/// Request to register a party booking advertisement (CZ_PARTY_BOOKING_REQ_REGISTER).
 /// 0802 <level>.W <map id>.W { <job>.W }*6
 void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd)
 {
@@ -12259,7 +12259,7 @@ void clif_parse_PartyBookingRegisterReq(int fd, struct map_session_data* sd)
 }
 
 
-/// Result of request to register a party booking advertisment (ZC_PARTY_BOOKING_ACK_REGISTER).
+/// Result of request to register a party booking advertisement (ZC_PARTY_BOOKING_ACK_REGISTER).
 /// 0803 <result>.W
 /// result:
 ///     0 = success
@@ -12280,7 +12280,7 @@ void clif_PartyBookingRegisterAck(struct map_session_data *sd, int flag)
 }
 
 
-/// Request to search for party booking advertisments (CZ_PARTY_BOOKING_REQ_SEARCH).
+/// Request to search for party booking advertisement (CZ_PARTY_BOOKING_REQ_SEARCH).
 /// 0804 <level>.W <map id>.W <job>.W <last index>.L <result count>.W
 void clif_parse_PartyBookingSearchReq(int fd, struct map_session_data* sd)
 {
@@ -12331,7 +12331,7 @@ void clif_PartyBookingSearchAck(int fd, struct party_booking_ad_info** results,
 }
 
 
-/// Request to delete own party booking advertisment (CZ_PARTY_BOOKING_REQ_DELETE).
+/// Request to delete own party booking advertisement (CZ_PARTY_BOOKING_REQ_DELETE).
 /// 0806
 void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data* sd)
 {
@@ -12344,7 +12344,7 @@ void clif_parse_PartyBookingDeleteReq(int fd, struct map_session_data* sd)
 }
 
 
-/// Result of request to delete own party booking advertisment (ZC_PARTY_BOOKING_ACK_DELETE).
+/// Result of request to delete own party booking advertisement (ZC_PARTY_BOOKING_ACK_DELETE).
 /// 0807 <result>.W
 /// result:
 ///     0 = success
@@ -12366,7 +12366,7 @@ void clif_PartyBookingDeleteAck(struct map_session_data* sd, int flag)
 }
 
 
-/// Request to update party booking advertisment (CZ_PARTY_BOOKING_REQ_UPDATE).
+/// Request to update party booking advertisement (CZ_PARTY_BOOKING_REQ_UPDATE).
 /// 0808 { <job>.W }*6
 void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data* sd)
 {
@@ -12384,7 +12384,7 @@ void clif_parse_PartyBookingUpdateReq(int fd, struct map_session_data* sd)
 }
 
 
-/// Notification about new party booking advertisment (ZC_PARTY_BOOKING_NOTIFY_INSERT).
+/// Notification about new party booking advertisement (ZC_PARTY_BOOKING_NOTIFY_INSERT).
 /// 0809 <index>.L <char name>.24B <expire time>.L <level>.W <map id>.W { <job>.W }*6
 void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
 {
@@ -12410,7 +12410,7 @@ void clif_PartyBookingInsertNotify(struct map_session_data* sd, struct party_boo
 }
 
 
-/// Notification about updated party booking advertisment (ZC_PARTY_BOOKING_NOTIFY_UPDATE).
+/// Notification about updated party booking advertisement (ZC_PARTY_BOOKING_NOTIFY_UPDATE).
 /// 080a <index>.L { <job>.W }*6
 void clif_PartyBookingUpdateNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
 {
@@ -12431,7 +12431,7 @@ void clif_PartyBookingUpdateNotify(struct map_session_data* sd, struct party_boo
 }
 
 
-/// Notification about deleted party booking advertisment (ZC_PARTY_BOOKING_NOTIFY_DELETE).
+/// Notification about deleted party booking advertisement (ZC_PARTY_BOOKING_NOTIFY_DELETE).
 /// 080b <index>.L
 void clif_PartyBookingDeleteNotify(struct map_session_data* sd, int index)
 {
@@ -12450,7 +12450,7 @@ void clif_PartyBookingDeleteNotify(struct map_session_data* sd, int index)
 /// Modified version of Party Booking System for 2012-04-10 or 2012-04-18 (RagexeRE).
 /// Code written by mkbu95, Spiria, Yommy and Ind
 
-/// Request to register a party booking advertisment (CZ_PARTY_RECRUIT_REQ_REGISTER).
+/// Request to register a party booking advertisement (CZ_PARTY_RECRUIT_REQ_REGISTER).
 /// 08e5 <level>.W <notice>.37B
 void clif_parse_PartyRecruitRegisterReq(int fd, struct map_session_data* sd)
 {
@@ -12497,7 +12497,7 @@ void clif_PartyRecruitSearchAck(int fd, struct party_booking_ad_info** results,
 #endif
 }
 
-/// Result of request to register a party booking advertisment (ZC_PARTY_RECRUIT_ACK_REGISTER).
+/// Result of request to register a party booking advertisement (ZC_PARTY_RECRUIT_ACK_REGISTER).
 /// 08e6 <result>.W
 /// result:
 ///     0 = success
@@ -12517,7 +12517,7 @@ void clif_PartyRecruitRegisterAck(struct map_session_data *sd, int flag)
 #endif
 }
 
-/// Request to search for party booking advertisments (CZ_PARTY_RECRUIT_REQ_SEARCH).
+/// Request to search for party booking advertisement (CZ_PARTY_RECRUIT_REQ_SEARCH).
 /// 08e7 <level>.W <map id>.W <last index>.L <result count>.W
 void clif_parse_PartyRecruitSearchReq(int fd, struct map_session_data* sd)
 {
@@ -12533,7 +12533,7 @@ void clif_parse_PartyRecruitSearchReq(int fd, struct map_session_data* sd)
 #endif
 }
 
-/// Request to delete own party booking advertisment (CZ_PARTY_RECRUIT_REQ_DELETE).
+/// Request to delete own party booking advertisement (CZ_PARTY_RECRUIT_REQ_DELETE).
 /// 08e9
 void clif_parse_PartyRecruitDeleteReq(int fd, struct map_session_data* sd)
 {
@@ -12545,7 +12545,7 @@ void clif_parse_PartyRecruitDeleteReq(int fd, struct map_session_data* sd)
 #endif
 }
 
-/// Result of request to delete own party booking advertisment (ZC_PARTY_RECRUIT_ACK_DELETE).
+/// Result of request to delete own party booking advertisement (ZC_PARTY_RECRUIT_ACK_DELETE).
 /// 08ea <result>.W
 /// result:
 ///     0 = success
@@ -12566,7 +12566,7 @@ void clif_PartyRecruitDeleteAck(struct map_session_data* sd, int flag)
 #endif
 }
 
-/// Request to update party booking advertisment (CZ_PARTY_RECRUIT_REQ_UPDATE).
+/// Request to update party booking advertisement (CZ_PARTY_RECRUIT_REQ_UPDATE).
 /// 08eb <notice>.37B
 void clif_parse_PartyRecruitUpdateReq(int fd, struct map_session_data *sd)
 {
@@ -12581,7 +12581,7 @@ void clif_parse_PartyRecruitUpdateReq(int fd, struct map_session_data *sd)
 #endif
 }
 
-/// Notification about new party booking advertisment (ZC_PARTY_RECRUIT_NOTIFY_INSERT).
+/// Notification about new party booking advertisement (ZC_PARTY_RECRUIT_NOTIFY_INSERT).
 /// 08ec <index>.L <expire time>.L <char name>.24B <level>.W <notice>.37B
 void clif_PartyRecruitInsertNotify(struct map_session_data* sd, struct party_booking_ad_info* pb_ad)
 {
@@ -12603,7 +12603,7 @@ void clif_PartyRecruitInsertNotify(struct map_session_data* sd, struct party_boo
 #endif
 }
 
-/// Notification about updated party booking advertisment (ZC_PARTY_RECRUIT_NOTIFY_UPDATE).
+/// Notification about updated party booking advertisement (ZC_PARTY_RECRUIT_NOTIFY_UPDATE).
 /// 08ed <index>.L <notice>.37B
 void clif_PartyRecruitUpdateNotify(struct map_session_data *sd, struct party_booking_ad_info* pb_ad)
 {
@@ -12620,7 +12620,7 @@ void clif_PartyRecruitUpdateNotify(struct map_session_data *sd, struct party_boo
 #endif
 }
 
-/// Notification about deleted party booking advertisment (ZC_PARTY_RECRUIT_NOTIFY_DELETE).
+/// Notification about deleted party booking advertisement (ZC_PARTY_RECRUIT_NOTIFY_DELETE).
 /// 08ee <index>.L
 void clif_PartyRecruitDeleteNotify(struct map_session_data* sd, int index)
 {
@@ -13172,7 +13172,7 @@ void clif_parse_GuildChangeNotice(int fd, struct map_session_data* sd)
 	if(!sd->state.gmaster_flag)
 		return;
 
-	// compensate for some client defects when using multilanguage mode
+	// compensate for some client defects when using multilingual mode
 	if (msg1[0] == '|' && msg1[3] == '|') msg1+= 3; // skip duplicate marker
 	if (msg2[0] == '|' && msg2[3] == '|') msg2+= 3; // skip duplicate marker
 	if (msg2[0] == '|') msg2[strnlen(msg2, MAX_GUILDMES2)-1] = '\0'; // delete extra space at the end of string
@@ -13612,7 +13612,7 @@ void clif_parse_GMRecall2(int fd, struct map_session_data* sd) {
 /// Request to execute GM commands.
 /// usage:
 /// /item n - summon n monster or acquire n item/s
-/// /item money - grants 2147483647 zenies
+/// /item money - grants 2147483647 Zeny
 /// /item whereisboss - locate boss mob in current map.(not yet implemented)
 /// /item regenboss_n t - regenerate n boss monster by t millisecond.(not yet implemented)
 /// /item onekillmonster - toggle an ability to kill mobs in one hit.(not yet implemented)
@@ -13993,7 +13993,7 @@ void clif_friendslist_toggle(struct map_session_data *sd,int account_id, int cha
 }
 
 
-//Subfunction called from clif_foreachclient to toggle friends on/off [Skotlex]
+//Sub-function called from clif_foreachclient to toggle friends on/off [Skotlex]
 int clif_friendslist_toggle_sub(struct map_session_data *sd,va_list ap)
 {
 	int account_id, char_id, online;
@@ -14342,7 +14342,7 @@ void clif_parse_ranklist(int fd, struct map_session_data *sd) {
 		case RANKTYPE_BLACKSMITH:
 		case RANKTYPE_ALCHEMIST:
 		case RANKTYPE_TAEKWON:
-			clif->ranklist(sd, type); // pk_list unsuported atm
+			clif->ranklist(sd, type); // pk_list unsupported atm
 			break;
 	}
 }
@@ -14672,7 +14672,7 @@ void clif_check(int fd, struct map_session_data* pl_sd) {
 	WFIFOW(fd,34) = pl_sd->battle_status.flee2/10;
 	WFIFOW(fd,36) = pl_sd->battle_status.cri/10;
 	WFIFOW(fd,38) = (2000-pl_sd->battle_status.amotion)/10;  // aspd
-	WFIFOW(fd,40) = 0;  // FIXME: What is 'plusASPD' supposed to be? Maybe adelay?
+	WFIFOW(fd,40) = 0;  // FIXME: What is 'plusASPD' supposed to be? Maybe a delay?
 	WFIFOSET(fd,packet_len(0x214));
 }
 
@@ -14737,7 +14737,7 @@ void clif_Mail_getattachment(int fd, uint8 flag)
 /// 0249 <result>.B
 /// result:
 ///     0 = success
-///     1 = recipinent does not exist
+///     1 = recipient does not exist
 void clif_Mail_send(int fd, bool fail)
 {
 	WFIFOHEAD(fd,packet_len(0x249));
@@ -16068,7 +16068,7 @@ void clif_mercenary_info(struct map_session_data *sd) {
 
 
 /// Mercenary skill tree (ZC_MER_SKILLINFO_LIST).
-/// 029d <packet len>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <skill name>.24B <upgradable>.B }*
+/// 029d <packet len>.W { <skill id>.W <type>.L <level>.W <sp cost>.W <attack range>.W <skill name>.24B <upgradeable>.B }*
 void clif_mercenary_skillblock(struct map_session_data *sd)
 {
 	struct mercenary_data *md;
@@ -17142,7 +17142,7 @@ void clif_parse_debug(int fd,struct map_session_data *sd) {
 }
 /*==========================================
  * Server tells client to display a window similar to Magnifier (item) one
- * Server populates the window with avilable elemental converter options according to player's inventory
+ * Server populates the window with available elemental converter options according to player's inventory
  *------------------------------------------*/
 int clif_elementalconverter_list(struct map_session_data *sd) {
 	int i,c,view,fd;
@@ -17587,7 +17587,7 @@ void clif_parse_CashShopSchedule(int fd, struct map_session_data *sd) {
 }
 void clif_parse_CashShopBuy(int fd, struct map_session_data *sd) {
 	unsigned short limit = RFIFOW(fd, 4), i, j;
-	unsigned int kafra_pay = RFIFOL(fd, 6);// [Ryuuzaki] - These are free cash points (strangely #CASH = main cash curreny for us, confusing)
+	unsigned int kafra_pay = RFIFOL(fd, 6);// [Ryuuzaki] - These are free cash points (strangely #CASH = main cash currently for us, confusing)
 
 	if( map->list[sd->bl.m].flag.nocashshop ) {
 		clif->colormes(fd,COLOR_RED,msg_txt(1489)); //Cash Shop is disabled in this map
diff --git a/src/map/clif.h b/src/map/clif.h
index 7b27e1fe6..e1af44881 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -66,7 +66,7 @@ typedef enum send_target {
 	AREA,               // area
 	AREA_WOS,           // area, without self
 	AREA_WOC,           // area, without chatrooms
-	AREA_WOSC,          // area, without own chatroom
+	AREA_WOSC,          // area, without own chatrooms
 	AREA_CHAT_WOC,      // hearable area, without chatrooms
 	CHAT,               // current chatroom
 	CHAT_WOS,           // current chatroom, without self
diff --git a/src/map/elemental.c b/src/map/elemental.c
index b414d5b9f..7ffeea410 100644
--- a/src/map/elemental.c
+++ b/src/map/elemental.c
@@ -505,7 +505,7 @@ int elemental_change_mode_ack(struct elemental_data *ed, int mode) {
 	else
 		unit->skilluse_id(&ed->bl,bl->id,skill_id,skill_lv);
 
-	ed->target_id = 0;	// Reset target after casting the skill  to avoid continious attack.
+	ed->target_id = 0;	// Reset target after casting the skill  to avoid continuous attack.
 
 	return 1;
 }
@@ -529,7 +529,7 @@ int elemental_change_mode(struct elemental_data *ed, int mode) {
 	else if( mode == EL_MODE_ASSIST ) mode = EL_SKILLMODE_ASSIST;		// Assist spirit mode -> Assist spirit skill.
 	else mode = EL_SKILLMODE_PASIVE;									// Passive spirit mode -> Passive spirit skill.
 
-	// Use a skill inmediately after every change mode.
+	// Use a skill immediately after every change mode.
 	if( mode != EL_SKILLMODE_AGGRESSIVE )
 		elemental->change_mode_ack(ed,mode);
 	return 1;
diff --git a/src/map/guild.c b/src/map/guild.c
index 4bf9c9da0..209f29103 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -61,7 +61,7 @@ int guild_skill_get_max (int id) {
 	return guild->skill_tree[id-GD_SKILLBASE].max;
 }
 
-// Retrive skill_lv learned by guild
+// Retrieve skill_lv learned by guild
 int guild_checkskill(struct guild *g, int id) {
     int idx = id - GD_SKILLBASE;
     if (idx < 0 || idx >= MAX_GUILDSKILL)
@@ -764,7 +764,7 @@ int guild_member_added(int guild_id,int account_id,int char_id,int flag) {
 		return 0;
 
 	if(sd==NULL || sd->guild_invite==0){
-		// cancel if player not present or invalide guild_id invitation
+		// cancel if player not present or invalid guild_id invitation
 		if (flag == 0) {
 			ShowError("guild: member added error %d is not online\n",account_id);
 			intif->guild_leave(guild_id,account_id,char_id,0,"** Data Error **");
@@ -882,7 +882,7 @@ int guild_member_withdraw(int guild_id, int account_id, int char_id, int flag, c
 
 	online_member_sd = guild->getavailablesd(g);
 	if(online_member_sd == NULL)
-		return 0; // noone online to inform
+		return 0; // no one online to inform
 		
 #ifdef GP_BOUND_ITEMS
 	//Guild bound item check
@@ -2373,7 +2373,7 @@ void guild_defaults(void) {
 	guild->agit_end = guild_agit_end;
 	guild->agit2_start = guild_agit2_start;
 	guild->agit2_end = guild_agit2_end;
-	/* guild flag cachin */
+	/* guild flag caching */
 	guild->flag_add = guild_flag_add;
 	guild->flag_remove = guild_flag_remove;
 	guild->flags_clear = guild_flags_clear;
diff --git a/src/map/homunculus.c b/src/map/homunculus.c
index b6a83d1cb..8c47226db 100644
--- a/src/map/homunculus.c
+++ b/src/map/homunculus.c
@@ -809,7 +809,7 @@ bool homunculus_call(struct map_session_data *sd) {
 	return true;
 }
 
-// Recv homunculus data from char server
+// Receive homunculus data from char server
 bool homunculus_recv_data(int account_id, struct s_homunculus *sh, int flag) {
 	struct map_session_data *sd;
 	struct homun_data *hd;
@@ -1157,7 +1157,7 @@ bool homunculus_read_skill_db_sub(char* split[], int columns, int current) {
 	classid = atoi(split[0]) - HM_CLASS_BASE;
 	
 	if ( classid >= MAX_HOMUNCULUS_CLASS ) {
-		ShowWarning("homunculus_read_skill_db_sub: Invalud homunculus class %d.\n", atoi(split[0]));
+		ShowWarning("homunculus_read_skill_db_sub: Invalid homunculus class %d.\n", atoi(split[0]));
 		return false;
 	}
 
diff --git a/src/map/intif.c b/src/map/intif.c
index 042896f4f..4dd0fa448 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -238,7 +238,7 @@ int intif_wis_replay(int id, int flag)
 	WFIFOHEAD(inter_fd,7);
 	WFIFOW(inter_fd,0) = 0x3002;
 	WFIFOL(inter_fd,2) = id;
-	WFIFOB(inter_fd,6) = flag; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+	WFIFOB(inter_fd,6) = flag; // flag: 0: success to send whisper, 1: target character is not logged in?, 2: ignored by target
 	WFIFOSET(inter_fd,7);
 
 	if (battle_config.etc_log)
@@ -387,7 +387,7 @@ int intif_request_registry(struct map_session_data *sd, int flag)
 {
 	nullpo_ret(sd);
 
-	/* if char server aint online it doesn't load, shouldn't we kill the session then? */
+	/* if char server ain't online it doesn't load, shouldn't we kill the session then? */
 	if (intif->CheckForCharServer())
 		return 0;
 
@@ -931,7 +931,7 @@ void intif_parse_WisMessage(int fd) {
 	}
 	//Success to send whisper.
 	clif->wis_message(sd->fd, wisp_source, (char*)RFIFOP(fd,56),RFIFOW(fd,2)-56);
-	intif_wis_replay(id,0);   // succes
+	intif_wis_replay(id,0);   // success
 }
 
 // Wisp/page transmission result reception
@@ -939,7 +939,7 @@ void intif_parse_WisEnd(int fd) {
 	struct map_session_data* sd;
 
 	if (battle_config.etc_log)
-		ShowInfo("intif_parse_wisend: player: %s, flag: %d\n", RFIFOP(fd,2), RFIFOB(fd,26)); // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
+		ShowInfo("intif_parse_wisend: player: %s, flag: %d\n", RFIFOP(fd,2), RFIFOB(fd,26)); // flag: 0: success to send whisper, 1: target character is not logged in?, 2: ignored by target
 	sd = (struct map_session_data *)map->nick2sd((char *) RFIFOP(fd,2));
 	if (sd != NULL)
 		clif->wis_end(sd->fd, RFIFOB(fd,26));
@@ -1366,7 +1366,7 @@ void intif_parse_DeletePetOk(int fd) {
 		ShowError("pet data delete failure\n");
 }
 
-// ACK changing name resquest, players,pets,hommon
+// ACK changing name request, players,pets,homun
 void intif_parse_ChangeNameOk(int fd)
 {
 	struct map_session_data *sd = NULL;
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 9bc352276..320c64402 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -1123,7 +1123,7 @@ void itemdb_read_packages(void) {
 		
 		for( r = 0; r < itemdb->packages[count].random_qty; r++  ) {
 			if( itemdb->packages[count].random_groups[r].random_qty == 1 ) {
-				//item packages dont stop looping until something comes out of them, so if you have only one item in it the drop is guaranteed.
+				//item packages don't stop looping until something comes out of them, so if you have only one item in it the drop is guaranteed.
 				ShowWarning("itemdb_read_packages: in '%s' 'Random: %d' group has only 1 random option, drop rate will be 100%!\n",itemdb_name(itemdb->packages[count].id),r+1);
 				itemdb->packages[count].random_groups[r].random_list[0].rate = 10000;
 			}
diff --git a/src/map/map.c b/src/map/map.c
index e37e902f6..a89478cb1 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -254,7 +254,7 @@ int map_delblock(struct block_list* bl)
 	// blocklist (2ways chainlist)
 	if (bl->prev == NULL) {
 		if (bl->next != NULL) {
-			// can't delete block (already at the begining of the chain)
+			// can't delete block (already at the beginning of the chain)
 			ShowError("map_delblock error : bl->next!=NULL\n");
 		}
 		return 0;
@@ -468,7 +468,7 @@ static int bl_vforeach(int (*func)(struct block_list*, va_list), int blockcount,
 
 	map->freeblock_lock();
 	for (i = blockcount; i < map->bl_list_count && returnCount < max; i++) {
-		if (map->bl_list[i]->prev) { //func() may delete this bl_list[] slot, checking for prev ensures it wasnt queued for deletion.
+		if (map->bl_list[i]->prev) { //func() may delete this bl_list[] slot, checking for prev ensures it wasn't queued for deletion.
 			va_list argscopy;
 			va_copy(argscopy, args);
 			returnCount += func(map->bl_list[i], argscopy);
@@ -2037,7 +2037,7 @@ void map_foreachnpc(int (*func)(struct npc_data* nd, va_list args), ...) {
 }
 
 /// Applies func to everything in the db.
-/// Stops iteratin gif func returns -1.
+/// Stops iterating gif func returns -1.
 void map_vforeachregen(int (*func)(struct block_list* bl, va_list args), va_list args) {
 	DBIterator* iter;
 	struct block_list* bl;
@@ -2057,7 +2057,7 @@ void map_vforeachregen(int (*func)(struct block_list* bl, va_list args), va_list
 }
 
 /// Applies func to everything in the db.
-/// Stops iteratin gif func returns -1.
+/// Stops iterating gif func returns -1.
 /// @see map_vforeachregen
 void map_foreachregen(int (*func)(struct block_list* bl, va_list args), ...) {
 	va_list args;
@@ -4402,7 +4402,7 @@ bool map_zone_mf_cache(int m, char *flag, char *params) {
 		}
 
 		if( modifier[0] == '\0' || !( skill_id = skill->name2id(skill_name) ) || !skill->get_unit_id( skill->name2id(skill_name), 0) || atoi(modifier) < 1 || atoi(modifier) > USHRT_MAX ) {
-			;/* we dont mind it, the server will take care of it next. */
+			;/* we don't mind it, the server will take care of it next. */
 		} else {
 			int idx = map->list[m].unit_count;
 
@@ -4435,7 +4435,7 @@ bool map_zone_mf_cache(int m, char *flag, char *params) {
 		}
 
 		if( modifier[0] == '\0' || !( skill_id = skill->name2id(skill_name) ) || atoi(modifier) < 1 || atoi(modifier) > USHRT_MAX ) {
-			;/* we dont mind it, the server will take care of it next. */
+			;/* we don't mind it, the server will take care of it next. */
 		} else {
 			int idx = map->list[m].skill_count;
 
@@ -4792,7 +4792,7 @@ void read_map_zone_db(void) {
 						--h;
 						continue;
 					}
-					if( !map->zone_bl_type(libconfig->setting_get_string_elem(skills,h),&subtype) )/* we dont remove it from the three due to inheritance */
+					if( !map->zone_bl_type(libconfig->setting_get_string_elem(skills,h),&subtype) )/* we don't remove it from the three due to inheritance */
 						--disabled_skills_count;
 				}
 				/* all ok, process */
@@ -4830,7 +4830,7 @@ void read_map_zone_db(void) {
 						--h;
 						continue;
 					}
-					if( !libconfig->setting_get_bool(item) )/* we dont remove it from the three due to inheritance */
+					if( !libconfig->setting_get_bool(item) )/* we don't remove it from the three due to inheritance */
 						--disabled_items_count;
 				}
 				/* all ok, process */
@@ -4875,7 +4875,7 @@ void read_map_zone_db(void) {
 						--h;
 						continue;
 					}
-					if( !libconfig->setting_get_int(command) )/* we dont remove it from the three due to inheritance */
+					if( !libconfig->setting_get_int(command) )/* we don't remove it from the three due to inheritance */
 						--disabled_commands_count;
 				}
 				/* all ok, process */
@@ -4911,7 +4911,7 @@ void read_map_zone_db(void) {
 						--h;
 						continue;
 					}
-					if( !map->zone_bl_type(libconfig->setting_get_string_elem(cap,1),&subtype) )/* we dont remove it from the three due to inheritance */
+					if( !map->zone_bl_type(libconfig->setting_get_string_elem(cap,1),&subtype) )/* we don't remove it from the three due to inheritance */
 						--capped_skills_count;
 				}
 				/* all ok, process */
@@ -5712,7 +5712,7 @@ int do_init(int argc, char *argv[])
 			char ip_str[16];
 			ip2str(sockt->addr_[0], ip_str);
 
-			ShowWarning("Not all IP addresses in /conf/map-server.conf configured, autodetecting...\n");
+			ShowWarning("Not all IP addresses in /conf/map-server.conf configured, auto-detecting...\n");
 
 			if (sockt->naddr_ == 0)
 				ShowError("Unable to determine your IP address...\n");
@@ -5736,7 +5736,7 @@ int do_init(int argc, char *argv[])
 
 	map->id_db     = idb_alloc(DB_OPT_BASE);
 	map->pc_db     = idb_alloc(DB_OPT_BASE); //Added for reliable map->id2sd() use. [Skotlex]
-	map->mobid_db  = idb_alloc(DB_OPT_BASE); //Added to lower the load of the lazy mob ai. [Skotlex]
+	map->mobid_db  = idb_alloc(DB_OPT_BASE); //Added to lower the load of the lazy mob AI. [Skotlex]
 	map->bossid_db = idb_alloc(DB_OPT_BASE); // Used for Convex Mirror quick MVP search
 	map->map_db    = uidb_alloc(DB_OPT_BASE);
 	map->nick_db   = idb_alloc(DB_OPT_BASE);
@@ -5795,7 +5795,7 @@ int do_init(int argc, char *argv[])
 	itemdb->init(minimal);
 	skill->init(minimal);
 	if (!minimal)
-		map->read_zone_db();/* read after item and skill initalization */
+		map->read_zone_db();/* read after item and skill initialization */
 	mob->init(minimal);
 	pc->init(minimal);
 	status->init(minimal);
diff --git a/src/map/map.h b/src/map/map.h
index 3ce59a804..38167597a 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -324,7 +324,7 @@ struct spawn_data {
 	unsigned int level;
 	struct {
 		unsigned int size : 2; //Holds if mob has to be tiny/large
-		unsigned int ai : 4; //Special ai for summoned monsters.
+		unsigned int ai : 4; //Special AI for summoned monsters.
 		//0: Normal mob | 1: Standard summon, attacks mobs
 		//2: Alchemist Marine Sphere | 3: Alchemist Summon Flora | 4: Summon Zanzou
 		unsigned int dynamic : 1; //Whether this data is indexed by a map's dynamic mob list
@@ -659,8 +659,8 @@ struct map_data {
 	int nocommand; //Blocks @/# commands for non-gms. [Skotlex]
 	/**
 	* Ice wall reference counter for bugreport:3574
-	* - since there are a thounsand mobs out there in a lot of maps checking on,
-	* - every targetting for icewall on attack path would just be a waste, so,
+	* - since there are a thousand mobs out there in a lot of maps checking on,
+	* - every targeting for icewall on attack path would just be a waste, so,
 	* - this counter allows icewall checking be only run when there is a actual ice wall on the map
 	**/
 	int icewall_num;
@@ -732,7 +732,7 @@ struct map_data_other_server {
 /// Bitfield of flags for the iterator.
 enum e_mapitflags {
 	MAPIT_NORMAL = 0,
-	//	MAPIT_PCISPLAYING = 1,// Unneeded as pc_db/id_db will only hold auth'ed, active players.
+	//	MAPIT_PCISPLAYING = 1,// Unneeded as pc_db/id_db will only hold authed, active players.
 };
 
 struct s_mapiterator;
diff --git a/src/map/mob.c b/src/map/mob.c
index ef47d6b70..552724de0 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -356,7 +356,7 @@ bool mob_ksprotected(struct block_list *src, struct block_list *target) {
 		return false; // KS Protection Disabled
 
 	if( !(md = BL_CAST(BL_MOB,target)) )
-		return false; // Tarjet is not MOB
+		return false; // Target is not MOB
 
 	if( (s_bl = battle->get_master(src)) == NULL )
 		s_bl = src;
@@ -1073,7 +1073,7 @@ int mob_ai_sub_hard_activesearch(struct block_list *bl,va_list ap)
 		default:
 			if (battle_config.hom_setting&0x4 &&
 				(*target) && (*target)->type == BL_HOM && bl->type != BL_HOM)
-				return 0; //For some reason Homun targets are never overriden.
+				return 0; //For some reason Homun targets are never overridden.
 
 			dist = distance_bl(&md->bl, bl);
 			if(
@@ -1443,7 +1443,7 @@ bool mob_ai_sub_hard(struct mob_data *md, int64 tick) {
 			//Unlock current target.
 			if (mob->warpchase(md, tbl))
 				return true; //Chasing this target.
-			mob->unlocktarget(md, tick-(battle_config.mob_ai&0x8?3000:0)); //Imediately do random walk.
+			mob->unlocktarget(md, tick-(battle_config.mob_ai&0x8?3000:0)); //Immediately do random walk.
 			tbl = NULL;
 		}
 	}
@@ -2084,7 +2084,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 		unsigned int base_exp,job_exp;
 	} pt[DAMAGELOG_SIZE];
 	int i, temp, count, m = md->bl.m, pnum = 0;
-	int dmgbltypes = 0;  // bitfield of all bl types, that caused damage to the mob and are elligible for exp distribution
+	int dmgbltypes = 0;  // bitfield of all bl types, that caused damage to the mob and are eligible for exp distribution
 	unsigned int mvp_damage;
 	int64 tick = timer->gettick();
 	bool rebirth, homkillonly;
@@ -2302,7 +2302,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 		int drop_modifier = mvp_sd    ? pc->level_penalty_mod( md->level - mvp_sd->status.base_level, md->status.race, md->status.mode, 2)   :
 							second_sd ? pc->level_penalty_mod( md->level - second_sd->status.base_level, md->status.race, md->status.mode, 2):
 							third_sd  ? pc->level_penalty_mod( md->level - third_sd->status.base_level, md->status.race, md->status.mode, 2) :
-							100;/* no player was attached, we dont use any modifier (100 = rates are not touched) */
+							100;/* no player was attached, we don't use any modifier (100 = rates are not touched) */
 #endif
 		dlist->m = md->bl.m;
 		dlist->x = md->bl.x;
@@ -2613,7 +2613,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 	if( !rebirth ) {
 
 		if( pcdb_checkid(md->vd->class_) ) {//Player mobs are not removed automatically by the client.
-			/* first we set them dead, then we delay the outsight effect */
+			/* first we set them dead, then we delay the out sight effect */
 			clif->clearunit_area(&md->bl,CLR_DEAD);
 			clif->clearunit_delayed(&md->bl, CLR_OUTSIGHT,tick+3000);
 		} else
@@ -2842,7 +2842,7 @@ int mob_warpslave(struct block_list *bl, int range) {
 }
 
 /*==========================================
- *  Counts slave sub, curently checking if mob master is the given ID.
+ *  Counts slave sub, currently checking if mob master is the given ID.
  *------------------------------------------*/
 int mob_countslave_sub(struct block_list *bl,va_list ap)
 {
@@ -3231,7 +3231,7 @@ int mobskill_use(struct mob_data *md, int64 tick, int event) {
 				continue;
 			}
 		} else {
-			//Targetted skill
+			//Targeted skill
 			switch (skill_target) {
 				case MST_RANDOM: //Pick a random enemy within skill range.
 					bl = battle->get_enemy(&md->bl, DEFAULT_ENEMY_TYPE(md),
@@ -3335,7 +3335,7 @@ int mob_is_clone(int class_)
 }
 
 //Flag values:
-//&1: Set special ai (fight mobs, not players)
+//&1: Set special AI (fight mobs, not players)
 //If mode is not passed, a default aggressive mode is used.
 //If master_id is passed, clone is attached to him.
 //Returns: ID of newly crafted copy.
@@ -3621,7 +3621,7 @@ unsigned int mob_drop_adjust(int baserate, int rate_adjust, unsigned short rate_
 }
 
 /**
- * Check if global item drop rate is overriden for given item
+ * Check if global item drop rate is overridden for given item
  * in db/mob_item_ratio.txt
  * @param nameid ID of the item
  * @param mob_id ID of the monster
@@ -3773,7 +3773,7 @@ bool mob_parse_dbrow(char** str) {
 	status->calc_misc(&data.bl, mstatus, db->lv);
 
 	// MVP EXP Bonus: MEXP
-	// Some new MVP's MEXP multipled by high exp-rate cause overflow. [LuzZza]
+	// Some new MVP's MEXP multiple by high exp-rate cause overflow. [LuzZza]
 	exp = (double)atoi(str[30]) * (double)battle_config.mvp_exp_rate / 100.;
 	db->mexp = (unsigned int)cap_value(exp, 0, UINT_MAX);
 
@@ -3835,7 +3835,7 @@ bool mob_parse_dbrow(char** str) {
 			ratemax = battle_config.item_drop_treasure_max;
 		}
 		else switch (type)
-		{ // Added suport to restrict normal drops of MVP's [Reddozen]
+		{ // Added support to restrict normal drops of MVP's [Reddozen]
 		case IT_HEALING:
 			rate_adjust = (mstatus->mode&MD_BOSS) ? battle_config.item_rate_heal_boss : battle_config.item_rate_heal;
 			ratemin = battle_config.item_drop_heal_min;
diff --git a/src/map/mob.h b/src/map/mob.h
index d07f78c77..7e222fa74 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -13,7 +13,7 @@
 
 #define MAX_RANDOMMONSTER 5
 
-// Change this to increase the table size in your mob_db to accomodate a larger mob database.
+// Change this to increase the table size in your mob_db to accommodate a larger mob database.
 // Be sure to note that IDs 4001 to 4048 are reserved for advanced/baby/expanded classes.
 // Notice that the last 1000 entries are used for player clones, so always set this to desired value +1000
 #define MAX_MOB_DB 4000
@@ -35,7 +35,7 @@
 #define MOB_CLONE_START (MAX_MOB_DB-999)
 #define MOB_CLONE_END MAX_MOB_DB
 
-//Used to determine default enemy type of mobs (for use in eachinrange calls)
+//Used to determine default enemy type of mobs (for use in each in range calls)
 #define DEFAULT_ENEMY_TYPE(md) ((md)->special_state.ai?BL_CHAR:BL_MOB|BL_PC|BL_HOM|BL_MER)
 
 #define MAX_MOB_CHAT 250 //Max Skill's messages
@@ -127,7 +127,7 @@ struct mob_data {
 	char name[NAME_LENGTH];
 	struct {
 		unsigned int size : 2; //Small/Big monsters.
-		unsigned int ai : 4; //Special ai for summoned monsters.
+		unsigned int ai : 4; //Special AI for summoned monsters.
 							//0: Normal mob.
 							//1: Standard summon, attacks mobs.
 							//2: Alchemist Marine Sphere
diff --git a/src/map/npc.c b/src/map/npc.c
index 0817313e2..81615022a 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -666,7 +666,7 @@ void npc_timerevent_quit(struct map_session_data* sd)
 	struct npc_data* nd;
 	struct timer_event_data *ted;
 
-	// Check timer existance
+	// Check timer existence
 	if( sd->npc_timer_id == INVALID_TIMER )
 		return;
 	if( !(td = timer->get(sd->npc_timer_id)) )
@@ -1340,7 +1340,7 @@ int npc_cashshop_buylist(struct map_session_data *sd, int points, int count, uns
 			return ERROR_TYPE_ITEM_ID;
 
 		if( !itemdb->isstackable(nameid) && amount > 1 ) {
-			ShowWarning("Player %s (%d:%d) sent a hexed packet trying to buy %d of nonstackable item %d!\n",
+			ShowWarning("Player %s (%d:%d) sent a hexed packet trying to buy %d of non-stackable item %d!\n",
 						sd->status.name, sd->status.account_id, sd->status.char_id, amount, nameid);
 			amount = item_list[i*2+0] = 1;
 		}
@@ -1667,7 +1667,7 @@ int npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int po
 		return ERROR_TYPE_ITEM_ID;
 
 	if(!itemdb->isstackable(nameid) && amount > 1) {
-		ShowWarning("Player %s (%d:%d) sent a hexed packet trying to buy %d of nonstackable item %d!\n",
+		ShowWarning("Player %s (%d:%d) sent a hexed packet trying to buy %d of non-stackable item %d!\n",
 			sd->status.name, sd->status.account_id, sd->status.char_id, amount, nameid);
 		amount = 1;
 	}
@@ -1775,7 +1775,7 @@ int npc_buylist(struct map_session_data* sd, int n, unsigned short* item_list) {
 		
 		if( !itemdb->isstackable(nameid) && amount > 1 ) {
 			//Exploit? You can't buy more than 1 of equipment types o.O
-			ShowWarning("Player %s (%d:%d) sent a hexed packet trying to buy %d of nonstackable item %d!\n",
+			ShowWarning("Player %s (%d:%d) sent a hexed packet trying to buy %d of non-stackable item %d!\n",
 						sd->status.name, sd->status.account_id, sd->status.char_id, amount, nameid);
 			amount = item_list[i*2+0] = 1;
 		}
@@ -1898,7 +1898,7 @@ int npc_market_buylist(struct map_session_data* sd, unsigned short list_size, st
 		
 		if( !itemdb->isstackable(nameid) && amount > 1 ) {
 			//Exploit? You can't buy more than 1 of equipment types o.O
-			ShowWarning("Player %s (%d:%d) sent a hexed packet trying to buy %d of nonstackable item %d!\n",
+			ShowWarning("Player %s (%d:%d) sent a hexed packet trying to buy %d of non-stackable item %d!\n",
 						sd->status.name, sd->status.account_id, sd->status.char_id, amount, nameid);
 			amount = p->list[i].qty = 1;
 		}
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index 2182e1da2..8bc246819 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -80,7 +80,7 @@ struct pcre_interface libpcre_s;
 
 
 /**
- * delete everythign associated with a entry
+ * delete everything associated with a entry
  *
  * This does NOT do the list management
  */
@@ -245,7 +245,7 @@ void delete_pcreset(struct npc_data* nd, int setid)
 	while (pcreset->head) {
 		struct pcrematch_entry* n = pcreset->head->next;
 		npc_chat->finalize_pcrematch_entry(pcreset->head);
-		aFree(pcreset->head); // Cleanin' the last ones.. [Lance]
+		aFree(pcreset->head); // Cleaning the last ones.. [Lance]
 		pcreset->head = n;
 	}
 	
@@ -301,7 +301,7 @@ void npc_chat_def_pattern(struct npc_data* nd, int setid, const char* pattern, c
  * Delete everything associated with a NPC concerning the pattern
  * matching code
  *
- * this could be more efficent but.. how often do you do this?
+ * this could be more efficient but.. how often do you do this?
  */
 void npc_chat_finalize(struct npc_data* nd)
 {
@@ -344,10 +344,10 @@ int npc_chat_sub(struct block_list* bl, va_list ap)
 	// iterate across all active sets
 	for (pcreset = npcParse->active; pcreset != NULL; pcreset = pcreset->next)
 	{
-		// interate across all patterns in that set
+		// n across all patterns in that set
 		for (e = pcreset->head; e != NULL; e = e->next)
 		{
-			int offsets[2*10 + 10]; // 1/3 reserved for temp space requred by pcre_exec
+			int offsets[2*10 + 10]; // 1/3 reserved for temp space required by pcre_exec
 			
 			// perform pattern match
 			int r = libpcre->exec(e->pcre_, e->pcre_extra_, msg, len, 0, 0, offsets, ARRAYLENGTH(offsets));
@@ -380,7 +380,7 @@ int npc_chat_sub(struct block_list* bl, va_list ap)
 	return 0;
 }
 
-// Various script builtins used to support these functions
+// Various script built-ins used to support these functions
 BUILDIN(defpattern) {
 	int setid = script_getnum(st,2);
 	const char* pattern = script_getstr(st,3);
diff --git a/src/map/party.c b/src/map/party.c
index 678b2cd54..7cf340edb 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -213,7 +213,7 @@ void party_check_state(struct party_data *p) {
 	int i;
 	memset(&p->state, 0, sizeof(p->state));
 	for (i = 0; i < MAX_PARTY; i ++) {
-		if (!p->party.member[i].online) continue; //Those not online shouldn't aport to skill usage and all that.
+		if (!p->party.member[i].online) continue; //Those not online shouldn't apart to skill usage and all that.
 		switch (p->party.member[i].class_) {
 			case JOB_MONK:
 			case JOB_BABY_MONK:
@@ -1132,7 +1132,7 @@ int party_sub_count_chorus(struct block_list *bl, va_list ap) {
  * @param func  Function to execute
  * @param sd    Reference character for party, map, area center
  * @param range Area size (0 = whole map)
- * @param ...   Adidtional parameters to pass to func()
+ * @param ...   Additional parameters to pass to func()
  * @return Sum of the return values from func()
  */
 int party_foreachsamemap(int (*func)(struct block_list*,va_list), struct map_session_data *sd, int range, ...) {
diff --git a/src/map/script.c b/src/map/script.c
index 95cf48a16..6ccbf8eaa 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2765,7 +2765,7 @@ void script_array_add_member(struct script_array *sa, unsigned int idx) {
 }
 /**
  * Obtains the source of the array database for this type and scenario
- * Initializes such database when not yet initialised.
+ * Initializes such database when not yet initialized.
  **/
 struct reg_db *script_array_src(struct script_state *st, struct map_session_data *sd, const char *name, struct reg_db *ref) {
 	struct reg_db *src = NULL;
diff --git a/src/map/skill.c b/src/map/skill.c
index 383720361..cb0f4786f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -852,7 +852,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
 		#ifdef RENEWAL
 			sc_start(src,bl,SC_FREEZE,65-(5*skill_lv),skill_lv,skill->get_time2(skill_id,skill_lv));
 		#else
-			 //Tharis pointed out that this is normal freeze chance with a base of 300%
+			 // [Tharis] pointed out that this is normal freeze chance with a base of 300%
 			if(tsc->sg_counter >= 3 &&
 				sc_start(src,bl,SC_FREEZE,300,skill_lv,skill->get_time2(skill_id,skill_lv)))
 				tsc->sg_counter = 0;
@@ -993,7 +993,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
 			break;
 		case NPC_MENTALBREAKER:
 		{
-			//Based on observations by Tharis, Mental Breaker should do SP damage
+			//Based on observations by [Tharis], Mental Breaker should do SP damage
 	  		//equal to Matk*skLevel.
 			rate = status->get_matk(src, 2);
 			rate*=skill_lv;
@@ -1032,7 +1032,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
 				sc_start(src,bl,SC_BLIND,100,skill_lv,skill->get_time2(skill_id,skill_lv));
 			break;
 
-		case LK_HEADCRUSH: //Headcrush has chance of causing Bleeding status, except on demon and undead element
+		case LK_HEADCRUSH: // Headcrush has chance of causing Bleeding status, except on demon and undead element
 			if (!(battle->check_undead(tstatus->race, tstatus->def_ele) || tstatus->race == RC_DEMON))
 				sc_start2(src, bl, SC_BLOODING,50, skill_lv, src->id, skill->get_time2(skill_id,skill_lv));
 			break;
@@ -1296,11 +1296,11 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
 						sc_start(src, bl, SC_BLOODING, 100, skill_lv, 10000);
 						break;
 					case ITEMID_MELON_BOMB:
-						sc_start(src, bl, SC_MELON_BOMB, 100, skill_lv, 60000); // Reduces ASPD and moviment speed
+						sc_start(src, bl, SC_MELON_BOMB, 100, skill_lv, 60000); // Reduces ASPD and movement speed
 						break;
 					case ITEMID_BANANA_BOMB:
 						sc_start(src, bl, SC_BANANA_BOMB, 100, skill_lv, 60000); // Reduces LUK? Needed confirm it, may be it's bugged in kRORE?
-						sc_start(src, bl, SC_BANANA_BOMB_SITDOWN_POSTDELAY, (sd? sd->status.job_level:0) + sstatus->dex / 6 + tstatus->agi / 4 - tstatus->luk / 5 - status->get_lv(bl) + status->get_lv(src), skill_lv, 1000); // Sitdown for 3 seconds.
+						sc_start(src, bl, SC_BANANA_BOMB_SITDOWN_POSTDELAY, (sd? sd->status.job_level:0) + sstatus->dex / 6 + tstatus->agi / 4 - tstatus->luk / 5 - status->get_lv(bl) + status->get_lv(src), skill_lv, 1000); // Sit down for 3 seconds.
 						break;
 				}
 				sd->itemid = -1;
@@ -1657,7 +1657,7 @@ int skill_onskillusage(struct map_session_data *sd, struct block_list *bl, uint1
 
 	return 1;
 }
-/* Splitted off from skill->additional_effect, which is never called when the
+/* Split off from skill->additional_effect, which is never called when the
  * attack skill kills the enemy. Place in this function counter status effects
  * when using skills (eg: Asura's sp regen penalty, or counter-status effects
  * from cards) that will take effect on the source, not the target. [Skotlex]
@@ -1673,7 +1673,7 @@ int skill_counter_additional_effect(struct block_list* src, struct block_list *b
 	nullpo_ret(src);
 	nullpo_ret(bl);
 
-	if(skill_id > 0 && !skill_lv) return 0;	// don't forget auto attacks! - celest
+	if(skill_id > 0 && !skill_lv) return 0;	// don't forget auto attacks! [celest]
 
 	sd = BL_CAST(BL_PC, src);
 	dstsd = BL_CAST(BL_PC, bl);
@@ -1712,7 +1712,7 @@ int skill_counter_additional_effect(struct block_list* src, struct block_list *b
 		case GS_FULLBUSTER:
 			sc_start(src,src,SC_BLIND,2*skill_lv,skill_lv,skill->get_time2(skill_id,skill_lv));
 			break;
-		case HFLI_SBR44:	//[orn]
+		case HFLI_SBR44:	// [orn]
 		case HVAN_EXPLOSION:
 			if(src->type == BL_HOM){
 				TBL_HOM *hd = (TBL_HOM*)src;
@@ -1728,15 +1728,15 @@ int skill_counter_additional_effect(struct block_list* src, struct block_list *b
 	}
 
 	if( sd && (sd->class_&MAPID_UPPERMASK) == MAPID_STAR_GLADIATOR
-	 && rnd()%10000 < battle_config.sg_miracle_skill_ratio) //SG_MIRACLE [Komurka]
+	 && rnd()%10000 < battle_config.sg_miracle_skill_ratio) // SG_MIRACLE [Komurka]
 		sc_start(src,src,SC_MIRACLE,100,1,battle_config.sg_miracle_skill_duration);
 
 	if( sd && skill_id && attack_type&BF_MAGIC && status->isdead(bl)
 	 && !(skill->get_inf(skill_id)&(INF_GROUND_SKILL|INF_SELF_SKILL))
 	 && (rate=pc->checkskill(sd,HW_SOULDRAIN)) > 0
 	) {
-		//Soul Drain should only work on targetted spells [Skotlex]
-		if( pc_issit(sd) ) pc->setstand(sd); //Character stuck in attacking animation while 'sitting' fix. [Skotlex]
+		// Soul Drain should only work on targeted spells [Skotlex]
+		if( pc_issit(sd) ) pc->setstand(sd); // Character stuck in attacking animation while 'sitting' fix. [Skotlex]
 		if( skill->get_nk(skill_id)&NK_SPLASH && skill->area_temp[1] != bl->id )
 			;
 		else {
@@ -1756,7 +1756,7 @@ int skill_counter_additional_effect(struct block_list* src, struct block_list *b
 		if( attack_type&BF_MAGIC ) {
 			sp += sd->bonus.magic_sp_gain_value;
 			hp += sd->bonus.magic_hp_gain_value;
-			if( skill_id == WZ_WATERBALL ) {//(bugreport:5303)
+			if( skill_id == WZ_WATERBALL ) {// (bugreport:5303)
 				struct status_change *sc = NULL;
 				if( ( sc = status->get_sc(src) ) ) {
 					if( sc->data[SC_SOULLINK]
@@ -1851,7 +1851,7 @@ int skill_counter_additional_effect(struct block_list* src, struct block_list *b
 					break;
 			}
 			dstsd->state.autocast = 0;
-			//Set canact delay. [Skotlex]
+			// Set canact delay. [Skotlex]
 			ud = unit->bl2ud(bl);
 			if (ud) {
 				rate = skill->delay_fix(bl, auto_skill_id, auto_skill_lv);
@@ -1989,7 +1989,7 @@ int skill_strip_equip(struct block_list *bl, unsigned short where, int rate, int
 		return 0;
 
 	sc = status->get_sc(bl);
-	if (!sc || sc->option&OPTION_MADOGEAR ) //Mado Gear cannot be divested [Ind]
+	if (!sc || sc->option&OPTION_MADOGEAR ) // Mado Gear cannot be divested [Ind]
 		return 0;
 
 	for (i = 0; i < ARRAYLENGTH(pos); i++) {
@@ -2018,16 +2018,16 @@ int skill_blown(struct block_list* src, struct block_list* target, int count, in
 	nullpo_ret(src);
 
 	if (src != target && map->list[src->m].flag.noknockback)
-		return 0; //No knocking
+		return 0; // No knocking
 	if (count == 0)
-		return 0; //Actual knockback distance is 0.
+		return 0; // Actual knockback distance is 0.
 
 	switch (target->type) {
 		case BL_MOB: {
 				struct mob_data* md = BL_CAST(BL_MOB, target);
 				if( md->class_ == MOBID_EMPERIUM )
 					return 0;
-				if(src != target && is_boss(target)) //Bosses can't be knocked-back
+				if(src != target && is_boss(target)) // Bosses can't be knocked-back
 					return 0;
 			}
 			break;
@@ -2059,11 +2059,13 @@ int skill_blown(struct block_list* src, struct block_list* target, int count, in
 }
 
 
-// Checks if 'bl' should reflect back a spell cast by 'src'.
-// type is the type of magic attack: 0: indirect (aoe), 1: direct (targetted)
-// In case of success returns type of reflection, otherwise 0
-//		1 - Regular reflection (Maya)
-//		2 - SL_KAITE reflection
+/*
+	Checks if 'bl' should reflect back a spell cast by 'src'.
+	type is the type of magic attack: 0: indirect (aoe), 1: direct (targeted)
+	In case of success returns type of reflection, otherwise 0
+		1 - Regular reflection (Maya)
+		2 - SL_KAITE reflection
+*/
 int skill_magic_reflect(struct block_list* src, struct block_list* bl, int type) {
 	struct status_change *sc = status->get_sc(bl);
 	struct map_session_data* sd = BL_CAST(BL_PC, bl);
@@ -2122,8 +2124,8 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 
 	if(skill_id > 0 && !skill_lv) return 0;
 
-	nullpo_ret(src);	//Source is the master behind the attack (player/mob/pet)
-	nullpo_ret(dsrc); //dsrc is the actual originator of the damage, can be the same as src, or a skill casted by src.
+	nullpo_ret(src);	// Source is the master behind the attack (player/mob/pet)
+	nullpo_ret(dsrc); // dsrc is the actual originator of the damage, can be the same as src, or a skill casted by src.
 	nullpo_ret(bl); //Target to be attacked.
 
 	if (src != dsrc) {
@@ -2131,7 +2133,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 		if (!status->check_skilluse(battle_config.skill_caster_check?src:NULL, bl, skill_id, 2))
 			return 0;
 	} else if ((flag&SD_ANIMATION) && skill->get_nk(skill_id)&NK_SPLASH) {
-		//Note that splash attacks often only check versus the targetted mob, those around the splash area normally don't get checked for being hidden/cloaked/etc. [Skotlex]
+		//Note that splash attacks often only check versus the targeted mob, those around the splash area normally don't get checked for being hidden/cloaked/etc. [Skotlex]
 		if (!status->check_skilluse(src, bl, skill_id, 2))
 			return 0;
 	}
@@ -2185,7 +2187,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 				sc = NULL; //Don't need it.
 			/* bugreport:2564 flag&2 disables double casting trigger */
 			flag |= 2;
-			/* bugreport:7859 magical reflect'd zeroes blewcount */
+			/* bugreport:7859 magical reflected zeroes blow count */
 			dmg.blewcount = 0;
 			//Spirit of Wizard blocks Kaite's reflection
 			if( type == 2 && sc && sc->data[SC_SOULLINK] && sc->data[SC_SOULLINK]->val2 == SL_WIZARD )
@@ -2207,11 +2209,11 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 		#if MAGIC_REFLECTION_TYPE
 
 		#ifdef RENEWAL
-			if( dmg.dmg_lv != ATK_MISS ) //Wiz SL cancelled and consumed fragment
+			if( dmg.dmg_lv != ATK_MISS ) // Wiz SL canceled and consumed fragment
 		#else
 			// issue:6415 in pre-renewal Kaite reflected the entire damage received
-			// regardless of caster's equipament (Aegis 11.1)
-			if( dmg.dmg_lv != ATK_MISS && type == 1 ) //Wiz SL cancelled and consumed fragment
+			// regardless of caster's equipment (Aegis 11.1)
+			if( dmg.dmg_lv != ATK_MISS && type == 1 ) //Wiz SL canceled and consumed fragment
 		#endif
 			{
 				short s_ele = skill->get_ele(skill_id, skill_lv);
@@ -2503,7 +2505,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 	{	//Updated to not be able to copy skills if the blow will kill you. [Skotlex]
 		int copy_skill = skill_id, cidx = 0;
 		/**
-		 * Copy Referal: dummy skills should point to their source upon copying
+		 * Copy Referral: dummy skills should point to their source upon copying
 		 **/
 		switch( skill_id ) {
 			case AB_DUPLELIGHT_MELEE:
@@ -2740,7 +2742,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 				struct status_change *ssc = status->get_sc(src);
 				if( ssc && ssc->data[SC_POISONINGWEAPON] && rnd()%100 < 70 + 5*skill_lv ) {
 					short rate = 100;
-					if ( ssc->data[SC_POISONINGWEAPON]->val1 == 9 )//Oblivion Curse gives a 2nd success chance after the 1st one passes which is reduceable. [Rytech]
+					if ( ssc->data[SC_POISONINGWEAPON]->val1 == 9 )// Oblivion Curse gives a 2nd success chance after the 1st one passes which is reducible. [Rytech]
 						rate = 100 - tstatus->int_ * 4 / 5;
 					sc_start(src, bl,ssc->data[SC_POISONINGWEAPON]->val2,rate,ssc->data[SC_POISONINGWEAPON]->val1,skill->get_time2(GC_POISONINGWEAPON,1) - (tstatus->vit + tstatus->luk) / 2 * 1000);
 					status_change_end(src,SC_POISONINGWEAPON,-1);
@@ -2775,8 +2777,8 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
 }
 
 /*==========================================
- * sub fonction for recursive skill call.
- * Checking bl battle flag and display dammage
+ * sub function for recursive skill call.
+ * Checking bl battle flag and display damage
  * then call func with source,target,skill_id,skill_lv,tick,flag
  *------------------------------------------*/
 int skill_area_sub(struct block_list *bl, va_list ap) {
@@ -2967,7 +2969,7 @@ int skill_check_condition_mercenary(struct block_list *bl, int skill_id, int lv,
 	if( (idx = skill->get_index(skill_id)) == 0 )
 		return 0;
 
-	// Requeriments
+	// Requirements
 	for( i = 0; i < ARRAYLENGTH(itemid); i++ )
 	{
 		itemid[i] = skill->db[idx].itemid[i];
@@ -2989,7 +2991,7 @@ int skill_check_condition_mercenary(struct block_list *bl, int skill_id, int lv,
 	else
 		sp += (st->max_sp * (-sp_rate)) / 100;
 
-	if( bl->type == BL_HOM ) { // Intimacy Requeriments
+	if( bl->type == BL_HOM ) { // Intimacy Requirements
 		struct homun_data *hd = BL_CAST(BL_HOM, bl);
 		switch( skill_id ) {
 			case HFLI_SBR44:
@@ -3414,7 +3416,7 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1
 		return 1;
 
 	if (skill_id && skill->get_type(skill_id) == BF_MAGIC && status->isimmune(bl) == 100) {
-		//GTB makes all targetted magic display miss with a single bolt.
+		//GTB makes all targeted magic display miss with a single bolt.
 		sc_type sct = status->skill2sc(skill_id);
 		if(sct != SC_NONE)
 			status_change_end(bl, sct, INVALID_TIMER);
@@ -4054,7 +4056,7 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1
 				skill->attack(BF_MISC,src,src,bl,skill_id,skill_lv,tick,flag);
 			break;
 
-		// Celest
+		// [Celest]
 		case PF_SOULBURN:
 			if (rnd()%100 < (skill_lv < 5 ? 30 + skill_lv * 10 : 70)) {
 				clif->skill_nodamage(src,bl,skill_id,skill_lv,1);
@@ -4139,7 +4141,7 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1
 				if( unit->movepos(src, bl->x+x, bl->y+y, 1, 1) )
 				{
 					clif->slide(src,bl->x+x,bl->y+y);
-					clif->fixpos(src); // the official server send these two packts.
+					clif->fixpos(src); // the official server send these two packets.
 					skill->attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag);
 					if( rnd()%100 < 4 * skill_lv )
 						skill->castend_damage_id(src,bl,GC_CROSSIMPACT,skill_lv,tick,flag);
@@ -4562,7 +4564,7 @@ int skill_castend_damage_id(struct block_list* src, struct block_list *bl, uint1
 			}
 			break;
 
-		//recursive homon skill
+		// Recursive homun skill
 		case MH_MAGMA_FLOW:
 		case MH_HEILIGE_STANGE:
 			if(flag & 1)
@@ -4791,7 +4793,7 @@ int skill_castend_id(int tid, int64 tick, int id, intptr_t data) {
 			 && (sc = status->get_sc(target)) && sc->data[SC_FOGWALL]
 			 && rnd() % 100 < 75
 			) {
-				//Fogwall makes all offensive-type targetted skills fail at 75%
+				// Fogwall makes all offensive-type targeted skills fail at 75%
 				if (sd) clif->skill_fail(sd, ud->skill_id, USESKILL_FAIL_LEVEL, 0);
 				break;
 			}
@@ -4842,8 +4844,8 @@ int skill_castend_id(int tid, int64 tick, int id, intptr_t data) {
 			unit->stop_walking(src,1);
 
 		if( !sd || sd->skillitem != ud->skill_id || skill->get_delay(ud->skill_id,ud->skill_lv) )
-			ud->canact_tick = tick + skill->delay_fix(src, ud->skill_id, ud->skill_lv); //Tests show wings don't overwrite the delay but skill scrolls do. [Inkfish]
-		if (sd) { //Cooldown application
+			ud->canact_tick = tick + skill->delay_fix(src, ud->skill_id, ud->skill_lv); // Tests show wings don't overwrite the delay but skill scrolls do. [Inkfish]
+		if (sd) { // Cooldown application
 			int i, cooldown = skill->get_cooldown(ud->skill_id, ud->skill_lv);
 			for (i = 0; i < ARRAYLENGTH(sd->skillcooldown) && sd->skillcooldown[i].id; i++) { // Increases/Decreases cooldown of a skill by item/card bonuses.
 				if (sd->skillcooldown[i].id == ud->skill_id){
@@ -4886,7 +4888,7 @@ int skill_castend_id(int tid, int64 tick, int id, intptr_t data) {
 		// SC_MAGICPOWER needs to switch states before any damage is actually dealt
 		skill->toggle_magicpower(src, ud->skill_id);
 		
-		/* On aegis damage skills are also increase by camouflage. Need confirmation on kRo.
+		/* On aegis damage skills are also increase by camouflage. Need confirmation on kRO.
 		if( ud->skill_id != RA_CAMOUFLAGE ) // only normal attack and auto cast skills benefit from its bonuses
 			status_change_end(src,SC_CAMOUFLAGE, INVALID_TIMER);
 		*/
@@ -4983,7 +4985,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 	int element = 0;
 	enum sc_type type;
 
-	if(skill_id > 0 && !skill_lv) return 0;	// celest
+	if(skill_id > 0 && !skill_lv) return 0;	// [Celest]
 
 	nullpo_retr(1, src);
 	nullpo_retr(1, bl);
@@ -5024,7 +5026,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 
 	//Check for undead skills that convert a no-damage skill into a damage one. [Skotlex]
 	switch (skill_id) {
-		case HLIF_HEAL:	//[orn]
+		case HLIF_HEAL:	// [orn]
 			if (bl->type != BL_HOM) {
 				if (sd) clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0) ;
 				break ;
@@ -5095,7 +5097,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			struct block_list *s_src = battle->get_master(src);
 			short ret = 0;
 			if(!skill->check_unit_range(src, src->x, src->y, skill_id, skill_lv))  //prevent reiteration
-			    ret = skill->castend_pos2(src,src->x,src->y,skill_id,skill_lv,tick,flag); //cast on homon
+			    ret = skill->castend_pos2(src,src->x,src->y,skill_id,skill_lv,tick,flag); //cast on homun
 			if(s_src && !skill->check_unit_range(s_src, s_src->x, s_src->y, skill_id, skill_lv))
 			    ret |= skill->castend_pos2(s_src,s_src->x,s_src->y,skill_id,skill_lv,tick,flag); //cast on master
 			if (hd)
@@ -5138,7 +5140,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 
 	map->freeblock_lock();
 	switch(skill_id) {
-		case HLIF_HEAL:	//[orn]
+		case HLIF_HEAL:	// [orn]
 		case AL_HEAL:
 		/**
 		 * Arch Bishop
@@ -5494,7 +5496,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			if (dstsd) {
 				if(dstsd->status.weapon == W_FIST ||
 					(dstsd->sc.count && !dstsd->sc.data[type] &&
-					(	//Allow re-enchanting to lenghten time. [Skotlex]
+					(	//Allow re-enchanting to lengthen time. [Skotlex]
 						dstsd->sc.data[SC_PROPERTYFIRE] ||
 						dstsd->sc.data[SC_PROPERTYWATER] ||
 						dstsd->sc.data[SC_PROPERTYWIND] ||
@@ -5716,7 +5718,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 		{
 			int duration = skill->get_time(skill_id,skill_lv);
 			clif->skill_nodamage(bl,bl,skill_id,skill_lv,sc_start(src,bl,type,100,skill_lv,duration)); // Master
-			clif->skill_nodamage(src,src,skill_id,skill_lv,sc_start(src,src,type,100,skill_lv,duration)); // Homunc
+			clif->skill_nodamage(src,src,skill_id,skill_lv,sc_start(src,src,type,100,skill_lv,duration)); // Homun
 		}
 			break;
 		case NJ_BUNSINJYUTSU:
@@ -6050,7 +6052,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			                    BF_MAGIC, src, src, skill_id, skill_lv, tick, flag, BCT_ENEMY);
 			break;
 
-		case HVAN_EXPLOSION:	//[orn]
+		case HVAN_EXPLOSION:	// [orn]
 		case NPC_SELFDESTRUCTION:
 		{
 			//Self Destruction hits everyone in range (allies+enemies)
@@ -6183,7 +6185,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 				return 0;
 			}
 			clif->skill_nodamage(src,bl,skill_id,skill_lv,sc_start4(src,bl,type,100,skill_lv,unit->getdir(bl),0,0,0));
-			if (sd) // If the client receives a skill-use packet inmediately before a walkok packet, it will discard the walk packet! [Skotlex]
+			if (sd) // If the client receives a skill-use packet immediately before a walkok packet, it will discard the walk packet! [Skotlex]
 				clif->walkok(sd); // So aegis has to resend the walk ok.
 			break;
 		case AS_CLOAKING:
@@ -6419,7 +6421,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 		case MC_IDENTIFY:
 			if(sd) {
 				clif->item_identify_list(sd);
-				if( sd->menuskill_id != MC_IDENTIFY ) {/* failed, dont consume anything, return */
+				if( sd->menuskill_id != MC_IDENTIFY ) {/* failed, don't consume anything, return */
 					map->freeblock_unlock();
 					return 1;
 				}
@@ -6761,7 +6763,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 				}
 				clif->skill_nodamage(src,bl,skill_id,skill_lv,1);
 				if((dstsd && (dstsd->class_&MAPID_UPPERMASK) == MAPID_SOUL_LINKER)
-					|| (tsc && tsc->data[SC_SOULLINK] && tsc->data[SC_SOULLINK]->val2 == SL_ROGUE) //Rogue's spirit defends againt dispel.
+					|| (tsc && tsc->data[SC_SOULLINK] && tsc->data[SC_SOULLINK]->val2 == SL_ROGUE) //Rogue's spirit defends against dispel.
 					|| (dstsd && pc_ismadogear(dstsd))
 					|| rnd()%100 >= 50+10*skill_lv )
 				{
@@ -7071,7 +7073,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 				unit->stop_attack(src);
 				//Run skillv tiles overriding the can-move check.
 				if (unit->walktoxy(src, src->x + skill_lv * mask[dir][0], src->y + skill_lv * mask[dir][1], 2) && md)
-					md->state.skillstate = MSS_WALK; //Otherwise it isn't updated in the ai.
+					md->state.skillstate = MSS_WALK; //Otherwise it isn't updated in the AI.
 			}
 			break;
 
@@ -7137,14 +7139,14 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 		case WE_MALE:
 		{
 			int hp_rate = (!skill_lv)? 0:skill->db[skill_id].hp_rate[skill_lv-1];
-			int gain_hp = tstatus->max_hp*abs(hp_rate)/100; // The earned is the same % of the target HP than it costed the caster. [Skotlex]
+			int gain_hp = tstatus->max_hp*abs(hp_rate)/100; // The earned is the same % of the target HP than it cost the caster. [Skotlex]
 			clif->skill_nodamage(src,bl,skill_id,status->heal(bl, gain_hp, 0, 0),1);
 		}
 			break;
 		case WE_FEMALE:
 		{
 			int sp_rate = (!skill_lv)? 0:skill->db[skill_id].sp_rate[skill_lv-1];
-			int gain_sp = tstatus->max_sp*abs(sp_rate)/100;// The earned is the same % of the target SP than it costed the caster. [Skotlex]
+			int gain_sp = tstatus->max_sp*abs(sp_rate)/100;// The earned is the same % of the target SP than it cost the caster. [Skotlex]
 			clif->skill_nodamage(src,bl,skill_id,status->heal(bl, 0, gain_sp, 0),1);
 		}
 			break;
@@ -7248,7 +7250,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 								// if it is already trapping something don't spring it,
 								// remove trap should be used instead
 								break;
-							// otherwise fallthrough to below
+							// otherwise fall through to below
 						case UNT_BLASTMINE:
 						case UNT_SKIDTRAP:
 						case UNT_LANDMINE:
@@ -7481,7 +7483,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 						if (count == -1)
 							count = 3;
 						else
-							count++; //Should not retrigger this one.
+							count++; //Should not re-trigger this one.
 						break;
 					case 7:	// stop freeze or stoned
 						{
@@ -7696,7 +7698,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			}
 			break;
 
-		case AM_CALLHOMUN:	//[orn]
+		case AM_CALLHOMUN:	// [orn]
 			if( sd ) {
 				if (homun->call(sd))
 					clif->skill_nodamage(src, bl, skill_id, skill_lv, 1);
@@ -7714,7 +7716,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			}
 			break;
 
-		case HAMI_CASTLE:	//[orn]
+		case HAMI_CASTLE:	// [orn]
 			if(rnd()%100 < 20*skill_lv && src != bl)
 			{
 				int x,y;
@@ -7724,7 +7726,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 					skill->blockhomun_start(hd, skill_id, skill->get_time2(skill_id,skill_lv));
 
 				if (unit->movepos(src,bl->x,bl->y,0,0)) {
-					clif->skill_nodamage(src,src,skill_id,skill_lv,1); // Homunc
+					clif->skill_nodamage(src,src,skill_id,skill_lv,1); // Homun
 					clif->slide(src,bl->x,bl->y) ;
 					if (unit->movepos(bl,x,y,0,0))
 					{
@@ -7743,7 +7745,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			else if (sd)
 				clif->skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
 			break;
-		case HVAN_CHAOTIC:	//[orn]
+		case HVAN_CHAOTIC:	// [orn]
 			{
 				static const int per[5][2]={{20,50},{50,60},{25,75},{60,64},{34,67}};
 				int r = rnd()%100;
@@ -7764,7 +7766,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 				status->heal(bl, hp, 0, 0);
 			}
 			break;
-		//Homun single-target support skills [orn]
+		// Homun single-target support skills [orn]
 		case HAMI_BLOODLUST:
 		case HFLI_FLEET:
 		case HFLI_SPEED:
@@ -8016,7 +8018,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 				{ // Every time the skill is casted the status change is reseted adding a counter.
 					count += (short)tsc->data[SC_ROLLINGCUTTER]->val1;
 					if( count > 10 )
-						count = 10; // Max coounter
+						count = 10; // Max counter
 					status_change_end(bl, SC_ROLLINGCUTTER, INVALID_TIMER);
 				}
 				sc_start(src,bl,SC_ROLLINGCUTTER,100,count,skill->get_time(skill_id,skill_lv));
@@ -8548,7 +8550,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 				}
 				if ( tsc && tsc->data[SC__UNLUCKY] && skill_id == SC_UNLUCKY) {
 					//If the target was successfully inflected with the Unlucky status, give 1 of 3 random status's.
-					switch(rnd()%3) {//Targets in the Unlucky status will be affected by one of the 3 random status's reguardless of resistance.
+					switch(rnd()%3) {//Targets in the Unlucky status will be affected by one of the 3 random status's regardless of resistance.
 						case 0:
 							status->change_start(src,bl,SC_POISON,10000,skill_lv,0,0,0,skill->get_time(skill_id,skill_lv),10);
 							break;
@@ -8732,7 +8734,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			} else {
 				int count = 0;
 				clif->skill_damage(src, bl, tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, 6);
-				count = map->forcountinrange(skill->area_sub, src, skill->get_splash(skill_id,skill_lv), (sd)?sd->spiritball_old:15, // Assume 15 spiritballs in non-charactors
+				count = map->forcountinrange(skill->area_sub, src, skill->get_splash(skill_id,skill_lv), (sd)?sd->spiritball_old:15, // Assume 15 spiritballs in non-characters
 					BL_CHAR, src, skill_id, skill_lv, tick, flag|BCT_ENEMY|1, skill->castend_nodamage_id);
 				if( sd ) pc->delspiritball(sd, count, 0);
 				clif->skill_nodamage(src, src, skill_id, skill_lv,
@@ -8921,7 +8923,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 				sc_start(src, bl, type, 100, skill_lv,skill->get_time(skill_id, skill_lv));
 				if ( madnesscheck >= 8 )//The god of madness deals 9999 fixed unreduceable damage when 8 or more enemy players are affected.
 					status_fix_damage(src, bl, 9999, clif->damage(src, bl, 0, 0, 9999, 0, 0, 0));
-					//skill->attack(BF_MISC,src,src,bl,skillid,skilllv,tick,flag);//To renable when I can confirm it deals damage like this. Data shows its dealed as reflected damage which I dont have it coded like that yet. [Rytech]
+					//skill->attack(BF_MISC,src,src,bl,skillid,skilllv,tick,flag);//To renable when I can confirm it deals damage like this. Data shows its dealt as reflected damage which I don't have it coded like that yet. [Rytech]
 			} else if( sd ) {
 				int rate = sstatus->int_ / 6 + (sd? sd->status.job_level:0) / 5 + skill_lv * 4;
 				if ( rnd()%100 < rate ) {
@@ -9047,7 +9049,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 			if( sd ) {
 				int elemental_class = skill->get_elemental_type(skill_id,skill_lv);
 
-				// Remove previous elemental fisrt.
+				// Remove previous elemental first.
 				if( sd->ed )
 					elemental->delete(sd->ed,0);
 
@@ -9070,7 +9072,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 					elemental->delete(sd->ed, 0);
 					break;
 				}
-				switch( skill_lv ) {// Select mode bassed on skill level used.
+				switch( skill_lv ) {// Select mode based on skill level used.
 					case 2: mode = EL_MODE_ASSIST; break;
 					case 3: mode = EL_MODE_AGGRESSIVE; break;
 				}
@@ -9847,7 +9849,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 	int r;
 
 	//if(skill_lv <= 0) return 0;
-	if(skill_id > 0 && !skill_lv) return 0;	// celest
+	if(skill_id > 0 && !skill_lv) return 0;	// [Celest]
 
 	nullpo_ret(src);
 
@@ -10153,7 +10155,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 				int class_ = skill_id==AM_SPHEREMINE?1142:summons[skill_lv-1];
 				struct mob_data *md;
 
-				// Correct info, don't change any of this! [celest]
+				// Correct info, don't change any of this! [Celest]
 				md = mob->once_spawn_sub(src, src->m, x, y, status->get_name(src), class_, "", SZ_MEDIUM, AI_NONE);
 				if (md) {
 					md->master_id = src->id;
@@ -10293,7 +10295,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
 				sc_start(src,src,type,100,skill_lv,skill->get_time2(skill_id,skill_lv));
 			break;
 
-		case AM_RESURRECTHOMUN:	//[orn]
+		case AM_RESURRECTHOMUN:	// [orn]
 			if (sd) {
 				if (!homun->ressurect(sd, 20*skill_lv, x, y)) {
 					clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
@@ -11871,7 +11873,7 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6
 		case UNT_POISONSMOKE:
 			if( battle->check_target(ss,bl,BCT_ENEMY) > 0 && !(tsc && tsc->data[sg->val2]) && rnd()%100 < 50 ) {
 				short rate = 100;
-				if ( sg->val1 == 9 )//Oblivion Curse gives a 2nd success chance after the 1st one passes which is reduceable. [Rytech]
+				if ( sg->val1 == 9 )//Oblivion Curse gives a 2nd success chance after the 1st one passes which is reducible. [Rytech]
 					rate = 100 - tstatus->int_ * 4 / 5 ;
 				sc_start(ss,bl,sg->val2,rate,sg->val1,skill->get_time2(GC_POISONINGWEAPON,1) - (tstatus->vit + tstatus->luk) / 2 * 1000);
 			}
@@ -11906,7 +11908,7 @@ int skill_unit_onplace_timer(struct skill_unit *src, struct block_list *bl, int6
 
 		case UNT_STEALTHFIELD:
 			if( bl->id == sg->src_id )
-				break; // Dont work on Self (video shows that)
+				break; // Don't work on Self (video shows that)
 		case UNT_NEUTRALBARRIER:
 			sc_start(ss,bl,type,100,sg->skill_lv,sg->interval + 100);
 			break;
@@ -12188,8 +12190,8 @@ int skill_unit_onleft(uint16 skill_id, struct block_list *bl, int64 tick) {
 				//We don't check for SC_LONGING because someone could always have knocked you back and out of the song/dance.
 				//FIXME: This code is not perfect, it doesn't checks for the real ensemble's owner,
 				//it only checks if you are doing the same ensemble. So if there's two chars doing an ensemble
-				//which overlaps, by stepping outside of the other parther's ensemble will cause you to cancel
-				//your own. Let's pray that scenario is pretty unlikely and noone will complain too much about it.
+				//which overlaps, by stepping outside of the other partner's ensemble will cause you to cancel
+				//your own. Let's pray that scenario is pretty unlikely and none will complain too much about it.
 				status_change_end(bl, SC_DANCING, INVALID_TIMER);
 			}
 		case MH_STEINWAND:
@@ -12235,7 +12237,7 @@ int skill_unit_onleft(uint16 skill_id, struct block_list *bl, int64 tick) {
 			if (sce) {
 				status_change_end(bl, type, INVALID_TIMER);
 				if ((sce=sc->data[SC_BLIND])) {
-					if (bl->type == BL_PC) //Players get blind ended inmediately, others have it still for 30 secs. [Skotlex]
+					if (bl->type == BL_PC) //Players get blind ended immediately, others have it still for 30 secs. [Skotlex]
 						status_change_end(bl, SC_BLIND, INVALID_TIMER);
 					else {
 						timer->delete(sce->timer, status->change_timer);
@@ -12683,7 +12685,7 @@ int skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_id
 			case BS_GREED:
 				clif->skill_fail(sd,skill_id,USESKILL_FAIL_MADOGEAR,0);
 				return 0;
-			default: //Only Mechanic exlcusive skill can be used.
+			default: //Only Mechanic exclusive skill can be used.
 				break;
 		}
 	}
@@ -12996,7 +12998,7 @@ int skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_id
 				return 0;
 			}
 			break;
-		case AM_REST: //Can't vapo homun if you don't have an active homunc or it's hp is < 80%
+		case AM_REST: //Can't vapo homun if you don't have an active homun or it's hp is < 80%
 			if (!homun_alive(sd->hd) || sd->hd->battle_status.hp < (sd->hd->battle_status.max_hp*80/100))
 			{
 				clif->skill_fail(sd,skill_id,USESKILL_FAIL_LEVEL,0);
@@ -13433,7 +13435,7 @@ int skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_id
 
 	// There's no need to check if the skill is part of a combo if it's
 	// already been checked before, see unit_skilluse_id2 [Panikon]
-	// Note that if this check is readded part of issue:8047 will reapear!
+	// Note that if this check is read part of issue:8047 will reappear!
 	//if( sd->sc.data[SC_COMBOATTACK] && !skill->is_combo(skill_id ) )
 	//	return 0;
 			
@@ -13681,7 +13683,7 @@ int skill_consume_requirement( struct map_session_data *sd, uint16 skill_id, uin
 				continue;
 
 			if( itemid_isgemstone(req.itemid[i]) && skill_id != HW_GANBANTEIN && sc && sc->data[SC_SOULLINK] && sc->data[SC_SOULLINK]->val2 == SL_WIZARD )
-				continue; //Gemstones are checked, but not substracted from inventory.
+				continue; //Gemstones are checked, but not subtracted from inventory.
 
 			switch( skill_id ){
 				case SA_SEISMICWEAPON:
@@ -13876,7 +13878,7 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, uint16
 		if( itemid_isgemstone(req.itemid[i]) && skill_id != HW_GANBANTEIN )
 		{
 			if( sd->special_state.no_gemstone )
-			{	// All gem skills except Hocus Pocus and Ganbantein can cast for free with Mistress card -helvetica
+			{	// All gem skills except Hocus Pocus and Ganbantein can cast for free with Mistress card [helvetica]
 				if( skill_id != SA_ABRACADABRA )
 					req.itemid[i] = req.amount[i] = 0;
 				else if( --req.amount[i] < 1 )
@@ -15033,7 +15035,7 @@ int skill_cell_overlap(struct block_list *bl, va_list ap) {
 	if( su == NULL || su->group == NULL || (*alive) == 0 )
 		return 0;
 	
-	if( su->group->state.guildaura ) /* guild auras are not cancelled! */
+	if( su->group->state.guildaura ) /* guild auras are not canceled! */
 		return 0;
 	
 	switch (skill_id) {
@@ -15484,7 +15486,7 @@ int skill_delunit (struct skill_unit* su) {
 			}
 			break;
 		case SC_MANHOLE: // Note : Removing the unit don't remove the status (official info)
-			if( group->val2 ) { // Someone Traped
+			if( group->val2 ) { // Someone Trapped
 				struct status_change *tsc = status->get_sc(map->id2bl(group->val2));
 				if( tsc && tsc->data[SC__MANHOLE] )
 					tsc->data[SC__MANHOLE]->val4 = 0; // Remove the Unit ID
@@ -15631,7 +15633,7 @@ int skill_delunitgroup(struct skill_unit_group *group, const char* file, int lin
 		struct status_change* sc = status->get_sc(src);
 		if (sc && sc->data[SC_DANCING])
 		{
-			sc->data[SC_DANCING]->val2 = 0 ; //This prevents status_change_end attempting to redelete the group. [Skotlex]
+			sc->data[SC_DANCING]->val2 = 0 ; //This prevents status_change_end attempting to re-delete the group. [Skotlex]
 			status_change_end(src, SC_DANCING, INVALID_TIMER);
 		}
 	}
@@ -16013,7 +16015,7 @@ int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap) {
 	return 0;
 }
 /*==========================================
- * Executes on all skill units every SKILLUNITTIMER_INTERVAL miliseconds.
+ * Executes on all skill units every SKILLUNITTIMER_INTERVAL milliseconds.
  *------------------------------------------*/
 int skill_unit_timer(int tid, int64 tick, int id, intptr_t data) {
 	map->freeblock_lock();
@@ -16420,7 +16422,7 @@ int skill_produce_mix(struct map_session_data *sd, uint16 skill_id, int nameid,
 						make_per = 100000; // Star Crumbs are 100% success crafting rate? (made 1000% so it succeeds even after penalties) [Skotlex]
 						break;
 					default: // Enchanted Stones
-						make_per += 1000+i*500; // Enchantedstone Craft bonus: +15/+20/+25/+30/+35
+						make_per += 1000+i*500; // Enchanted stone Craft bonus: +15/+20/+25/+30/+35
 					break;
 				}
 				break;
@@ -16468,7 +16470,7 @@ int skill_produce_mix(struct map_session_data *sd, uint16 skill_id, int nameid,
 					case ITEMID_COATING_BOTTLE:
 						make_per -= (1+rnd()%100)*10;
 					    break;
-					//Common items, recieve no bonus or penalty, listed just because they are commonly produced
+					//Common items, receive no bonus or penalty, listed just because they are commonly produced
 					case ITEMID_BLUE_POTION:
 					case ITEMID_RED_SLIM_POTION:
 					case ITEMID_ANODYNE:
@@ -17371,7 +17373,7 @@ int skill_blockpc_start_(struct map_session_data *sd, uint16 skill_id, int tick)
 	return 0;
 }
 
-int skill_blockhomun_end(int tid, int64 tick, int id, intptr_t data) { //[orn]
+int skill_blockhomun_end(int tid, int64 tick, int id, intptr_t data) { // [orn]
 	struct homun_data *hd = (TBL_HOM*)map->id2bl(id);
 	if (data <= 0 || data >= MAX_SKILL)
 		return 0;
@@ -17380,7 +17382,7 @@ int skill_blockhomun_end(int tid, int64 tick, int id, intptr_t data) { //[orn]
 	return 1;
 }
 
-int skill_blockhomun_start(struct homun_data *hd, uint16 skill_id, int tick) { //[orn]
+int skill_blockhomun_start(struct homun_data *hd, uint16 skill_id, int tick) { // [orn]
 	uint16 idx = skill->get_index(skill_id);
 	nullpo_retr (-1, hd);
 
@@ -17396,7 +17398,7 @@ int skill_blockhomun_start(struct homun_data *hd, uint16 skill_id, int tick) { /
 	return timer->add(timer->gettick() + tick, skill->blockhomun_end, hd->bl.id, idx);
 }
 
-int skill_blockmerc_end(int tid, int64 tick, int id, intptr_t data) {//[orn]
+int skill_blockmerc_end(int tid, int64 tick, int id, intptr_t data) {// [orn]
 	struct mercenary_data *md = (TBL_MER*)map->id2bl(id);
 	if( data <= 0 || data >= MAX_SKILL )
 		return 0;
@@ -17984,7 +17986,7 @@ bool skill_parse_row_requiredb(char* split[], int columns, int current) {
 	skill->split_atoi(split[5],skill->db[idx].sp_rate);
 	skill->split_atoi(split[6],skill->db[idx].zeny);
 
-    //Wich weapon type are required, see doc/item_db for types
+    //Which weapon type are required, see doc/item_db for types
 	p = split[7];
 	for( j = 0; j < 32; j++ ) {
 		int l = atoi(p);
@@ -18481,7 +18483,7 @@ void skill_defaults(void) {
 	memset(&skill->area_temp,0,sizeof(skill->area_temp));
 	memset(&skill->unit_temp,0,sizeof(skill->unit_temp));
 	skill->unit_group_newid = 0;
-	/* accesssors */
+	/* accessors */
 	skill->get_index = skill_get_index;
 	skill->get_type = skill_get_type;
 	skill->get_hit = skill_get_hit;
diff --git a/src/map/status.c b/src/map/status.c
index a716b8913..d05341683 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1121,8 +1121,8 @@ int status_charge(struct block_list* bl, int64 hp, int64 sp) {
 }
 
 //Inflicts damage on the target with the according walkdelay.
-//If flag&1, damage is passive and does not triggers cancelling status changes.
-//If flag&2, fail if target does not has enough to substract.
+//If flag&1, damage is passive and does not triggers canceling status changes.
+//If flag&2, fail if target does not has enough to subtract.
 //If flag&4, if killed, mob must not give exp/loot.
 //flag will be set to &8 when damaging sp of a dead character
 int status_damage(struct block_list *src,struct block_list *target,int64 in_hp, int64 in_sp, int walkdelay, int flag) {
@@ -1269,7 +1269,7 @@ int status_damage(struct block_list *src,struct block_list *target,int64 in_hp,
 
 	st->hp = 1; //To let the dead function cast skills and all that.
 	//NOTE: These dead functions should return: [Skotlex]
-	//0: Death cancelled, auto-revived.
+	//0: Death canceled, auto-revived.
 	//Non-zero: Standard death. Clear status, cancel move/attack, etc
 	//&2: Also remove object from map.
 	//&4: Also delete object from memory.
@@ -1284,7 +1284,7 @@ int status_damage(struct block_list *src,struct block_list *target,int64 in_hp,
 		break;
 	}
 
-	if(!flag) //Death cancelled.
+	if(!flag) //Death canceled.
 		return (int)(hp+sp);
 
 	//Normal death
@@ -1429,7 +1429,7 @@ int status_heal(struct block_list *bl,int64 in_hp,int64 in_sp, int flag) {
 //If rates are > 0, percent is of current HP/SP
 //If rates are < 0, percent is of max HP/SP
 //If !flag, this is heal, otherwise it is damage.
-//Furthermore, if flag==2, then the target must not die from the substraction.
+//Furthermore, if flag==2, then the target must not die from the subtraction.
 int status_percent_change(struct block_list *src,struct block_list *target,signed char hp_rate, signed char sp_rate, int flag) {
 	struct status_data *st;
 	unsigned int hp = 0, sp = 0;
@@ -1633,11 +1633,11 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, uin
 
 	if( sc && sc->count ) {
 
-		if (skill_id != RK_REFRESH && sc->opt1 >0 && !(sc->opt1 == OPT1_CRYSTALIZE && src->type == BL_MOB) && sc->opt1 != OPT1_BURNING && skill_id != SR_GENTLETOUCH_CURE) { //Stuned/Frozen/etc
+		if (skill_id != RK_REFRESH && sc->opt1 >0 && !(sc->opt1 == OPT1_CRYSTALIZE && src->type == BL_MOB) && sc->opt1 != OPT1_BURNING && skill_id != SR_GENTLETOUCH_CURE) { //Stunned/Frozen/etc
 			if (flag != 1) //Can't cast, casted stuff can't damage.
 				return 0;
 			if (!(skill->get_inf(skill_id)&INF_GROUND_SKILL))
-				return 0; //Targetted spells can't come off.
+				return 0; //Targeted spells can't come off.
 		}
 
 		if (
@@ -1782,7 +1782,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, uin
 		if( ( tsc->data[SC_STEALTHFIELD] || tsc->data[SC_CAMOUFLAGE] ) && !(st->mode&(MD_BOSS|MD_DETECTOR)) && flag == 4 )
 			return 0;
 	}
-	//If targetting, cloak+hide protect you, otherwise only hiding does.
+	//If targeting, cloak+hide protect you, otherwise only hiding does.
 	hide_flag = flag?OPTION_HIDE:(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK);
 
 	//You cannot hide from ground skills.
@@ -1815,7 +1815,7 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, uin
 				}
 			}
 			break;
-		case BL_ITEM:	//Allow targetting of items to pick'em up (or in the case of mobs, to loot them).
+		case BL_ITEM:	//Allow targeting of items to pick'em up (or in the case of mobs, to loot them).
 			//TODO: Would be nice if this could be used to judge whether the player can or not pick up the item it targets. [Skotlex]
 			if (st->mode&MD_LOOTER)
 				return 1;
@@ -1891,7 +1891,7 @@ int status_base_amotion_pc(struct map_session_data *sd, struct status_data *st)
 #ifdef RENEWAL_ASPD
 	short mod = -1;
 
-	switch( sd->weapontype2 ){ // adjustment for dual weilding
+	switch( sd->weapontype2 ){ // adjustment for dual wielding
 		case W_DAGGER:	mod = 0;	break; // 0, 1, 1
 		case W_1HSWORD:
 		case W_1HAXE:	mod = 1;
@@ -2555,7 +2555,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
 				return 1;
 		}
 
-		// sanitize the refine level in case someone decreased the value inbetween
+		// sanitize the refine level in case someone decreased the value in between
 		if (sd->status.inventory[index].refine > MAX_REFINE)
 			sd->status.inventory[index].refine = MAX_REFINE;
 
@@ -2583,7 +2583,7 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt) {
 				wa->matk += status->refine_info[wlv].bonus[r-1] / 100;
 #endif
 
-			//Overrefine bonus.
+			//Overrefined bonus.
 			if (r)
 				wd->overrefine = status->refine_info[wlv].randombonus_max[r-1] / 100;
 
diff --git a/src/map/status.h b/src/map/status.h
index 32bef4df8..b08aa2a04 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -21,7 +21,7 @@ struct pet_data;
 //Change the equation when the values are high enough to discard the
 //imprecision in exchange of overflow protection [Skotlex]
 //Also add 100% checks since those are the most used cases where we don't
-//want aproximation errors.
+//want approximation errors.
 #define APPLY_RATE(value, rate) ( \
 	(rate) == 100 ? \
 		(value) \
diff --git a/src/map/storage.c b/src/map/storage.c
index 2db5fff3d..fad23d770 100644
--- a/src/map/storage.c
+++ b/src/map/storage.c
@@ -544,7 +544,7 @@ int storage_guild_storageadd(struct map_session_data* sd, int index, int amount)
 * @index : storage idx
 * return
 * 	0 : fail
-* 	1 : succes
+* 	1 : success
  *------------------------------------------*/
 int storage_guild_storageget(struct map_session_data* sd, int index, int amount)
 {
@@ -585,7 +585,7 @@ int storage_guild_storageget(struct map_session_data* sd, int index, int amount)
 * @index : cart inventory idx
 * return
 * 	0 : fail
-* 	1 : succes
+* 	1 : success
  *------------------------------------------*/
 int storage_guild_storageaddfromcart(struct map_session_data* sd, int index, int amount)
 {
@@ -617,7 +617,7 @@ int storage_guild_storageaddfromcart(struct map_session_data* sd, int index, int
 * @index : storage idx
 * return
 * 	0 : fail
-* 	1 : succes
+* 	1 : success
  *------------------------------------------*/
 int storage_guild_storagegettocart(struct map_session_data* sd, int index, int amount)
 {
@@ -648,7 +648,7 @@ int storage_guild_storagegettocart(struct map_session_data* sd, int index, int a
 * Request to save guild storage
 * return
 * 	0 : fail (no storage)
-* 	1 : succes
+* 	1 : success
  *------------------------------------------*/
 int storage_guild_storagesave(int account_id, int guild_id, int flag)
 {
@@ -669,7 +669,7 @@ int storage_guild_storagesave(int account_id, int guild_id, int flag)
 * ACK save of guild storage
 * return
 * 	0 : fail (no storage)
-* 	1 : succes
+* 	1 : success
  *------------------------------------------*/
 int storage_guild_storagesaved(int guild_id)
 {
diff --git a/src/map/trade.c b/src/map/trade.c
index 83426c407..8bb47e0cb 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -61,7 +61,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta
 		if( previous_sd ){
 			previous_sd->trade_partner = 0;
 			clif->tradecancelled(previous_sd);
-		} // Once cancelled then continue to the new one.
+		} // Once canceled then continue to the new one.
 		sd->trade_partner = 0;
 		clif->tradecancelled(sd);
 	}
@@ -169,7 +169,7 @@ void trade_tradeack(struct map_session_data *sd, int type) {
 /*==========================================
  * Check here hacker for duplicate item in trade
  * normal client refuse to have 2 same types of item (except equipment) in same trade window
- * normal client authorise only no equiped item and only from inventory
+ * normal client authorize only no equipped item and only from inventory
  *------------------------------------------*/
 int impossible_trade_check(struct map_session_data *sd)
 {
@@ -187,9 +187,9 @@ int impossible_trade_check(struct map_session_data *sd)
 	// get inventory of player
 	memcpy(&inventory, &sd->status.inventory, sizeof(struct item) * MAX_INVENTORY);
 
-	// remove this part: arrows can be trade and equiped
+	// remove this part: arrows can be trade and equipped
 	// re-added! [celest]
-	// remove equiped items (they can not be trade)
+	// remove equipped items (they can not be trade)
 	for (i = 0; i < MAX_INVENTORY; i++)
 		if (inventory[i].nameid > 0 && inventory[i].equip && !(inventory[i].equip & EQP_AMMO))
 			memset(&inventory[i], 0, sizeof(struct item));
@@ -457,7 +457,7 @@ void trade_tradeok(struct map_session_data *sd) {
 }
 
 /*==========================================
- * 'Cancel' is pressed. (or trade was force-cancelled by the code)
+ * 'Cancel' is pressed. (or trade was force-canceled by the code)
  *------------------------------------------*/
 void trade_tradecancel(struct map_session_data *sd) {
 	struct map_session_data *target_sd;
@@ -466,7 +466,7 @@ void trade_tradecancel(struct map_session_data *sd) {
 	target_sd = map->id2sd(sd->trade_partner);
 
 	if(!sd->state.trading)
-	{ // Not trade acepted
+	{ // Not trade accepted
 		if( target_sd ) {
 			target_sd->trade_partner = 0;
 			clif->tradecancelled(target_sd);
diff --git a/src/map/unit.c b/src/map/unit.c
index e22d6f697..95feb2a1d 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -244,7 +244,7 @@ int unit_walktoxy_timer(int tid, int64 tick, int id, intptr_t data) {
 	  	{
 			if (!(ud->skill_id == NPC_SELFDESTRUCTION && ud->skilltimer != INVALID_TIMER))
 			{	//Skill used, abort walking
-				clif->fixpos(bl); //Fix position as walk has been cancelled.
+				clif->fixpos(bl); //Fix position as walk has been canceled.
 				return 0;
 			}
 			//Resend walk packet for proper Self Destruction display.
@@ -869,7 +869,7 @@ int unit_stop_walking(struct block_list *bl,int type)
 		return 0;
 	//NOTE: We are using timer data after deleting it because we know the
 	//timer->delete function does not messes with it. If the function's
-	//behaviour changes in the future, this code could break!
+	//behavior changes in the future, this code could break!
 	td = timer->get(ud->walktimer);
 	timer->delete(ud->walktimer, unit->walktoxy_timer);
 	ud->walktimer = INVALID_TIMER;
@@ -892,7 +892,7 @@ int unit_stop_walking(struct block_list *bl,int type)
 	if(bl->type == BL_PET && type&~0xff)
 		ud->canmove_tick = timer->gettick() + (type>>8);
 
-	//Readded, the check in unit_set_walkdelay means dmg during running won't fall through to this place in code [Kevin]
+	//Read, the check in unit_set_walkdelay means dmg during running won't fall through to this place in code [Kevin]
 	if (ud->state.running) {
 		status_change_end(bl, SC_RUN, INVALID_TIMER);
 		status_change_end(bl, SC_WUGDASH, INVALID_TIMER);
@@ -1250,7 +1250,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
 
 	if (!temp) //Stop attack on non-combo skills [Skotlex]
 		unit->stop_attack(src);
-	else if(ud->attacktimer != INVALID_TIMER) //Elsewise, delay current attack sequence
+	else if(ud->attacktimer != INVALID_TIMER) //Else-wise, delay current attack sequence
 		ud->attackabletime = tick + status_get_adelay(src);
 
 	ud->state.skillcastcancel = castcancel;
@@ -1366,7 +1366,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
 	}
 	
 	if(!ud->state.running) //need TK_RUN or WUGDASH handler to be done before that, see bugreport:6026
-		unit->stop_walking(src,1);// eventhough this is not how official works but this will do the trick. bugreport:6829
+		unit->stop_walking(src,1);// even though this is not how official works but this will do the trick. bugreport:6829
 	
 	// in official this is triggered even if no cast time.
 	clif->skillcasting(src, src->id, target_id, 0,0, skill_id, skill->get_ele(skill_id, skill_lv), casttime);
@@ -1375,7 +1375,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
 		if (sd && target->type == BL_MOB)
 		{
 			TBL_MOB *md = (TBL_MOB*)target;
-			mob->skill_event(md, src, tick, -1); //Cast targetted skill event.
+			mob->skill_event(md, src, tick, -1); //Cast targeted skill event.
 			if (tstatus->mode&(MD_CASTSENSOR_IDLE|MD_CASTSENSOR_CHASE) &&
 				battle->check_target(target, src, BCT_ENEMY) > 0)
 			{
@@ -1470,7 +1470,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, ui
 		if( skill->not_ok(skill_id, sd) || !skill->check_condition_castbegin(sd, skill_id, skill_lv) )
 			return 0;
 		/**
-		 * "WHY IS IT HEREE": pneuma cannot be cancelled past this point, the client displays the animation even,
+		 * "WHY IS IT HEREE": pneuma cannot be canceled past this point, the client displays the animation even,
 		 * if we cancel it from nodamage_id, so it has to be here for it to not display the animation.
 		 **/
 		if( skill_id == AL_PNEUMA && map->getcell(src->m, skill_x, skill_y, CELL_CHKLANDPROTECTOR) ) {
@@ -1648,7 +1648,7 @@ int unit_attack(struct block_list *src,int target_id,int continuous) {
 	ud->state.attack_continue = continuous;
 	unit->set_target(ud, target_id);
 
-	if (continuous) //If you're to attack continously, set to auto-case character
+	if (continuous) //If you're to attack continuously, set to auto-case character
 		ud->chaserange = status_get_range(src);
 
 	//Just change target/type. [Skotlex]
@@ -1938,7 +1938,7 @@ int unit_attack_timer(int tid, int64 tick, int id, intptr_t data) {
 /*==========================================
  * Cancels an ongoing skill cast.
  * flag&1: Cast-Cancel invoked.
- * flag&2: Cancel only if skill is cancellable.
+ * flag&2: Cancel only if skill is can be cancel.
  *------------------------------------------*/
 int unit_skillcastcancel(struct block_list *bl,int type)
 {
@@ -1954,7 +1954,7 @@ int unit_skillcastcancel(struct block_list *bl,int type)
 	sd = BL_CAST(BL_PC, bl);
 
 	if (type&2) {
-		//See if it can be cancelled.
+		//See if it can be canceled.
 		if (!ud->state.skillcastcancel)
 			return 0;
 
@@ -2057,7 +2057,7 @@ int unit_changeviewsize(struct block_list *bl,short size)
 /*==========================================
  * Removes a bl/ud from the map.
  * Returns 1 on success. 0 if it couldn't be removed or the bl was free'd
- * if clrtype is 1 (death), appropiate cleanup is performed.
+ * if clrtype is 1 (death), appropriate cleanup is performed.
  * Otherwise it is assumed bl is being warped.
  * On-Kill specific stuff is not performed here, look at status->damage for that.
  *------------------------------------------*/
diff --git a/src/map/vending.h b/src/map/vending.h
index a70726374..b65e888e3 100644
--- a/src/map/vending.h
+++ b/src/map/vending.h
@@ -13,8 +13,8 @@ struct s_search_store_search;
 
 struct s_vending {
 	short index; //cart index (return item data)
-	short amount; //amout of the item for vending
-	unsigned int value; //at wich price
+	short amount; //amount of the item for vending
+	unsigned int value; //at which price
 };
 
 struct vending_interface {
-- 
cgit v1.2.3-70-g09d2