diff --git a/conf-tmpl/help2.txt b/conf-tmpl/help2.txt
index e9210add02..3a0772425e 100644
--- a/conf-tmpl/help2.txt
+++ b/conf-tmpl/help2.txt
@@ -49,7 +49,7 @@
  60:@charblock/@block <char name> - Blocks definitively a account
  60:@charunblock/@unblock <char name> - Unblocks a account
  60:@charban/@ban/@banish/@charbanish <time> <name> - Ban temporarily a account
- 60:	time usage: adjustement (+/- value) and element (y/a, m, d/j, h, mn, s)
+ 60:	time usage: adjustment (+/- value) and element (y/a, m, d/j, h, mn, s)
  60:	Example: @ban +1m-2mn1s-6y testplayer
  60:@charunban/@unban/@unbanish/@charunbanish <name> - Unban a account
  60:@jail <char name> - Sends specified character in jails
diff --git a/src/char/char.c b/src/char/char.c
index dd5a630093..4ae02e3606 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -4139,8 +4139,7 @@ int char_config_read(const char *cfgName)
 		} else if(strcmpi(w1,"db_path")==0) {
 			strcpy(db_path,w2);
 		} else if (strcmpi(w1, "console") == 0) {
-			if(strcmpi(w2,"on") == 0 || strcmpi(w2,"yes") == 0 )
-				console = 1;
+			console = config_switch(w2);
 		} else if (strcmpi(w1, "fame_list_alchemist") == 0) {
 			fame_list_size_chemist = atoi(w2);
 			if (fame_list_size_chemist > MAX_FAME_LIST) {
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index fc2b112889..430f0832a2 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -3917,8 +3917,7 @@ int char_config_read(const char* cfgName)
 		} else if (strcmpi(w1, "char_del_level") == 0) { //disable/enable char deletion by its level condition [Lupus]
 			char_del_level = atoi(w2);
 		} else if (strcmpi(w1, "console") == 0) {
-			if(strcmpi(w2,"on") == 0 || strcmpi(w2,"yes") == 0 )
-				console = 1;
+			console = config_switch(w2);
 		} else if (strcmpi(w1, "fame_list_alchemist") == 0) {
 			fame_list_size_chemist = atoi(w2);
 			if (fame_list_size_chemist > MAX_FAME_LIST) {
diff --git a/src/ladmin/ladmin.c b/src/ladmin/ladmin.c
index 7d8815eb2d..2605cb93cb 100644
--- a/src/ladmin/ladmin.c
+++ b/src/ladmin/ladmin.c
@@ -1337,7 +1337,7 @@ int banaddaccount(char* param)
 			ladmin_log("Ajustement de l'année hors norme (commande 'banadd')." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the years (from -127 to 127).\n");
-			ladmin_log("Abnormal adjustement for the year ('banadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the year ('banadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -1347,7 +1347,7 @@ int banaddaccount(char* param)
 			ladmin_log("Ajustement du mois hors norme (commande 'banadd')." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the months (from -255 to 255).\n");
-			ladmin_log("Abnormal adjustement for the month ('banadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the month ('banadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -1357,7 +1357,7 @@ int banaddaccount(char* param)
 			ladmin_log("Ajustement des jours hors norme (commande 'banadd')." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the days (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustement for the days ('banadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the days ('banadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -1367,7 +1367,7 @@ int banaddaccount(char* param)
 			ladmin_log("Ajustement des heures hors norme (commande 'banadd')." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the hours (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustement for the hours ('banadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the hours ('banadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -1377,7 +1377,7 @@ int banaddaccount(char* param)
 			ladmin_log("Ajustement des minutes hors norme (commande 'banadd')." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the minutes (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustement for the minutes ('banadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the minutes ('banadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -1387,7 +1387,7 @@ int banaddaccount(char* param)
 			ladmin_log("Ajustement des secondes hors norme (commande 'banadd')." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the seconds (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustement for the seconds ('banadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the seconds ('banadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -2717,7 +2717,7 @@ int timeaddaccount(char* param)
 			ladmin_log("Ajustement de l'année hors norme ('timeadd' command)." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the years (from -127 to 127).\n");
-			ladmin_log("Abnormal adjustement for the year ('timeadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the year ('timeadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -2727,7 +2727,7 @@ int timeaddaccount(char* param)
 			ladmin_log("Ajustement du mois hors norme ('timeadd' command)." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the months (from -255 to 255).\n");
-			ladmin_log("Abnormal adjustement for the month ('timeadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the month ('timeadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -2737,7 +2737,7 @@ int timeaddaccount(char* param)
 			ladmin_log("Ajustement des jours hors norme ('timeadd' command)." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the days (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustement for the days ('timeadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the days ('timeadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -2747,7 +2747,7 @@ int timeaddaccount(char* param)
 			ladmin_log("Ajustement des heures hors norme ('timeadd' command)." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the hours (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustement for the hours ('timeadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the hours ('timeadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -2757,7 +2757,7 @@ int timeaddaccount(char* param)
 			ladmin_log("Ajustement des minutes hors norme ('timeadd' command)." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the minutes (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustement for the minutes ('timeadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the minutes ('timeadd' command)." RETCODE);
 		}
 		return 137;
 	}
@@ -2767,7 +2767,7 @@ int timeaddaccount(char* param)
 			ladmin_log("Ajustement des secondes hors norme ('timeadd' command)." RETCODE);
 		} else {
 			ShowMessage("Please give a correct adjustment for the seconds (from -32767 to 32767).\n");
-			ladmin_log("Abnormal adjustement for the seconds ('timeadd' command)." RETCODE);
+			ladmin_log("Abnormal adjustment for the seconds ('timeadd' command)." RETCODE);
 		}
 		return 137;
 	}
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 717047709a..ffa94ad0da 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2594,7 +2594,7 @@ int atcommand_baselevelup(const int fd, struct map_session_data* sd, const char*
 	level = atoi(message);
 
 	if (!message || !*message || !level) {
-		clif_displaymessage(fd, "Please, enter a level adjustement (usage: @lvup/@blevel/@baselvlup <number of levels>).");
+		clif_displaymessage(fd, "Please, enter a level adjustment (usage: @lvup/@blevel/@baselvlup <number of levels>).");
 		return -1;
 	}
 
@@ -2655,7 +2655,7 @@ int atcommand_joblevelup(const int fd, struct map_session_data* sd, const char*
 	level = atoi(message);
 
 	if (!message || !*message || !level) {
-		clif_displaymessage(fd, "Please, enter a level adjustement (usage: @joblvup/@jlevel/@joblvlup <number of levels>).");
+		clif_displaymessage(fd, "Please, enter a level adjustment (usage: @joblvup/@jlevel/@joblvlup <number of levels>).");
 		return -1;
 	}
 	if (level > 0) {
diff --git a/src/map/clif.c b/src/map/clif.c
index 6e96d79a46..6ab8ea4383 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3766,7 +3766,7 @@ void clif_getareachar_unit(struct map_session_data* sd,struct block_list *bl)
 			if (pd->vd.head_bottom)
 			{
 				//TODO: adjust clif_pet_equip() to support a 'target', then rewrite this mess into a function call
-        			int fd = sd->fd;
+				int fd = sd->fd;
 				WFIFOHEAD(fd,packet_len(0x1a4));
 				WFIFOW(fd,0) = 0x1a4;
 				WFIFOB(fd,2) = 3;
@@ -7482,7 +7482,7 @@ int clif_refresh(struct map_session_data *sd)
 	nullpo_retr(-1, sd);
 	clif_changemap(sd,sd->mapindex,sd->bl.x,sd->bl.y);
 	clif_inventorylist(sd);
-	if(pc_iscarton(sd)){
+	if(pc_iscarton(sd)) {
 		clif_cartlist(sd);
 		clif_updatestatus(sd,SP_CARTINFO);
 	}
diff --git a/src/map/npc.c b/src/map/npc.c
index 2afd9421bb..8c3a2f78ee 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2580,7 +2580,7 @@ static int npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4)
 	}
 	else if (strcmpi(w3,"gvg")==0) {
 		map[m].flag.gvg=state;
-		if (state && map[m].flag.pvp) 
+		if (state && map[m].flag.pvp)
 		{
 			map[m].flag.pvp=0;
 			ShowWarning("You can't set PvP and GvG flags for the same map! Removing PvP flag from %s\n", map[m].name);
diff --git a/src/map/skill.c b/src/map/skill.c
index 5e76f581f7..dee052c431 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4664,7 +4664,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 				switch (i) {
 				case SC_WEIGHT50:    case SC_WEIGHT90:    case SC_HALLUCINATION: 
 				case SC_STRIPWEAPON: case SC_STRIPSHIELD: case SC_STRIPARMOR:
-			  	case SC_STRIPHELM:   case SC_CP_WEAPON:   case SC_CP_SHIELD:
+				case SC_STRIPHELM:   case SC_CP_WEAPON:   case SC_CP_SHIELD:
 				case SC_CP_ARMOR:    case SC_CP_HELM:     case SC_COMBO:
 				case SC_STRFOOD:     case SC_AGIFOOD:     case SC_VITFOOD:
 				case SC_INTFOOD:     case SC_DEXFOOD:     case SC_LUKFOOD: