* Follow-up r16726, more standardization on docs.

* Replaced and added dividers in many script files with one standard divider.
* Other misc. cleaning...

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16727 54d463be-8e91-2dee-dedb-b68131a5f0ec

36 files changed, 369 insertions, 477 deletions

diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index d9f992abc..71aa38e23 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 20120824
 //===== Description: =========================================
-//= 
+//= List of available atcommands and their functions.
 //===== Additional Comments: =================================
 //= TODO: With such short descriptions, it's duplicated 'conf/help.txt' 
 //= Consider explaining commands in detail, similar to 'doc/script_commands.txt'
diff --git a/doc/ea_job_system.txt b/doc/ea_job_system.txt
index d483c5639..f29278f50 100644
--- a/doc/ea_job_system.txt
+++ b/doc/ea_job_system.txt
@@ -1,15 +1,12 @@
 //===== rAthena Documentation ================================
-//= *Athena Job System
+//= eAthena Job System
 //===== By: ==================================================
 //= Skotlex
 //===== Current Version: =====================================
-//= 0.2
+//= 20120610
 //===== Description: =========================================
 //= A reference description of eA's inner job system (for use 
-//= on scripts through the eaclass and roclass script commands)
-//===== Additional Comments: =================================
-//= 0.1 - First release, explained as well as I could.
-//= 0.2 - Added info on third jobs. [Euphy]
+//= in scripts through the eaclass and roclass script commands).
 //============================================================
 
 Preface:
@@ -69,7 +66,7 @@ The next step is to either become a 2-1 or a 2-2 job:
 
 Getting out the rebirth versions of a swordman:
 
-	EAJ_SWORDMAN|EAJL_UPPER	-> EAJ_SWORDMAN_HIGH
+	EAJ_SWORDMAN|EAJL_UPPER 		-> EAJ_SWORDMAN_HIGH
 	EAJ_SWORDMAN|EAJL_2_1|EAJL_UPPER	-> EAJ_LORD_KNIGHT
 	EAJ_SWORDMAN|EAJL_2_2|EAJL_UPPER	-> EAJ_PALADIN
 
diff --git a/doc/effect_list.txt b/doc/effect_list.txt
index b1b591a22..e7c3b973b 100644
--- a/doc/effect_list.txt
+++ b/doc/effect_list.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 20120822
 //===== Description: =========================================
-//= A list of client-side effects sorted by their ID
+//= A list of client-side effects sorted by ID.
 //============================================================
 
 The following is a compiled list of visual and sound effects which the client
diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt
index 8f798db85..9e5fda2f9 100644
--- a/doc/item_bonus.txt
+++ b/doc/item_bonus.txt
@@ -6,7 +6,7 @@
 //= 20110124
 //===== Description: =========================================
 //= List of script instructions used in item bonuses,
-//= mainly bonus/bonus2/bonus3/bonus4/bonus5 arguments
+//= mainly bonus/bonus2/bonus3/bonus4/bonus5 arguments.
 //============================================================
 
 skill i,n;				Gives skill #i at level n (supports skill names)
diff --git a/doc/map_cache.txt b/doc/map_cache.txt
index d109a4f5f..c2e4ccb1d 100644
--- a/doc/map_cache.txt
+++ b/doc/map_cache.txt
@@ -3,13 +3,10 @@
 //===== By: ==================================================
 //= DracoRPG
 //===== Current Version: =====================================
-//= 1.0
+//= 20070724
 //===== Description: =========================================
 //= A complete manual for rAthena's map cache generator as 
 //= well as a reference on the map cache format used.
-//===== Additional Comments: =================================
-//= 0.1 - Short howto for the initial builder version
-//= 1.0 - Complete manual covering the improved version
 //============================================================
 
 Preface:
diff --git a/doc/permissions.txt b/doc/permissions.txt
index 31592828b..3c936b157 100644
--- a/doc/permissions.txt
+++ b/doc/permissions.txt
@@ -5,10 +5,10 @@
 //===== Current Version: =====================================
 //= 20120718
 //===== Description: =========================================
-//= permissions of player groups, configured in /conf/groups.conf
+//= Player group permissions, configured in /conf/groups.conf.
 //============================================================
 
-can_trade : Ability to trade or otherwise distribute items (drop, storage, vending etc)
+can_trade : Ability to trade or otherwise distribute items (drop, storage, vending etc...).
 can_party : Ability to join parties.
 all_skill : Ability to use all skills.
 all_equipment : Ability to equip anything (can cause client errors).
@@ -25,8 +25,8 @@ view_hpmeter : Ability to see HP bar of every player.
 view_equipment : Ability to view players equipment regardless of their setting.
 use_check : Ability to use client command /check (display character status).
 use_changemaptype : Ability to use client command /changemaptype.
-all_commands: Ability to use ALL atcommands/charcommands.
-receive_requests: Ability to receive @requests.
-show_bossmobs: Ability to see boss mobs with @showmobs.
-disable_pvm: Ability to disable Player v.s. Monster.
-disable_pvp: Ability to disable Player v.s. Player.
+all_commands : Ability to use all atcommands and charcommands.
+receive_requests : Ability to receive @requests.
+show_bossmobs : Ability to see boss mobs with @showmobs.
+disable_pvm : Ability to disable Player vs. Monster.
+disable_pvp : Ability to disable Player vs. Player.
diff --git a/doc/quest_variables.txt b/doc/quest_variables.txt
index 27a039e37..8b9a6f3a3 100644
--- a/doc/quest_variables.txt
+++ b/doc/quest_variables.txt
@@ -1,109 +1,108 @@
 //===== rAthena Documentation ================================
 //= Permanent Quest Variables
 //===== By: ==================================================
-//= rAthena Dev Team
+//= Lupus
 //===== Current Version: =====================================
 //= 20120826
 //===== Description: =========================================
 //= This file should help to understand and manage bit-wise 
 //= quest variables. You can store up to 31 boolean value into 
 //= a single variable.
-//===== Additional Comments: =================================
-//= Variable: MISC_QUEST
 //============================================================
 
-Quest:      Juice Maker Quest
-Info:       How to make juices. This bit keeps final state of the quest.
-How to set:     set MISC_QUEST, MISC_QUEST | 1;
-How to check:   if (MISC_QUEST & 1) {}
-
-Quest:      Tempestra Quest
-Info:       Has you given a potion to Temperstra or not.
-How to set:     set MISC_QUEST, MISC_QUEST | 2;
-How to check:   if (MISC_QUEST & 2) {}
-
-Quest:      Morgenstein Quest
-Info:       How to make Mixture & Counteragent. Also subquest for Alchemist Job
-            This bit keeps final state of the quest.
-How to set:     set MISC_QUEST, MISC_QUEST | 4;
-How to check:   if (MISC_QUEST & 4) {}
-
-Quest:      Prontera Culvert Quest
-Info:       Could you enter the Prontera Culvert or not.
-How to set:     set MISC_QUEST, MISC_QUEST | 8;
-How to check:   if (MISC_QUEST & 8) {}
-
-Quest:      Edgar's Offer
-Info:       Cheap ticket from Izlude to Alberta.
-             This bit keeps final state of the quest.
-How to set:     set MISC_QUEST, MISC_QUEST | 16;
-How to check:   if (MISC_QUEST & 16) {}
-
-Quest:      Piano Quest
-Info:       The only way from Niflheim to Umbala.
-How to set:     set MISC_QUEST, MISC_QUEST | 32;
-How to check:   if (MISC_QUEST & 32) {}
-
-Quest:      Bio Ethics Quest
-Info:       Bio Ethics quest for homunculus skill for alchemists.
-            This bit is for final part of quest (completed or not). [Evera]
-How to set:     set MISC_QUEST, MISC_QUEST|64;
-How to check:   if (MISC_QUEST & 64) {}
-
-Quest:      DTS Warper
-Info:       Not really a quest, but to show if a person has already voted.
-            Cleaning up the variables -.-; [Evera]
-How to set:     set MISC_QUEST, MISC_QUEST|128;
-How to check:   if (MISC_QUEST & 128) {}
-
-Quest:      -
-Info:       -
-How to set:     set MISC_QUEST, MISC_QUEST | 256;
-How to check:   if (MISC_QUEST & 256) {}
-
-Quest:      Cube Room
-Info:       Lighthalzen. Cube Room Quest (Pass to Bio-Lab)
-How to set:     set MISC_QUEST, MISC_QUEST | 512;
-How to check:   if (MISC_QUEST & 512) {}
-
-Quest:      Reset Skills Event
-Info:       Yuno, Hypnotist Teacher
-How to set:     set MISC_QUEST, MISC_QUEST | 1024;
-How to check:   if (MISC_QUEST & 1024) {}
-
-Quest:      Slotted Arm Guard Quest
-Info:       Ninja Job Room, Boshuu
-How to set:     set MISC_QUEST, MISC_QUEST | 2048;
-How to check:   if (MISC_QUEST & 2048) {}
-
-Quest:      Improved Arm Guard Quest
-Info:       Ninja Job Room, Basshu
-How to set:     set MISC_QUEST, MISC_QUEST | 4096;
-How to check:   if (MISC_QUEST & 4096) {}
-
-Quest:      Rachel Sanctuary Quest
-Info:       Gained access to Rachel Santuary (yes/no)
-How to set:     set MISC_QUEST, MISC_QUEST | 8192;
-How to check:   if (MISC_QUEST & 8192) {}
-
-Quest:      Message Delivery Quest
-Info:       Send a message to Elly, in Niflheim from Erious.
-How to set:     set MISC_QUEST, MISC_QUEST | 16384;
-How to check:   if (MISC_QUEST & 16384) {}
-
-Quest:      Umbala Domestic Dispute?
-Info:       Reward: 1 yggdrasil leaf.
-How to set:     set MISC_QUEST, MISC_QUEST | 32768;
-How to check:   if (MISC_QUEST & 32768) {}
-
-Quest:      Access to the Turtle Island
-Info:       Reward: ~1 OCA, OVB, GB.
-How to set:     set MISC_QUEST, MISC_QUEST | 65536;
-How to check:   if (MISC_QUEST & 65536) {}
-
-
-//============================================================
-Quest:      ?
-Info:       ?
-How to set:     set MISC_QUEST, MISC_QUEST | ?;
-How to check:   if (MISC_QUEST & ?) {}
+Variable: MISC_QUEST
+--------------------------------------------------------------
+
+Quest:		Juice Maker Quest
+Info:		How to make juices. This bit keeps final state of the quest.
+How to set:	set MISC_QUEST, MISC_QUEST | 1;
+How to check:	if (MISC_QUEST & 1) {}
+
+Quest:		Tempestra Quest
+Info:		Determines if player has given a potion to Tempestra.
+How to set:	set MISC_QUEST, MISC_QUEST | 2;
+How to check:	if (MISC_QUEST & 2) {}
+
+Quest:		Morgenstein Quest
+Info:		How to make Mixture & Counteragent. This bit keeps final state of the quest.
+How to set:	set MISC_QUEST, MISC_QUEST | 4;
+How to check:	if (MISC_QUEST & 4) {}
+
+Quest:		Prontera Culvert Quest
+Info:		Determines if player can enter Prontera Culverts.
+How to set:	set MISC_QUEST, MISC_QUEST | 8;
+How to check:	if (MISC_QUEST & 8) {}
+
+Quest:		Edgar's Offer
+Info:		Cheap ticket from Izlude to Alberta. This bit keeps final state of the quest.
+How to set:	set MISC_QUEST, MISC_QUEST | 16;
+How to check:	if (MISC_QUEST & 16) {}
+
+Quest:		Piano Quest
+Info:		The only way from Niflheim to Umbala.
+How to set:	set MISC_QUEST, MISC_QUEST | 32;
+How to check:	if (MISC_QUEST & 32) {}
+
+Quest:		Bio Ethics Quest
+Info:		Quest for homunculus skill for alchemists. This bit keeps final state of the quest.
+How to set:	set MISC_QUEST, MISC_QUEST|64;
+How to check:	if (MISC_QUEST & 64) {}
+
+Quest:		DTS Warper
+Info:		Determines if player has already voted.
+How to set:	set MISC_QUEST, MISC_QUEST|128;
+How to check:	if (MISC_QUEST & 128) {}
+
+Quest:		-
+Info:		-
+How to set:	set MISC_QUEST, MISC_QUEST | 256;
+How to check:	if (MISC_QUEST & 256) {}
+
+Quest:		Cube Room
+Info:		Lighthalzen Cube Room quest (to enter Bio-Lab)
+How to set:	set MISC_QUEST, MISC_QUEST | 512;
+How to check:	if (MISC_QUEST & 512) {}
+
+Quest:		Reset Skills Event
+Info:		Yuno, Hypnotist Teacher
+How to set:	set MISC_QUEST, MISC_QUEST | 1024;
+How to check:	if (MISC_QUEST & 1024) {}
+
+Quest:		Slotted Arm Guard Quest
+Info:		Ninja Job Room, Boshuu
+How to set:	set MISC_QUEST, MISC_QUEST | 2048;
+How to check:	if (MISC_QUEST & 2048) {}
+
+Quest:		Improved Arm Guard Quest
+Info:		Ninja Job Room, Basshu
+How to set:	set MISC_QUEST, MISC_QUEST | 4096;
+How to check:	if (MISC_QUEST & 4096) {}
+
+Quest:		Rachel Sanctuary Quest
+Info:		Determines if player can access Rachel Santuary.
+How to set:	set MISC_QUEST, MISC_QUEST | 8192;
+How to check:	if (MISC_QUEST & 8192) {}
+
+Quest:		Message Delivery Quest
+Info:		Send a message to Elly, in Niflheim from Erious.
+How to set:	set MISC_QUEST, MISC_QUEST | 16384;
+How to check:	if (MISC_QUEST & 16384) {}
+
+Quest:		Umbala Domestic Dispute?
+Info:		Reward: 1 Yggdrasil Leaf.
+How to set:	set MISC_QUEST, MISC_QUEST | 32768;
+How to check:	if (MISC_QUEST & 32768) {}
+
+Quest:		Access to the Turtle Island
+Info:		Reward: ~1 OCA, OVB, GB.
+How to set:	set MISC_QUEST, MISC_QUEST | 65536;
+How to check:	if (MISC_QUEST & 65536) {}
+
+
+Variable: MISC_QUEST2
+--------------------------------------------------------------
+
+Quest:		-
+Info:		-
+How to set:	set MISC_QUEST2, MISC_QUEST2 | ?;
+How to check:	if (MISC_QUEST2 & ?) {}
diff --git a/doc/whisper_sys.txt b/doc/whisper_sys.txt
index 906dad81b..bb726974b 100644
--- a/doc/whisper_sys.txt
+++ b/doc/whisper_sys.txt
@@ -1,7 +1,7 @@
 //===== rAthena Documentation ================================
 //= NPC Whisper System
 //===== By: ==================================================
-//= rAthena Dev Team
+//= lordalfa
 //===== Current Version: =====================================
 //= 20120826
 //===== Description: =========================================
diff --git a/doc/woe_time_explanation.txt b/doc/woe_time_explanation.txt
index fa21834ad..75dfaf09e 100644
--- a/doc/woe_time_explanation.txt
+++ b/doc/woe_time_explanation.txt
@@ -1,7 +1,7 @@
 //===== rAthena Documentation ================================
 //= WoE Time Explanation
 //===== By: ==================================================
-//= rAthena Dev Team
+//= erKURITA
 //===== Current Version: =====================================
 //= 20120717
 //===== Description: =========================================
diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt
index b19a1fb29..b3a7de10a 100644
--- a/npc/events/christmas_2008.txt
+++ b/npc/events/christmas_2008.txt
@@ -18,8 +18,8 @@
 //= 1.1 Fixed some issues, revamped the whole script. [Kisuka]
 //============================================================
 
-// ============== Caroller - Music Box ================
-// =====================================================
+// Caroller - Music Box
+//============================================================
 prontera,226,306,4	script	Caroller#iROxmas08	79,{
 	if (iROxmas08carol < 1 || iROxmas08carol == 3) {
 		if (iROxmas08carol == 3) {
@@ -434,8 +434,8 @@ prontera,226,306,4	script	Caroller#iROxmas08	79,{
 	}
 }
 
-// ============= Santa Claus - Card Game ===============
-// =====================================================
+// Santa Claus - Card Game
+//============================================================
 -	script	Santa Claus#iROxmas08::08santa	718,{
 	mes "[Santa Claus]";
 	mes "Wow! Were you naughty or nice this year?";
@@ -715,9 +715,8 @@ alberta,117,66,4	duplicate(08santa)	Santa Claus#0803	718
 geffen,119,70,4	duplicate(08santa)	Santa Claus#0804	718
 morocc,158,104,4	duplicate(08santa)	Santa Claus#0805	718
 
-
-// ============= Louise Kim - Santa Suit ===============
-// =====================================================
+// Louise Kim - Santa Suit
+//============================================================
 xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 	mes "[Louise Kim]";
 	mes "I always thought about how boring Santa Claus is wearing a too boring costume.";
@@ -856,7 +855,8 @@ xmas_in,89,92,4	script	Louise Kim#iROxmas08	714,{
 	}
 }
 
-//XMAS MOBS
+// Monsters
+//============================================================
 prt_fild00,0,0,0,0	monster	Christmas Jakk	1244,5,0,0,0
 prt_fild00,0,0,0,0	monster	Christmas Goblin	1245,5,0,0,0
 prt_fild00,0,0,0,0	monster	Christmas Cookie	1246,5,0,0,0
diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt
index 78d7e9e56..443facc30 100644
--- a/npc/events/dumplingfestival.txt
+++ b/npc/events/dumplingfestival.txt
@@ -79,11 +79,8 @@ L_NOZENY:
 	close;
 }
   
-//////////////////////////////////////////////
-// Monster Spawning /\Secial only for event.//
-//////////////////////////////////////////////
-  
-// ~Dumpling~
+// Monsters
+//============================================================
 gef_fild00,0,0,0,0	monster	Dumpling	1520,20,60000,66000
 gef_fild07,0,0,0,0	monster	Dumpling	1520,20,60000,66000
 gef_fild04,0,0,0,0	monster	Dumpling	1520,20,60000,66000
@@ -101,11 +98,9 @@ pay_fild06,0,0,0,0	monster	Dumpling	1520,20,60000,66000
 pay_fild05,0,0,0,0	monster	Dumpling	1520,20,60000,66000
 pay_fild02,0,0,0,0	monster	Dumpling	1520,20,60000,66000
 pay_fild09,0,0,0,0	monster	Dumpling	1520,20,60000,66000
-  
-// ~Bacsojin~
+
 moc_fild03,0,0,0,0	monster	Bacsojin	1518,1,60000,66000
-  
-// ~Chung E~
+
 moc_fild03,0,0,0,0	monster	Chung E	1519,1,60000,66000
 moc_fild13,0,0,0,0	monster	Chung E	1519,1,60000,66000
 pay_fild01,0,0,0,0	monster	Chung E	1519,1,60000,66000
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index 8fd077af8..fce598c73 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -21,6 +21,7 @@
 //============================================================
 
 // Pumpkin Mojo quest (Event 1)
+//============================================================
 prontera,162,69,5	script	Gloomy Jack#06_hw	1130,2,2,{
 	end;
 
@@ -485,6 +486,7 @@ nif_in,19,32,3	script	Deviruchi#06_hw	738,{
 }
 
 // Creation of Pumpkin Pie (Event 2)
+//============================================================
 nif_fild01,165,115,3	script	Chicken Masta#06_hw	794,{
 	set .@now_weight,MaxWeight-Weight;
 	if (.@now_weight < 2000 || checkweight(1201,1) == 0) {
@@ -909,6 +911,7 @@ pay_dun03,157,131,3	duplicate(HwChicken2)	Chicken#06_hw_p40	800
 pay_dun03,158,131,3	duplicate(HwChicken3)	Chicken#06_hw_p41	800
 
 // Payon Field chickens
+//============================================================
 pay_fild08,1,1,0	script	#06_hw_timer02	-1,{
 OnInit:
 	disablenpc "Chicken#06_hw_pf01";
@@ -1080,7 +1083,8 @@ morocc,159,143,3	duplicate(HWFamiDup)	Familiar#06_hw03	799
 geffen,120,188,3	duplicate(HWFamiDup)	Familiar#06_hw04	799
 alberta,80,171,3	duplicate(HWFamiDup)	Familiar#06_hw05	799
 
-//Event Lude Monster Spawns
+// Event Lude Monster Spawns
+//============================================================
 ra_fild01,0,0,0,0	monster	Lude	1812,3,0,0,0
 ra_fild02,0,0,0,0	monster	Lude	1812,3,0,0,0
 ra_fild03,0,0,0,0	monster	Lude	1812,3,0,0,0
diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt
index a4844da1b..c14dd1656 100644
--- a/npc/events/halloween_2008.txt
+++ b/npc/events/halloween_2008.txt
@@ -20,17 +20,17 @@
 payon,162,176,4	script	Halloween Magician#iRO08	704,{
 	
 	if(Hallow08 < 1) {
-			mes "[Halloween Magician]";
-			mes "Kkkkkkkkk!";
-			mes "I have a special event this Halloween that tests your luck and agility.";
-			mes "Are you interested?";
-			next;
-			mes "[Halloween Magician]";
-			mes "Come on! Don't be a wuss!";
-			mes "If you collect enough tickets you can get good prizes!";
-			mes "So what do you say?";
-			next;
-			goto MainMenu;
+		mes "[Halloween Magician]";
+		mes "Kkkkkkkkk!";
+		mes "I have a special event this Halloween that tests your luck and agility.";
+		mes "Are you interested?";
+		next;
+		mes "[Halloween Magician]";
+		mes "Come on! Don't be a wuss!";
+		mes "If you collect enough tickets you can get good prizes!";
+		mes "So what do you say?";
+		next;
+		goto MainMenu;
 	}
 
 	if (Hallow08Kill == 1) {
@@ -237,12 +237,9 @@ payon,162,176,4	script	Halloween Magician#iRO08	704,{
 			goto MainMenu;
 		}
 }
-	
-// --------------- MapFlags ---------------
-
 
 evt_zombie,16,142,1	script	zombiewarp001	45,2,2,{
-	OnTouch:
+OnTouch:
 	if (@Hallow08Warp == 1) {
 		set Hallow08Kill,2;
 		specialeffect 16;
@@ -252,7 +249,7 @@ evt_zombie,16,142,1	script	zombiewarp001	45,2,2,{
 }
 
 evt_zombie,122,27,1	script	zombiewarp002	45,2,2,{
-	OnTouch:
+OnTouch:
 	if (@Hallow08Warp == 2) {
 		set Hallow08Kill,2;
 		specialeffect 16;
@@ -262,7 +259,7 @@ evt_zombie,122,27,1	script	zombiewarp002	45,2,2,{
 }
 
 evt_zombie,267,89,1	script	zombiewarp003	45,2,2,{
-	OnTouch:
+OnTouch:
 	if (@Hallow08Warp == 3) {
 		set Hallow08Kill,2;
 		specialeffect 16;
diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt
index db072b401..6ded29242 100644
--- a/npc/events/valentinesday_2009.txt
+++ b/npc/events/valentinesday_2009.txt
@@ -24,6 +24,7 @@
 //============================================================
 
 // Marco Bassinio (Chocolate/Chocolate Box maker)
+//============================================================
 prontera,164,174,4	script	Trader#Val09	58,{
 	mes "[Marco Bassinio]";
 	mes "Hey, folks! Here's something you don't see everyday!";
@@ -160,6 +161,7 @@ prontera,164,174,4	script	Trader#Val09	58,{
 }
 
 // Packs Trader (Sells Wrapping Paper, Lace, and Box)
+//============================================================
 prontera,147,171,5	script	Packs Trader#Val09	58,{
 	mes "[Packs Trader]";
 	mes "Hello.";
@@ -303,6 +305,7 @@ prontera,147,171,5	script	Packs Trader#Val09	58,{
 }
 
 // Event Ring Maker (Makes ring for players)
+//============================================================
 prontera,154,185,5	script	Event Ring Maker#Val09	721,{
 	if (BaseLevel < 75) {
 		mes "[Event Ring Maker]";
@@ -396,6 +399,7 @@ prontera,154,185,5	script	Event Ring Maker#Val09	721,{
 }
 
 // Valentine Vote Manager (Registers votes)
+//============================================================
 prontera,157,185,4	script	Valentine Vote Manager#v	113,{
 	mes "[Valentine Vote Manager]";
 	mes "Hello, I'm the Valentine's Vote Manager.";
@@ -516,6 +520,7 @@ prontera,157,185,4	script	Valentine Vote Manager#v	113,{
 }
 
 // Charles Orleans (Makes Home-Made Chocolates)
+//============================================================
 prt_castle,42,35,3	script	Dessert Manager#Val09	47,{
 	if (Sex) {
 		mes "[Charles Orleans]";
diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt
index 8046bd4c1..932ec1469 100644
--- a/npc/events/whiteday.txt
+++ b/npc/events/whiteday.txt
@@ -13,7 +13,6 @@
 //= Converted to rAthena format by Dr.Evil
 //============================================================
 
-
 alberta,188,64,4	script	Sugar	91,{
 	set @maplenum,0;
 	set @mapleItemID,0;
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index 5a211c18d..ecab31491 100644
--- a/npc/events/xmas.txt
+++ b/npc/events/xmas.txt
@@ -22,12 +22,9 @@
 //= 1.4 Added a fix to make Lutie & Bard quests passable during this event [Lupus]
 //============================================================
 
-
 xmas_in,100,96,4	script	Father Christmas::Santa2	718,{
 	mes "[Santa Claus]";
-//For Lutie & Bard quest
-	if(xmas_npc==0) set xmas_npc, 1;
-//
+	if(xmas_npc==0) set xmas_npc, 1; // For Lutie & Bard quest
 	if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start;
 	mes "Merry Christmas!";
 	if(Class==0 || #event_xmas>=30 ) close; //anti exploit protection
@@ -113,19 +110,14 @@ OnInit:
 	end;
 }
 
-
-//========================================================================================
-// - Xmas Goblin Spawns
-//========================================================================================
-
+// Xmas Goblin Spawns
+//============================================================
 prt_fild11,0,0,0,0	monster	Christmas Goblin	1245,5,0,0,0
 gef_fild11,0,0,0,0	monster	Christmas Goblin	1245,5,0,0,0
 yuno_fild09,0,0,0,0	monster	Christmas Goblin	1245,5,0,0,0
 
-//========================================================================================
-// - Santa Poring Spawns
-//========================================================================================
-
+// Santa Poring Spawns
+//============================================================
 ein_fild03,0,0,0,0	monster	Santa Poring	1062,15,0,0,0
 ein_fild04,0,0,0,0	monster	Santa Poring	1062,15,0,0,0
 ein_fild06,0,0,0,0	monster	Santa Poring	1062,15,0,0,0
@@ -239,10 +231,8 @@ hu_fild04,0,0,0,0	monster	Santa Poring	1062,15,0,0,0
 hu_fild05,0,0,0,0	monster	Santa Poring	1062,15,0,0,0
 hu_fild07,0,0,0,0	monster	Santa Poring	1062,15,0,0,0
 
-//========================================================================================
-// - Antonio Spawns
-//========================================================================================
-
+// Antonio Spawns
+//============================================================
 ein_fild03,0,0,0,0	monster	Antonio	1247,1,0,0,0
 ein_fild04,0,0,0,0	monster	Antonio	1247,1,0,0,0
 ein_fild06,0,0,0,0	monster	Antonio	1247,1,0,0,0
@@ -356,17 +346,13 @@ hu_fild04,0,0,0,0	monster	Antonio	1247,1,0,0,0
 hu_fild05,0,0,0,0	monster	Antonio	1247,1,0,0,0
 hu_fild07,0,0,0,0	monster	Antonio	1247,1,0,0,0
 
-//========================================================================================
-// - Xmas Jakk
-//========================================================================================
-
+// Xmas Jakk Spawns
+//============================================================
 gef_dun01,0,0,0,0	monster	Xmas Jakk	1244,5,0,0,0
 //gefenia02,0,0,0,0	monster	Xmas Jakk	1244,5,0,0,0
 
-//========================================================================================
-// - Xmas Orc
-//========================================================================================
-
+// Xmas Orc Spawns
+//============================================================
 gef_fild02,0,0,0,0	monster	Christmas Orc	1588,5,0,0,0
 gef_fild03,0,0,0,0	monster	Christmas Orc	1588,5,0,0,0
 gef_fild10,0,0,0,0	monster	Christmas Orc	1588,5,0,0,0
diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt
index fd49510e7..00fbdbeaa 100644
--- a/npc/guild2/agit_main_se.txt
+++ b/npc/guild2/agit_main_se.txt
@@ -17,6 +17,7 @@
 //============================================================
 
 // Core, triggers all other events
+//============================================================
 -	script	Manager#template	-1,{
 OnAgitInit2:
 OnRecvCastle2:
@@ -185,6 +186,7 @@ OnTreasureDied:
 }
 
 // Guild Manager
+//============================================================
 -	script	Steward#template	-1,{
 	set .@GID, getcastledata(strnpcinfo(4),1);
 	if (!.@GID) {
@@ -616,6 +618,7 @@ OnStartArena:
 }
 
 // Castle Guardians
+//============================================================
 -	script	Guardian#template	-1,{
 	set .@GID, getcastledata(strnpcinfo(4),1);
 	set .@n$, "["+strnpcinfo(1)+"]";
@@ -815,6 +818,7 @@ OnInit:
 }
 
 // Guild Kafras
+//============================================================
 -	script	Kafra#template	-1,{
 	cutin "kafra_01",2;
 	set .@GID, getcastledata(strnpcinfo(4),1);
@@ -927,6 +931,7 @@ OnInit:
 }
 
 // Guardian Stones (2)
+//============================================================
 -	script	Guardian Stone#template	-1,{
 	set .@GID, getcastledata(strnpcinfo(4),1);
 	set .@num, atoi(charat(strnpcinfo(1),0));
@@ -1079,6 +1084,7 @@ OnEnable:
 }
 
 // Control Devices (3)
+//============================================================
 -	script	Control#template	-1,{
 	set .@GID, getcastledata(strnpcinfo(4),1);
 	set .@num, atoi(charat(strnpcinfo(1),15));
@@ -1321,6 +1327,7 @@ OnEnable:
 }
 
 // Guardian Summoners (2)
+//============================================================
 -	script	gard#template	-1,{
 OnEnable:
 	// .@x[i],.@y[i]: Normal coordinates, #0-21.
@@ -1440,6 +1447,7 @@ OnReset:
 }
 
 // Guardian Stone Summoners (2)
+//============================================================
 -	script	df#template	-1,{
 OnEnable:
 	if (compare(strnpcinfo(2),"arug")) {
@@ -1487,6 +1495,7 @@ OnTimer300000:
 }
 
 // Barrier Summoners (4)
+//============================================================
 -	script	RL#template	-1,{
 OnEnable:
 	set .@num, atoi(charat(strnpcinfo(1),2));
@@ -1662,6 +1671,7 @@ OnDisable:
 }
 
 // Link Flags (function)
+//============================================================
 function	script	LinkFlag	{
 	if (!getcharid(2) || getcharid(2) != getcastledata(strnpcinfo(4),1)) end;
 	if (getarg(0) == "Convenience Facility") {
@@ -1697,6 +1707,7 @@ function	script	LinkFlag	{
 }
 
 // Return Flags (function)
+//============================================================
 function	script	ReturnFlag	{
 	set .@str$, (compare(strnpcinfo(4),"aru"))?"Arunafeltz":"Schwaltzvalt";
 	set .@GID, getcastledata(getarg(0),1);
@@ -1748,6 +1759,7 @@ function	script	ReturnFlag	{
 }
 
 // Treasure Room Switches
+//============================================================
 -	script	Switch#template	-1,{
 	mes " ";
 	mes "^3355FFWill you pull";
@@ -1769,6 +1781,7 @@ function	script	ReturnFlag	{
 }
 
 // Guild Dungeon Warps
+//============================================================
 -	script	Sunflower#template	-1,{
 	if (getcharid(2) == getcastledata(strnpcinfo(4),1)) {
 		mes "- It's an amazingly huge sunflower; as big as a human! ... You feel something mysterious emanating from the flower. -";
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 14cf31b27..ef2731a6c 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -467,6 +467,7 @@ e_tower,151,185,4	script	Purification Stone#et2	844,{
 */
 
 // Floors 1-25
+//============================================================
 1@tower,50,360,0	script	Immortal Brazier#	844,{
 	mes "- A Message is Engraved on the Brazier -";
 	mes "The one who scatters the ashes of the darkness in this place shall become one step closer to Nacht Sieger, the Hegemon King of the Darkness...";
@@ -1343,6 +1344,7 @@ OnTouch_:
 */
 
 // Floors 26-50
+//============================================================
 2@tower,29,365,2	script	Immortal Furnace#1	844,{
 	end;
 
@@ -2176,6 +2178,7 @@ OnTouch_:
 */
 
 // Floors 51-75
+//============================================================
 3@tower,29,365,2	script	Immortal Furnace#2	844,{
 	end;
 
@@ -3021,6 +3024,7 @@ OnTouch_:
 */
 
 // Floors 76-99
+//============================================================
 4@tower,29,365,2	script	Immortal Furnace#3	844,{
 	end;
 
@@ -3877,6 +3881,7 @@ OnTouch_:
 */
 
 // Floor 100
+//============================================================
 5@tower,106,109,2	script	Lucid Crystal#102	844,{
 	if (in_102tower < 10) {
 		mes "^0000ffA mysterious voice echoes through the room as you touch the lucid crystal radiating a strong light.^000000";
@@ -4066,6 +4071,7 @@ OnEnable:
 } */
 
 // Floor 101
+//============================================================
 6@tower,45,89,2	script	Spring of Life#1	844,{
 	set .@pc_hp,MaxHp-Hp;
 	set .@pc_sp,MaxSp-Sp;
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index 8de9852d8..5928ae7aa 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -1642,6 +1642,7 @@ OnTouch_:
 }
 
 // First floor
+//============================================================
 1@nyd,213,277,5	script	Murdered Yggdrasilid#1F	437,5,5,{
 	if ('ins_nyd2 == 0) {
 		mes "When a faint light enters your heart, a voice sounds in your head.";
@@ -1911,6 +1912,7 @@ OnInstanceInit:
 }
 
 // Second Floor
+//============================================================
 2@nyd,200,14,0	script	nyd_2f_enter	-1,6,6,{
 OnTouch_:
 	donpcevent instance_npcname("nyd_2f_enter_broad", instance_id())+"::OnEnable";
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index b2886778b..3de99ecd5 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -33,6 +33,7 @@
 //============================================================ 
 
 // Entrance
+//============================================================
 gef_fild10,242,202,0	script	Dimensional Gorge Piece	406,{
 
 	set .@party_id,getcharid(1);
@@ -252,6 +253,7 @@ gef_fild10,238,202,6	script	Mad Scientist#orc	865,{
 }
 
 // Orc's Memory Floor 1
+//============================================================
 1@orcs,180,30,0	script	#Resurrect Monsters1	844,{
 	end;
 
@@ -662,6 +664,7 @@ OnMyMobDead3:
 }
 
 // Orc's Memory Floor 2
+//============================================================
 2@orcs,36,171,0	script	#2Resurrect Monsters1	844,{
 	end;
 
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index ed6965462..7525d7768 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -26,6 +26,7 @@
 //============================================================ 
 
 // Sealed Catacomb Entrance
+//============================================================
 monk_test,309,146,3	script	Friar Patrick#edq	412,{
 	if (checkquest(3040)>=0) erasequest 3040;
 	cutin "ins_cata_pri_n",2;
@@ -480,6 +481,7 @@ prt_monk,261,91,3	script	Rust Blackhand#edq	826,{
 }
 
 // Sealed Shrine Interior
+//============================================================
 1@cata,1,2,0	script	ins_baphomet_lotto	-1,{
 OnEnable:
 	switch(rand(1,13)) {
@@ -730,7 +732,8 @@ OnMyMobDead:
 	end;
 }
 
-//===================== soul of hero near the north grave ========================
+// Soul of hero near the north grave
+//============================================================
 1@cata,141,221,0	script	Gravestone#	844,3,3,{
 	set .@party_id,getcharid(1);
 	if ('ins_baphomet == 0) {
@@ -1049,7 +1052,8 @@ OnTouch:
 	}
 }
 
-//===================== TO 2F Warp ========================
+// To 2F Warp
+//============================================================
 1@cata,281,12,0	script	ins_bapho_to_2f	45,1,1,{
 
 OnTouch:
diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt
index 787c05a24..9dacc071f 100644
--- a/npc/kafras/kafras.txt
+++ b/npc/kafras/kafras.txt
@@ -21,9 +21,8 @@
 //= 1.0 Merged and cleaned up Kafras. [Joseph]
 //============================================================ 
 
-//===================================================
-// Aldebaran 
-//===================================================
+// Aldebaran
+//============================================================
 aldeba_in,96,181,4	script	Kafra Service	113,{
 	cutin "kafra_05",2;
 	mes "[Kafra Leilah]";
@@ -123,9 +122,8 @@ aldebaran,143,119,4	script	Kafra Employee::kaf_aldebaran	113,{
 	callfunc "F_KafEnd",0,1,"in the city of Al De Baran";
 }
 
-//===================================================
 // Geffen
-//===================================================
+//============================================================
 geffen,120,62,0	script	Kafra Employee::kaf_geffen	115,{
 	cutin "kafra_03",2;
 	callfunc "F_KafSet";
@@ -154,9 +152,8 @@ geffen,203,123,2	script	Kafra Employee::geffen2	114,{
 	callfunc "F_KafEnd",0,1,"in the city of Geffen";
 }
 
-//===================================================
 // Morocc
-//===================================================
+//============================================================
 morocc,156,97,4	script	Kafra Employee::kaf_morocc	113,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSet";
@@ -185,9 +182,8 @@ morocc,160,258,4	script	Kafra::kaf_morocc2	114,{
 	callfunc "F_KafEnd",0,1,"in the city of Morroc";
 }
 
-//===================================================
 // Payon
-//===================================================
+//============================================================
 payon,181,104,4	script	Kafra Employee::kaf_payon	113,{
 	cutin "kafra_05",2;
 	callfunc "F_KafSet";
@@ -229,9 +225,8 @@ pay_arche,55,123,0	script	Kafra Employee::kaf_payon3	115,{
 	callfunc "F_KafEnd",0,1,"at the Payon Dungeon";
 }
 
-//===================================================
 // Prontera
-//===================================================
+//============================================================
 prontera,152,326,3	script	Kafra Employee::kaf_prontera	112,{
 	cutin "kafra_06",2;
 	callfunc "F_KafSet";
@@ -302,9 +297,8 @@ prontera,146,89,6	script	Kafra Employee::kaf_prontera5	117,{
 	callfunc "F_KafEnd",0,1,"in the city of Prontera";
 }
 
-//===================================================
 // Yuno
-//===================================================
+//============================================================
 yuno,152,187,4	script	Kafra Employee::kaf_yuno	860,{
 	cutin "kafra_08",2;
 	callfunc "F_KafSet";
@@ -344,9 +338,8 @@ yuno,277,221,4	script	Kafra Employee::kaf_yuno3	861,{
 	callfunc "F_KafEnd",0,1,"in the city of Juno";
 }
 
-//===================================================
 // Alberta
-//===================================================
+//============================================================
 alberta,28,229,0	script	Kafra Employee::kaf_alberta	116,{
 	cutin "kafra_02",2;
 	callfunc "F_KafSet";
@@ -376,9 +369,8 @@ alberta,113,60,6	script	Kafra Employee::kaf_alberta2	112,{
 	callfunc "F_KafEnd",0,1,"in the city of Alberta";
 }
 
-//===================================================
 // Comodo
-//===================================================
+//============================================================
 comodo,195,150,4	script	Kafra Employee::kaf_comodo	721,{
 	cutin "kafra_07",2;
 	callfunc "F_KafSet";
@@ -407,9 +399,8 @@ cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
 	callfunc "F_KafEnd",0,1,"in Pyros Lighthouse";
 }
 
-//===================================================
 // Izlude
-//===================================================
+//============================================================
 -	script	kaf_izlude	-1,{
 	cutin "kafra_01",2;
 	callfunc "F_KafSet";
@@ -424,9 +415,8 @@ cmd_fild07,136,134,4	script	Kafra Employee::kaf_cmd_fild07	721,{
 	callfunc "F_KafEnd",0,1,"in the city of Izlude";
 }
 
-//===================================================
 // Moscovia
-//===================================================
+//============================================================
 moscovia,223,191,3	script	Kafra Employee::kaf_mosk	114,{
 	cutin "kafra_04",2;
 	callfunc "F_Kafra",0,3,0,80,700;
@@ -434,9 +424,8 @@ moscovia,223,191,3	script	Kafra Employee::kaf_mosk	114,{
 	callfunc "F_KafEnd",0,3,"in the city of Moscovia";
 }
 
-//===================================================
 // Amatsu
-//===================================================
+//============================================================
 amatsu,102,149,4	script	Kafra Employee::kaf_amatsu	116,{
 	cutin "kafra_02",2;
 	mes "[Kafra Employee]";
@@ -450,9 +439,8 @@ amatsu,102,149,4	script	Kafra Employee::kaf_amatsu	116,{
 	callfunc "F_KafEnd",0,1,"in the city of Amatsu";
 }
 
-//===================================================
 // Ayothaya
-//===================================================
+//============================================================
 ayothaya,212,169,5	script	Kafra Employee::kaf_ayothaya	116,{
 	cutin "kafra_02",2;
 	mes "[Kafra Employee]";
@@ -466,9 +454,8 @@ ayothaya,212,169,5	script	Kafra Employee::kaf_ayothaya	116,{
 	callfunc "F_KafEnd",0,1,"in the city of Ayotaya";
 }
 
-//===================================================
-// Einbech 
-//===================================================
+// Einbech
+//============================================================
 einbech,181,132,5	script	Kafra Employee#ein3::kaf_einbech	860,{
 	cutin "kafra_08",2;
 	mes "[Kafra Employee]";
@@ -481,9 +468,8 @@ einbech,181,132,5	script	Kafra Employee#ein3::kaf_einbech	860,{
 	callfunc "F_KafEnd",0,1,"in the town of Einbech";
 }
 
-//===================================================
 // Einbroch
-//===================================================
+//============================================================
 einbroch,242,205,5	script	Kafra Employee#ein2::kaf_einbroch	860,{
 	cutin "kafra_08",2;
 	mes "[Kafra Employee]";
@@ -510,9 +496,8 @@ einbroch,59,203,6	script	Kafra Employee#ein1::kaf_einbroch2	861,{
 	callfunc "F_KafEnd",0,1,"in the city of Einbroch";
 }
 
-//===================================================
 // Gonryun
-//===================================================
+//============================================================
 gonryun,159,122,4	script	Kafra Employee::kaf_gonryun	116,{
 	cutin "kafra_02",2;
 	mes "[Kafra Employee]";
@@ -526,9 +511,8 @@ gonryun,159,122,4	script	Kafra Employee::kaf_gonryun	116,{
 	callfunc "F_KafEnd",0,1,"in the city of Kunlun";
 }
 
-//===================================================
 // Lighthalzen
-//===================================================
+//============================================================
 lighthalzen,164,100,4	script	Kafra Employee::kaf_lighthalzen	860,{
 	cutin "kafra_08",2;
 	mes "[Kafra Employee]";
@@ -566,9 +550,8 @@ lhz_in02,237,284,4	script	Kafra Employee::kaf_lhz_in02	861,{
 	callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
 }
 
-//===================================================
 // Louyang
-//===================================================
+//============================================================
 louyang,210,104,5	script	Kafra Employee::kaf_louyang	117,{
 	cutin "kafra_01",2;
 	mes "[Kafra Employee]";
@@ -582,9 +565,8 @@ louyang,210,104,5	script	Kafra Employee::kaf_louyang	117,{
 	callfunc "F_KafEnd",0,1,"in the city of Louyang";
 }
 
-//===================================================
 // Umbala
-//===================================================
+//============================================================
 umbala,87,160,4	script	Kafra Employee::kaf_umbala	721,{
 	cutin "kafra_07",2;
 	callfunc "F_KafSet";
@@ -599,18 +581,16 @@ umbala,87,160,4	script	Kafra Employee::kaf_umbala	721,{
 	callfunc "F_KafEnd",0,1,"in the city of Umbala";
 }
 
-//===================================================
-// Niflheim 
-//===================================================
+// Niflheim
+//============================================================
 niflheim,202,180,3	script	Kafra Employee::kaf_niflheim	791,{
 	callfunc "F_Kafra",1,2,1,150,0;
 	savepoint "niflheim",192,182;
 	callfunc "F_KafEnd",1,1,"in the city of Niflheim";
 }
 
-//===================================================
 // Dungeons and Fields
-//===================================================
+//============================================================
 // - Byalan Island
 izlu2dun,106,58,8	script	Kafra Employee::kaf_izlu2dun	115,{
 	cutin "kafra_03",2;
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 320a61569..17acfc168 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -60,10 +60,8 @@
 //= 3.1 Added the new refinement & Ore creation NPC's for +11 and above Refinement. [Masao]
 //============================================================
 
-
-//=========================================================
 // Christopher: Geffen Blacksmith
-//=========================================================
+//============================================================
 geffen_in,110,172,0	script	Christopher#1	63,{
 	mes "[Christopher Guillenrow]";
 	mes "Welcome to Christopher's Workshop. Ye can get all yer stuff for forging here. What business";
@@ -328,9 +326,8 @@ geffen_in,110,172,0	script	Christopher#1	63,{
 	}
 }
 
-//=========================================================
 // Paul Spanner: Einbroch Blacksmith Supplier
-//=========================================================
+//============================================================
 ein_in01,38,29,0	script	Paul Spanner	63,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
@@ -565,9 +562,8 @@ ein_in01,38,29,0	script	Paul Spanner	63,{
 	}
 }
 
-//=====================================================================================
 // Weapon/Armor Refiners
-//=====================================================================================
+//============================================================
 prt_in,63,60,0	script	Hollgrehenn	85,{
 	callfunc "refinemain","Hollgrehenn",0;
 	end;
@@ -903,11 +899,8 @@ function	script	refinemain	{
 	close;
 }
 
-
-
-//==============================================================================
 // Material Salesmen
-//==============================================================================
+//============================================================
 prt_in,56,68,5	script	Vurewell	86,{
 	callfunc "phramain","Vurewell";
 	end;
@@ -937,8 +930,7 @@ lhz_in02,278,24,3	script	Krugg	86,{
 	end;
 }
 
-//============================================================
-//= Material Salesmen Functions
+// Material Salesmen Functions
 //============================================================
 function	script	phramain	{
 	if (checkweight(1201,1) == 0) {
@@ -1020,11 +1012,8 @@ function	script	phramain	{
 	close;
 }
 
-
-
-//==============================================================================
 // Ori/Elu Refiners
-//==============================================================================
+//============================================================
 prt_in,63,69,3	script	Dietrich	84,{
 	callfunc "orimain","Dietrich";
 	end;
@@ -1054,8 +1043,7 @@ lhz_in02,281,24,5	script	Fruel	84,{
 	end;
 }
 
-//============================================================
-//= Ori/Elu Functions
+// Ori/Elu Functions
 //============================================================
 function	script	orimain	{
 	if (checkweight(1201,1) == 0) {
@@ -1124,11 +1112,8 @@ function	script	orimain	{
 	}
 }
 
-
-
-//=====================================================================================
 // Equipment Repairmen
-//=====================================================================================
+//============================================================
 alberta_in,31,65,4	script	Repairman#alb	86,{
 	callfunc "repairmain","Repairman";
 	end;
@@ -1199,8 +1184,7 @@ sch_gld,340,80,7	script	Repairman#sch_gld	86,{
 	end;
 }
 
-//============================================================
-//= Equipment Repair Function
+// Equipment Repair Function
 //============================================================
 function	script	repairmain	{
 	set .@repairprice,5000;
@@ -1288,9 +1272,8 @@ function	script	repairmain	{
 	}
 }
 
-//=====================================================================================
 // +11 and above Weapon/Armor Refiners
-//=====================================================================================
+//============================================================
 prt_in,90,72,5	script	Bestry#prt	826,{
 	callfunc "refinenew","Bestry",0,0;
 	end;
@@ -1780,9 +1763,8 @@ function	script	refinenew	{
 	close;
 }
 
-//==============================================================================
 // Ori/Elu to Carnium/Bradium Refiners
-//==============================================================================
+//============================================================
 prt_in,85,71,5	script	Austry#prt	826,{
 	callfunc "oreref","Austry";
 	end;
@@ -1796,8 +1778,7 @@ morocc_in,60,38,5	script	Austry#moc	826,{
 	end;
 }
 
-//============================================================
-//= Ori/Elu to Carnium/Bradium Function
+// Ori/Elu to Carnium/Bradium Function
 //============================================================
 
 function	script	oreref	{
diff --git a/npc/other/card_trader.txt b/npc/other/card_trader.txt
index cc07c0b51..8afff06e7 100644
--- a/npc/other/card_trader.txt
+++ b/npc/other/card_trader.txt
@@ -19,44 +19,44 @@
 prontera,115,90,0	script	Putty	90,{
 	if (!.card[1]) {
 		setarray .card1[0], 4001,4006,4009,4019,4075,4033,4012,4016,4026,4022,
-						4027,4028,4038,4025,4021,4050,4079,4081,4090,4094,
-						4101,4104,4110,4114,4119,4108,4095,4231,4280,4008,
-						4011,4013,4014,4015,4020,4032,4037,4039,4041,4045,
-						4046,4010,4023,4029,4052,4048,4056,4071,4093,4031,
-						4036,4034,4042,4055,4061,4087,4096,4116,4122,4170,
-						4215,4220,4228,4226,4212,4227,4267,4257,4278,4286,
-						4287,4292,4311,4315,4319,4322,4084,4078,4113,4149,
-						4153,4196,4240,4247,4256,4057,4066,4067,4112,4150,
-						4152,4186,4187,4181,4173,4167,4162,4176,4195,4193,
-						4200,4223,4194,4190,4189,4192,4224,4244,4248,4261,
-						4260,4259,4274,4275,4313,4299,4304,4294,4076,4127,
-						4154,4157,4156,4213,4214,4225,4235;
+					4027,4028,4038,4025,4021,4050,4079,4081,4090,4094,
+					4101,4104,4110,4114,4119,4108,4095,4231,4280,4008,
+					4011,4013,4014,4015,4020,4032,4037,4039,4041,4045,
+					4046,4010,4023,4029,4052,4048,4056,4071,4093,4031,
+					4036,4034,4042,4055,4061,4087,4096,4116,4122,4170,
+					4215,4220,4228,4226,4212,4227,4267,4257,4278,4286,
+					4287,4292,4311,4315,4319,4322,4084,4078,4113,4149,
+					4153,4196,4240,4247,4256,4057,4066,4067,4112,4150,
+					4152,4186,4187,4181,4173,4167,4162,4176,4195,4193,
+					4200,4223,4194,4190,4189,4192,4224,4244,4248,4261,
+					4260,4259,4274,4275,4313,4299,4304,4294,4076,4127,
+					4154,4157,4156,4213,4214,4225,4235;
 		setarray .card2[0], 4293,4297,4288,4283,4295,4307,4308,4309,4132,4326,
-						4341,4335,4337,4345,4344,4331,4333,4332,4089,4161,
-						4177,4178,4180,4184,4191,4206,4199,4273,4282,4268,
-						4289,4321,4316,4343,4339,4369,4377,4385,4383,4382,
-						4380,4381,4378,4379,4390,4389,4388,4391,4405,4400,
-						4401,4402,4404,4002,4003,4004,4005,4007,4017,4024,
-						4030,4035,4040,4043,4044,4049,4051,4053,4058,4060,
-						4062,4063,4064,4065,4068,4069,4070,4072,4073,4074,
-						4077,4080,4082,4083,4085,4086,4088,4091,4092,4097,
-						4098,4099,4100,4102,4103,4106,4107,4109,4111,4115,
-						4117,4118,4120,4124,4125,4126,4138,4139,4141,4151,
-						4158,4164,4165,4182,4185,4159,4160,4166,4172,4175,
-						4188,4201,4202,4204,4205,4208,4209;
+					4341,4335,4337,4345,4344,4331,4333,4332,4089,4161,
+					4177,4178,4180,4184,4191,4206,4199,4273,4282,4268,
+					4289,4321,4316,4343,4339,4369,4377,4385,4383,4382,
+					4380,4381,4378,4379,4390,4389,4388,4391,4405,4400,
+					4401,4402,4404,4002,4003,4004,4005,4007,4017,4024,
+					4030,4035,4040,4043,4044,4049,4051,4053,4058,4060,
+					4062,4063,4064,4065,4068,4069,4070,4072,4073,4074,
+					4077,4080,4082,4083,4085,4086,4088,4091,4092,4097,
+					4098,4099,4100,4102,4103,4106,4107,4109,4111,4115,
+					4117,4118,4120,4124,4125,4126,4138,4139,4141,4151,
+					4158,4164,4165,4182,4185,4159,4160,4166,4172,4175,
+					4188,4201,4202,4204,4205,4208,4209;
 		setarray .card3[0], 4120,4216,4217,4219,4221,4222,4230,4234,4233,4232,
-						4237,4238,4242,4243,4245,4246,4249,4252,4255,4258,
-						4262,4264,4276,4270,4271,4218,4239,4251,4253,4269,
-						4334,4105,4133,4136,4229,4272,4277,4279,4281,4284,
-						4285,4290,4296,4298,4301,4310,4314,4317,4325,4327,
-						4328,4329,4338,4340,4346,4347,4348,4349,4350,4351,
-						4353,4354,4355,4356,4358,4360,4362,4364,4366,4368,
-						4370,4371,4373,4375,4387,4406,4129,4155,4291,4392,
-						4393,4394,4409,4410,4411,4412,4413,4414,4415,4416,
-						4417,4418,4420,4421,4422,4423,4424,4427,4427,4428,
-						4429,4431,4432,4433,4434,4435,4436,4437,4438,4439,
-						4440,4442,4443,4444,4445,4447,4448,4449,4450,4452,
-						4453;
+					4237,4238,4242,4243,4245,4246,4249,4252,4255,4258,
+					4262,4264,4276,4270,4271,4218,4239,4251,4253,4269,
+					4334,4105,4133,4136,4229,4272,4277,4279,4281,4284,
+					4285,4290,4296,4298,4301,4310,4314,4317,4325,4327,
+					4328,4329,4338,4340,4346,4347,4348,4349,4350,4351,
+					4353,4354,4355,4356,4358,4360,4362,4364,4366,4368,
+					4370,4371,4373,4375,4387,4406,4129,4155,4291,4392,
+					4393,4394,4409,4410,4411,4412,4413,4414,4415,4416,
+					4417,4418,4420,4421,4422,4423,4424,4427,4427,4428,
+					4429,4431,4432,4433,4434,4435,4436,4437,4438,4439,
+					4440,4442,4443,4444,4445,4447,4448,4449,4450,4452,
+					4453;
 		setarray .card[1],  getarraysize(.card1), getarraysize(.card2), getarraysize(.card3);
 	}
 	set .@points,oversea_event9;
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index d5b7d08b5..91db569e3 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -25,7 +25,6 @@
 //= 	Fixed Medal Distributor (Dual Race) disappears accordingly. [Joseph] 
 //============================================================
 
-//============================================================
 // Monstrer Race - Single Monster Race
 //============================================================
 hugel,51,61,0	script	#race_timer1-1	-1,{
@@ -996,7 +995,6 @@ p_track01,55,28,0	duplicate(Tire_1)	Tire6#4	-1,0,0
 p_track01,51,28,0	duplicate(Tire_1)	Tire6#5	-1,0,0
 p_track01,47,28,0	duplicate(Tire_1)	Tire6#6	-1,0,0
 
-//============================================================
 // Monstrer Race - Dual Monster Race
 //============================================================
 hugel,47,56,0	script	#race_timer2-1	-1,{
@@ -2037,8 +2035,7 @@ p_track02,55,28,0	duplicate(Tire_1)	Tire#race02_6_4	-1,0,0
 p_track02,51,28,0	duplicate(Tire_1)	Tire#race02_6_5	-1,0,0
 p_track02,47,28,0	duplicate(Tire_1)	Tire#race02_6_6	-1,0,0
 
-//============================================================
-// NPCs for Redeeming Price Medals (Einbroch and Hugel)
+// NPCs for Redeeming Prize Medals (Einbroch and Hugel)
 //============================================================
 ein_in01,85,208,5	script	Ei'felle#repay01	854,{
 	if (!ein_medal01) {
@@ -2769,7 +2766,6 @@ hugel,71,83,4	script	Wayne	900,{
 	}
 }
 
-//============================================================
 // Monstrer Race Affiliated NPCs
 //============================================================
 airplane,246,47,1	script	Eocatt#decoy01	878,{
diff --git a/npc/other/resetskill.txt b/npc/other/resetskill.txt
index 10e63fa0f..811d16aed 100644
--- a/npc/other/resetskill.txt
+++ b/npc/other/resetskill.txt
@@ -14,6 +14,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
 //============================================================
+
 prontera,146,232,4	script	Hypnotist#2	124,{
 	mes "[Hypnotist]";
 	mes "Greetings, adventurer.";
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 8eb6bfbe9..64f38d69d 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -35,11 +35,8 @@
 //= 2.4 Updated 'Doll Quest' to match AEGIS script. [Kisuka]
 //============================================================ 
 
-
-
-//=======================================================================================================//
-//						Doll Quest
-//=======================================================================================================//
+// Doll Quest
+//============================================================
 alberta,117,135,0	script	Elin	96,{
 	if (checkweight(1201,1) == 0) {
 		mes "[Elin]";
@@ -391,10 +388,8 @@ alberta,117,135,0	script	Elin	96,{
 	}
 }
 
-
-//=======================================================================================================//
-//						Boy's Cap' Quest
-//=======================================================================================================//
+// 'Boy's Cap' Quest
+//============================================================
 alberta_in,28,145,4	script	Grampa	120,{
 	mes "[Grampa]";
 	mes "*Gasp*...";
@@ -471,9 +466,8 @@ alberta_in,28,145,4	script	Grampa	120,{
 	}
 }
 
-//=======================================================================================================//
-//						Antlers Quest 
-//=======================================================================================================//
+// 'Antlers' Quest
+//============================================================
 alberta_in,122,53,4	script	Cherokee	47,{
 	mes "[Cherokee]";
 	mes "Hey there~!";
@@ -518,9 +512,8 @@ alberta_in,122,53,4	script	Cherokee	47,{
 	}
 }
 
-//=======================================================================================================//
-//			Bao Bao, Cresent Hairpin, Fashionbale Glasses, Heart Hairpin
-//=======================================================================================================//
+// 'Bao Bao', 'Crescent Hairpin', 'Fashionable Glasses', 'Heart Hairpin' Quest
+//============================================================
 alberta,120,53,1	script	Stylish Merchant#new30	51,{
 	if ((countitem(10007) > 0) && (countitem(968) > 49)) {
 		mes "[Zic]";
@@ -652,9 +645,8 @@ alberta,120,53,1	script	Stylish Merchant#new30	51,{
 	}
 }
 
-//=======================================================================================================//
-//				Hat of Sun God, Sunday Hat, Mage Hat, Magician Hat
-//=======================================================================================================//
+// 'Hat of the Sun God', 'Sunday Hat', 'Mage Hat', 'Magician Hat' Quest
+//============================================================
 alberta,136,79,1	script	Hat store girl#new30	71,{
 	mes "[Tempestra]";
 	mes "Ah, such a cool breeze. It's good to visit the seashore. I think it was the right choice to come here to take a break from my business.";
@@ -954,15 +946,14 @@ alberta,136,79,1	script	Hat store girl#new30	71,{
 	}
 }
 
-//=======================================================================================================//
-//						Turtle Quest
-//=======================================================================================================//
+// Turtle Quest
+//============================================================
 alberta,91,70,4	script	Kinsey#tur	89,{
 	mes "[Kinsey]";
 	mes "What does a man have to do to get a stiff drink around here? I mean, there are absolutely no good bars in Alberta!";
 	next;
 	mes "[Kinsey]";
-	mes " Well, the alcohol in the pub here is second rate, but I gotta admit, it's got a great atmosphere.";
+	mes "Well, the alcohol in the pub here is second rate, but I gotta admit, it's got a great atmosphere.";
 	next;
 	mes "[Kinsey]";
 	mes "In fact, this old man is always there, telling stories about Turtle Island! But we're not sure if he's been there, or if he's just that drunk.";
diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt
index 9a4bde3f1..eb3ef7e38 100644
--- a/npc/quests/quests_aldebaran.txt
+++ b/npc/quests/quests_aldebaran.txt
@@ -15,10 +15,8 @@
 //= 1.3 Updated headgear NPC. [L0ne_W0lf]
 //============================================================ 
 
-
-//=======================================================================================================//
-//			'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quest
-//=======================================================================================================//
+// 'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quest
+//============================================================
 aldeba_in,152,166,4	script	Trader#01	86,{
 	mes "[Trader]";
 	mes "Who is this mysterious man?";
diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt
index 1ac2330b1..b7f4550d7 100644
--- a/npc/quests/quests_geffen.txt
+++ b/npc/quests/quests_geffen.txt
@@ -16,9 +16,8 @@
 //= 1.4 Updated welding mask and headset quests. [L0ne_W0lf]
 //============================================================ 
 
-//==============================================================================================//
-// 					Blacksmith: 'Welding Mask' Quest
-//==============================================================================================//
+// Blacksmith: 'Welding Mask' Quest
+//============================================================
 geffen_in,144,166,4	script	Blacksmith	63,{
 	mes "[Blacksmith]";
 	mes "You've never heard of me? Why, I'm the Veteran Blacksmith of this land. I've spent 30 years in this hot and bloody hellfire, bending steel to my iron will!";
@@ -83,11 +82,8 @@ geffen_in,144,166,4	script	Blacksmith	63,{
 	}
 }
 
-
-
-//=============================================================================================//
-//					Eric: Headset Quest
-//=============================================================================================//
+// Eric: 'Headset' Quest
+//============================================================
 geffen_in,30,71,4	script	Eric	83,{
 	mes "[Eric]";
 	mes "Please listen";
@@ -136,11 +132,11 @@ geffen_in,30,71,4	script	Eric	83,{
 		close;
 	case 3:
 		if ((countitem(999) > 39) && (countitem(984) > 0) && (countitem(970) > 0) && (countitem(1003) > 0)) {
-			delitem 999,40;  //Steel
-			delitem 984,1;  //Oridecon
-			delitem 970,1;  //Alchol
-			delitem 1003,1;  //Coal
-			getitem 5001,1; // Headset
+			delitem 999,40; //Steel
+			delitem 984,1; //Oridecon
+			delitem 970,1; //Alchol
+			delitem 1003,1; //Coal
+			getitem 5001,1; //Headset
 			mes "*Tap! Tap! Tap!*";
 			next;
 			mes "[Eric]";
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index d81eedd54..f4e7bfa0f 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -5,7 +5,7 @@
 //===== Current Version: =====================================
 //= 2.1
 //===== Compatible With: =====================================
-//= rAthena
+//= rAthena SVN
 //===== Description: =========================================
 //= Quest NPC's related to Hugel
 //===== Additional Comments: =================================
@@ -27,10 +27,8 @@
 //=     - Juno Remedy Quest
 //============================================================
 
-//-------------------------------------------------------------------------
 // Medicine Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 hu_in01,387,245,0	script	Allen Schuwell	849,2,2,{
 
 	if(BaseLevel > 49)
@@ -799,10 +797,8 @@ OnTimer4500:
 	
 }
 
-//-------------------------------------------------------------------------
 // Biological Weapon Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 ein_in01,16,36,3	script	Morriphen	86,{
 
 	if(hg_bio == 0)
@@ -2057,10 +2053,8 @@ lhz_in03,193,28,3	script	Makkie	83,{
 	
 }
 
-//-------------------------------------------------------------------------
 // Rebellion Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 hugel,70,137,5	script	Shede	879,{
 
 	cutin "siide1.bmp",2;
@@ -3500,14 +3494,14 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "in creating a type of machine called ^FF0000Guardian^000000.";
 					mes "I have a bad feeling about that, so I decided to write a journal";
 					mes "starting from today and keep everything in record.";
-					mes "��";
+					mes " ";
 					mes "\"^FF0000Guardian^000000\" is an android";
 					mes "that was created based on the idea of \"^3131FFGiantes^000000\",";
 					mes "the giant tribe that was said to live in an ancient age.";
 					mes "It is memorized with various commands,";
 					mes "so it is said to handle difficult things for humans as protecting";
 					mes "important facilities and such.";
-					mes "��";
+					mes " ";
 					mes "However, those things are our job, the mercenary soldiers' job.";
 					mes "Mercenary soldier groups in many areas";
 					mes "are already agitated by the news of the Guardian creation.";
@@ -3543,7 +3537,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "hard works. But it doesn't seem to be true.";
 					mes "To me, they are nothing but \"^FF0000weapons of mass destruction^000000\".";
 					mes "Perhaps, they might be intended to be that way from the beginning.";
-					mes "��";
+					mes " ";
 					mes "What is going to be next after we finish testing the machines?";
 					mes "No matter how bad other people criticize us for being greedy toward money,";
 					mes "we always take pride in what we are doing, and we always do our best.";
@@ -3551,7 +3545,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "But, now, we are losing our place to the lifeless machines.";
 					mes "Many people have quit this job after the machines were introduced.";
 					mes "I must admit that I am also being shaken by the thought.";
-					mes "��";
+					mes " ";
 					mes "Bah, god damn you, Rekenber! You just have created the worst invention in history!";
 					next;
 					mes "...............................";
@@ -3579,7 +3573,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "One of the guardians caused an error and brought havoc.";
 					mes "While we were terrified and didn't know what to do, that broken guardian";
 					mes "crushed the commander of 'Blade Canine Mercenary' to death.";
-					mes "��";
+					mes " ";
 					mes "I can't remember how we could regain control over the broken guardian.";
 					mes "My mind is still baffled for the fact that that machine actually killed an innocent guy as I was kind of worried about.";
 					mes "Many people were dispatched from Rekenber to investigate this matter, so hopefully they will figure out";
@@ -3601,17 +3595,17 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "Rekenber must have bribed the upper management of our troops with money.";
 					mes "Otherwise, why would they want us to keep our mouth sealed about a such shocking incident?";
 					mes "We, angry mercenary soldiers burst into rage right after the morning session was over.";
-					mes "��";
+					mes " ";
 					mes "We went ahead and spread the story about the shocking incident to every mercenary troops.";
 					mes "And then we destroyed every guardian which we found in hangars.";
 					mes "The sounds of hammering metal and sirens were echoing everywhere, everywhere you went.";
-					mes "��";
+					mes " ";
 					mes "...We took refuge in a safe place out of our unit because of what happened.";
 					mes "We are planning to assert our social security to the public and inform the public with";
 					mes "the danger of the guardians and the negligence of the government and Rekenber toward the incident.";
 					mes "Our leader told us that he has sent out letters to every mercenary troop";
 					mes "to encourage them to participate in what we are trying to do.";
-					mes "��";
+					mes " ";
 					mes "I feel like...that I have just turn into a no-way-out.";
 					mes "I am facing my future with a deep sense of gloom.";
 					next;
@@ -3648,7 +3642,7 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "But we were too weak to compete with their invincible guardians. We were literally swept away.";
 					mes "They were quicker than we expected in taking action, and lines and lines of guardians were coming after us.";
 					mes "There was nothing that we could do. We met with a disastrous defeat in the battle with guardians.";
-					mes "��";
+					mes " ";
 					mes "Everybody is still in shock, but we can't give up now.";
 					mes "I think that we are going to visit a house of a sage called \"Varmunt\" early in the morning.";
 					mes "I don't know why, but it seems that the sage is against the use of guardians.";
@@ -3695,13 +3689,13 @@ hu_in01,317,312,0	script	Book	111,{
 					mes "Although I didn't have a time to write a journal that time, the last fight in the Varmunt mansion turned out to be our miserable defeat...as I was worried.";
 					mes "I was told that Sage Varmunt disappeared after the fight, and all of his documents were taken by Rekenber.";
 					mes "I am afraid that they might create a more powerful version of the existing guardian by using his documents.";
-					mes "��";
+					mes " ";
 					mes "I lost one arm during the last fight, and I barely escaped to Hugel.";
 					mes "I feel so lucky to be in Hugel, because when I arrived, I was a total mess with only one arm,";
 					mes "but the people in this town did not ask me anything but welcomed me.";
 					mes " ";
 					mes "I have nowhere to go any longer. I am planning to live my life here as long as nothing happens soon.";
-					mes "��";
+					mes " ";
 					mes "My arm is throbbing with pain again. The history of mercenary soldiers ended, and I need to rest.";
 					mes "I hope that this will be the last page of my journal.";
 					if(hg_tre == 48) set hg_tre,49;
@@ -4607,10 +4601,8 @@ hu_in01,377,106,3	script	Pub Granny	892,{
 	close;
 }
 
-//-------------------------------------------------------------------------
 // Memory Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 hugel,198,169,0	script	#HugelTree	139,2,2,{
 
 	if(BaseLevel > 49)
@@ -5379,10 +5371,8 @@ hugel,196,164,3	script	El Schatt	50,{
 
 }
 
-//-------------------------------------------------------------------------
-// Hide and Seek quest
-//-------------------------------------------------------------------------
-
+// Hide and Seek Quest
+//============================================================
 hugel,107,67,3	script	Torpy	706,{
 
 	if(BaseLevel > 49)
@@ -6033,10 +6023,8 @@ OnTimer60000:
 	
 }
 
-//-------------------------------------------------------------------------
-// Fish cake soup delivery
-//-------------------------------------------------------------------------
-
+// Fish Cake Soup Delivery Quest
+//============================================================
 hu_in01,15,372,3	script	Cellette Lavit	74,{
 
 	if(!hg_odeng)
@@ -6810,10 +6798,8 @@ hugel,102,161,3	script	Erjan	100,{
 	}
 }
 
-//-------------------------------------------------------------------------
 // Juno Remedy Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 yuno,111,156,3	script	Euslan	90,{
 
 	if(BaseLevel < 60)
@@ -7614,10 +7600,8 @@ OnTouch:
 	}
 }
 
-//-------------------------------------------------------------------------
 // Cow Milking Quest
-//-------------------------------------------------------------------------
-
+//============================================================
 hugel,56,104,3	script	Kurupe	709,3,3,{
 
 	if(hg_milk == 1)
@@ -8467,10 +8451,8 @@ function	script	Func_MilkCow	{
 	close;
 }
 
-//-------------------------------------------------------------------------
-// Odin Temple Excavation quest
-//-------------------------------------------------------------------------
-
+// Odin Temple Excavation Quest
+//============================================================
 hugel,91,152,1	script	Sign	837,{
 
 	mes "**Recruitment Notice**";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 7d686ad92..64d468837 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -79,8 +79,8 @@
 //= 4.7 Fixed missing label. (bugreport:4654) [L0ne_W0lf]
 //============================================================ 
 
-// Gangster Alert [Aegis Conversion]
-//------------------------------------------------------------
+// Gangster Alert [Official Conversion]
+//============================================================
 lighthalzen,1,1,0	script	Law Enforcement	-1,{
 	end;
 
@@ -236,10 +236,8 @@ lighthalzen,294,223,7	script	Guard#lhz02	868,{
 	}
 }
 
+// Cube Room Quest
 //============================================================
-// Cube Room
-//============================================================
-
 lighthalzen,341,224,3	script	Fishbone	868,{
 	// Retain prior position in quest.
 	if (piciburn) {
@@ -1759,10 +1757,8 @@ OnTouch:
 	close;
 }
 
-//============================================================
 // Lighthalzen Pickpocket Mini-Quest
 //============================================================
-
 lighthalzen,240,216,4	script	Suspicious Guy#lhz_01	870,2,2,{
 	end;
 
@@ -2086,10 +2082,8 @@ OnTouch:
 	}
 }
 
-//==============================================================
-// Friendship
-//==============================================================
-
+// Friendship Quest
+//============================================================
 lhz_in02,201,210,5	script	Digotz	869,{
 	if (BaseLevel < 50) {
 		mes "[Digotz]";
@@ -3403,8 +3397,8 @@ yuno_in04,168,117,3	script	Book#lhz	111,{
 	close;
 }
 
-///Cursed Spirit Quest
-
+// Cursed Spirit Quest
+//============================================================
 lhz_dun01,147,106,0	script	#kiz01-1	-1,3,3,{
 OnTouch_:
 	if (countitem(7345) > 0 ) {
@@ -6371,8 +6365,8 @@ lhz_in01,269,114,3	script	A File#li-1	111,{
 	close;
 }
 
-// President Quest aka. Schwartzvalt Trilogy Quest
-
+// President Quest, a.k.a. Schwartzvalt Triology Quest
+//============================================================
 lighthalzen,179,170,4	script	Ordinary Man	98,{
 
 	if(!lhz_boss)
@@ -10339,7 +10333,7 @@ lhz_in02,19,274,2	script	Maintenance Guy	851,{
 }
 
 // Rekenber Job Quest
-
+//============================================================
 lhz_in01,174,258,3	script	Young Man#reken	868,{
 
 	if(lhz_rekenber > 21)
diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt
index 4dd43840c..c23c5ba31 100644
--- a/npc/quests/quests_niflheim.txt
+++ b/npc/quests/quests_niflheim.txt
@@ -28,9 +28,8 @@
 //=     Clicking will do nothing, you have to still "touch" the npc. 
 //============================================================ 
 
-//=============================================================
-//Piano Quest
-//=============================================================
+// Piano Quest
+//============================================================
 niflheim,224,243,3	script	Alreg#nif	795,{
 	if (nif_piano) set nif_piano,0;
 	mes "[Alreg]";
@@ -114,12 +113,8 @@ nif_in,105,81,3	script	Crayu#nif	794,{
 			mes "favorite guests. Here's a";
 			mes "little reward for you.";
 			next;
-			if (nif_esc == 1) {
-				set nif_esc,3;
-			}
-			else {
-				set nif_esc,6;
-			}
+			if (nif_esc == 1) set nif_esc,3;
+			else set nif_esc,6;
 			getitem 7184,1; //Piano_Keyboard
 			mes "[Crayu]";
 			mes "Lastly, I hope you will show your";
@@ -190,12 +185,10 @@ OnTouch:
 		next;
 		mes "^3355FFWould you like to pick it up?^000000";
 		if (select("Yes:No") == 1) {
-			if (nif_esc < 10) {
+			if (nif_esc < 10)
 				set nif_esc,nif_esc+2;
-			}
-			else if (nif_esc == 10) {
+			else if (nif_esc == 10)
 				set nif_esc,11;
-			}
 			getitem 7184,1; //Piano_Keyboard
 		}
 		close;
@@ -301,9 +294,8 @@ nif_in,188,168,3	script	Witch#nif	792,{
 	end;
 }
 
-//=============================================================
 // Message Delivery Quest
-//=============================================================
+//============================================================
 prt_in,161,20,3	script	Erious#nif	92,{
 	if (MISC_QUEST & 16384) {
 		mes "[Erious]";
@@ -578,12 +570,7 @@ umbala,215,181,3	script	Billik	733,{
 niflheim,153,215,3	script	Feylin	794,{
 	if (nif_revive == 2) {
 		mes "[Feylin]";
-		if (Sex == 1) {
-			mes "Poor guy...";
-		}
-		else {
-			mes "Poor girl...";
-		}
+		mes "Poor "+((Sex)?"guy":"girl")+"...";
 		mes "Dying at such a young age...";
 		mes "I am always sorry to see the";
 		mes "young pass away.";
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index 0e1f7ab66..719e3a543 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -9,7 +9,6 @@
 //===== Description: ========================================= 
 //= Pretend Murder, Ear Muffs, Oxygen, Derivuchi Cap, Helm of Angel Quests.
 //===== Additional Comments: ================================= 
-//= Fully working
 //= 1.1 Helm of Angel bug fixed [Lupus]
 //= 1.2 Fixed skirt of virgin [Lupus]
 //= 1.3 Fixed exploits [Lupus]
@@ -20,11 +19,8 @@
 //= 1.7 Updated headgear quests. [L0ne_W0lf]
 //============================================================ 
 
-
-
-//==========================================================================================//
-//				Pretend Murdered quest
-//==========================================================================================//
+// 'Pretend Murdered' Quest
+//============================================================
 payon_in01,99,72,4	script	Granny	103,{
 	if (checkweight(908,1) == 0) {
 		mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
@@ -75,9 +71,8 @@ payon_in01,99,72,4	script	Granny	103,{
 	}
 }
 
-//========================================================================================//
-//					Ear Muffs Quest
-//========================================================================================//
+// 'Ear Muffs' Quest
+//============================================================
 payon_in01,18,10,4	script	Mystic Lady	76,{
 	mes "[Mystic Lady]";
 	mes "My family has produced and sold the special Winter product ^3355FFEar Muffs^000000 for many years. We just moved here, but the weather is always warm so we can hardly make a living.";
@@ -124,9 +119,8 @@ payon_in01,18,10,4	script	Mystic Lady	76,{
 	}
 }
 
-//========================================================================================//
-//					Oxygen Mask Quest
-//========================================================================================//
+// 'Oxygen Mask' Quest
+//============================================================
 payon_in02,25,71,4	script	Boy	86,{
 	if (countitem(701) > 4) {
 		mes "[Young Man]";
@@ -220,9 +214,8 @@ payon_in02,25,71,4	script	Boy	86,{
 	}
 }
 
-//========================================================================================//
-//			Derivuchi Cap(Hat of Petite Diablo), Helm of Angel
-//========================================================================================//
+// 'Helm of Angel' and 'Deviruchi Cap' Quest
+//============================================================
 payon_in01,56,12,7	script	Young man#12	89,{
 	mes "[Young man]";
 	mes "...What is it?";
@@ -232,7 +225,7 @@ payon_in01,56,12,7	script	Young man#12	89,{
 		mes "[Young man]";
 		mes "Huh? So you already know what I specialize in, eh? I suppose there's no need for the usual secrecy. Tell me what you want.";
 		next;
-		switch(select("Helm of Angel.:Deviruchi cap.:I will come next time.")) {
+		switch(select("Helm of Angel.:Deviruchi Cap.:I will come next time.")) {
 		case 1:
 			mes "[Young man]";
 			mes "1 Helm (with slot).";
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index e7b632cc2..11a5f1acb 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -10,18 +10,18 @@
 //= [Aegis Conversion]
 //= Umbalian Language Quest, Umbala Skeletal Gate Quest,
 //= Umbala Event, Create Essence/Dismantle Stone
-//	Phase1.Learning the Language
-//	1	(Elder)First discussion
-//	2	(Elder)Asking about learning the language
-//	3	(Elder)Final step (understanding NPC speech)
+//	Phase 1. Learning the Language
+//	  (Elder) First discussion
+//	  (Elder) Asking about learning the language
+//	  (Elder) Final step (understanding NPC speech)
 //	------------------------------------------
-//	Phase2.Create Essence/Dismantle Stone
-//	4	(Shaman)Get permission to speak with her from the chief
-//	5	(Elder)Ask about conditions needed to be fulfilled to get permission
-//	6	(Elder)Get permission
-//	7	(Shaman)Use the shaman to create essences and dismantle elemental stones.
+//	Phase 2. Create Essence/Dismantle Stone
+//	 (Shaman) Get permission to speak with her from the chief
+//	  (Elder) Ask about conditions needed to be fulfilled to get permission
+//	  (Elder) Get permission
+//	 (Shaman) Use the shaman to create essences and dismantle elemental stones.
 //= Umbala Domestic Dispute?
-//= - This quest is only avaliable if you ahve not done language quest.
+//= - This quest is only avaliable if you have not done language quest.
 //= - Variables in use: um_wind, MISC_QUEST (Bit 32768)
 //===== Additional Comments: ================================= 
 //= fixed by x[tsk], Lupus, PoW
@@ -39,9 +39,8 @@
 //= 2.2a Fixed weight check from previous update. [L0ne_w0lf]
 //============================================================ 
 
-//==============================================================================
-// Umbala Language Quest
-//==============================================================================
+// Umbalian Language Quest
+//============================================================
 um_in,39,122,5	script	Utan Chief	784,{
 	if (event_umbala == 0) {
 		mes "[Karkatan]";
@@ -363,9 +362,8 @@ um_in,39,122,5	script	Utan Chief	784,{
 	}
 }
 
-//=====================================================================
-//                    Create Essence/Dismantle Stone
-//=====================================================================
+// Create Essence/Dismantle Stone Quest
+//============================================================
 um_in,44,71,2	script	Utan Shaman	782,{
 	if (checkweight(908,600) == 0) {
 		mes "^3355FFWait a second!";
@@ -981,9 +979,7 @@ umbala,221,193,1	script	#Skulldoor	111,{
 	}
 }
 
-
-//============================================================ 
-// Umbala Domestic Dispute
+// Umbala Domestic Dispute Quest
 //============================================================ 
 um_in,139,48,5	script	Phrenetan	783,{
 	if (event_umbala >= 3) {
diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index 9acf3b7fa..69c7d67c1 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -36,7 +36,7 @@
 //============================================================ 
 
 // Metto Quest
-
+//============================================================
 yuno_in03,26,39,3	script	Metto#juno	709,{
 	mes "[Metto]";
 	if (metto_q == 0) {
@@ -424,7 +424,8 @@ yuno_in03,178,43,0	script	CiCi#juno	121,{
 	}
 }
 
-// Alechmist Brothers
+// Alchemist Brothers Quest
+//============================================================
 yuno_in01,103,157,3	script	Bain#juno	98,{
 	if (checkweight(1201,1) == 0) {
 		mes "- Wait a minute !! -";
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index da2bb5074..6f578a825 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -16,9 +16,8 @@
 //= 1.3 Fixed Eden Group Officer's level requirement. [Joseph]
 //============================================================
 
-//============================================================================
-// Sprakki (Start of Novice Training Ground, Outside Castle)
-//============================================================================
+// Sprakki (Stard of Novice Training Ground, Outside Castle)
+//============================================================
 new_1-1,53,114,4	script	Sprakki#nv1	90,{
 	if(job_novice_q < 1) {
 		mes "[Sprakki]";
@@ -68,9 +67,8 @@ new_1-1,53,114,4	script	Sprakki#nv1	90,{
 	}
 }
 
-//============================================================================
 // Sprakki (Inside Castle)
-//============================================================================
+//============================================================
 new_1-2,100,29,4	script	Sprakki#nv2	90,{
 	if(job_novice_q < 1) {
 		mes "[Sprakki]";
@@ -138,9 +136,8 @@ new_1-2,100,29,4	script	Sprakki#nv2	90,{
 	}
 }
 
-//============================================================================
 // Instructor Brade
-//============================================================================
+//============================================================
 new_1-2,100,105,4	script	Brade#nv	733,{
 	if(job_novice_q < 3) {
 		mes "[Instructor Brade]";
@@ -408,9 +405,8 @@ new_1-2,100,105,4	script	Brade#nv	733,{
 	}
 }
 
-//============================================================================
 // Instructor Jinha
-//============================================================================
+//============================================================
 new_1-2,115,120,4	script	Jinha#nv	59,{
 	if(job_novice_q < 7) {
 		mes "[Jinha]";
@@ -486,9 +482,8 @@ new_1-2,115,120,4	script	Jinha#nv	59,{
 	}
 }
 
-//============================================================================
 // People/Services in Ragnarok
-//============================================================================
+//============================================================
 // ---------- Chocolat ----------
 new_1-2,32,172,4	script	Chocolat#nv	96,{
 	if(job_novice_q < 9) {
@@ -870,9 +865,8 @@ new_1-2,35,176,4	script	Soldier#nv	105,{
 	}
 }
 
-//============================================================================
 // Instructor Brade (Real Combat Training)
-//============================================================================
+//============================================================
 -	script	Brade#nv::NvBrade	733,{
 	if(job_novice_q < 14) {
 		mes "[Brade]";
@@ -982,9 +976,8 @@ new_3-3,96,30,4	duplicate(NvBrade)	Brade#nv3	733
 new_4-3,96,30,4	duplicate(NvBrade)	Brade#nv4	733
 new_5-3,96,30,4	duplicate(NvBrade)	Brade#nv5	733
 
-//============================================================================
 // Job Guides (Real Combat Training)
-//============================================================================
+//============================================================
 // --------------------------- Deletion Function ------------------------------
 function	script	F_NvErase	{
 	if (getarg(0,0)) {
@@ -1961,9 +1954,8 @@ new_3-3,97,50,4	duplicate(NvEdn)	Eden Group Officer#nv3	729,5,5
 new_4-3,97,50,4	duplicate(NvEdn)	Eden Group Officer#nv4	729,5,5
 new_5-3,97,50,4	duplicate(NvEdn)	Eden Group Officer#nv5	729,5,5
 
-//============================================================================
 // Merchant (Real Combat Training)
-//============================================================================
+//============================================================
 -	shop	Merchant#nv::NvPotato	93,516:15
 
 new_1-3,100,50,4	duplicate(NvPotato)	Merchant#nv1	93
@@ -1972,9 +1964,8 @@ new_3-3,100,50,4	duplicate(NvPotato)	Merchant#nv3	93
 new_4-3,100,50,4	duplicate(NvPotato)	Merchant#nv4	93
 new_5-3,100,50,4	duplicate(NvPotato)	Merchant#nv5	93
 
-//============================================================================
 // Trainer (Real Combat Training)
-//============================================================================
+//============================================================
 -	script	Level 1 Trainer#nv::NvBrutus	84,{
 	mes "[Trainer Brutus]";
 	mes "These monsters are all weak and easy to kill. But be careful, a lot of them are aggressive and out for blood!";
@@ -2037,9 +2028,8 @@ new_3-3,103,50,4	duplicate(NvBrutus)	Level 3 Trainer#nv3	84
 new_4-3,103,50,4	duplicate(NvBrutus)	Level 4 Trainer#nv4	84
 new_5-3,103,50,4	duplicate(NvBrutus)	Level 5 Trainer#nv5	84
 
-//============================================================================
 // Random Stuff (Guards & Bulletin Board)
-//============================================================================
+//============================================================
 new_1-1,66,114,4	script	Bulletin Board#nv	111,{
 	mes "^FF0000=================================^000000";
 	mes "^FF0000 ^000000 ^E40CAA[Welcome]^CC0000 to ^FF9000Novice^7FFF00 Training ^00FF00Grounds ^E40CAA[Welcome]^FF0000^000000";
@@ -2083,9 +2073,8 @@ new_1-2,161,182,5	script	Instructor#nv	92,{
 	end;
 }
 
-//============================================================================
 // Real Combat Training Mobs
-//============================================================================
+//============================================================
 new_1-3,0,0,0,0	monster	ChonChon	1011,10,0,0,0
 new_1-3,0,0,0,0	monster	Drops	1113,10,0,0,0
 new_1-3,0,0,0,0	monster	Fabre	1184,5,0,0,0