* Fixed bugs in some items. (bugrepot:2059)

* Added stats for some mobs, and fixed some others.

* Rather large update to the Keil Hyre quest.
- Update does not add any of the changes made by iRO.
- Many updates, see script or tracker for details.
* Fixed condition check in turtle island warper. (bugreport:1943)
* Removed the duplicate NPC "Mudie" from Hugel City. (bugreport:2079)
* Corrected Umbala Dismantle/create Essence NPC. (bugreport:2089)


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

8 files changed, 2829 insertions, 3259 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 3ddb0fc95..3de1a8db2 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -40,6 +40,9 @@
 	2385 Recuvative_Armor		Should trigger HP/SP return with magical kills as well.
 
 =======================
+2008/08/19
+	* Rev. 13091 Fixed bugs in some items. (bugrepot:2059) [L0ne_W0lf]
+	* Added stats for some mobs, and fixed some others.
 2008/08/15
 	* Fixed: incorrect item id (bugreport:2063) [Yommy]
 2008/08/14
diff --git a/db/item_db.txt b/db/item_db.txt
index 72742050d..23811fb93 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1231,7 +1231,7 @@
 2384,Spiritual_Tunic,Spiritual Tunic,5,20,,0,,10,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus2 bSubEle,Ele_Neutral,20; bonus2 bSubEle,Ele_Water,20; bonus bMaxHP,800; bonus2 bResEff,Eff_Freeze,10000; },{},{}
 2385,Recuperative_Armor,Recuperative Armor,5,20,,0,,12,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus bNoRegen,1; bonus bNoRegen,2; bonus bHPGainValue,60; bonus bSPGainValue,6; bonus bLoseSPWhenUnequip,100; },{},{}
 2386,Chameleon_Armor,Chameleon Armor,5,20,,1700,,5,,0,0x00CFDF80,2,2,16,,70,1,0,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus bDef,3; else if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) bonus bMDef,5; },{},{}
-2387,Sprint_Mail,Sprint Mail,5,20,,100,,1,,1,0x00CFDF80,2,2,16,,0,1,0,{ bonus bVit,1; bonus bHPrecovRate,5; bonus2 bAddItemHealRate,IG_Recovery,3; },{},{}
+2387,Sprint_Mail,Sprint Mail,5,20,,1000,,1,,1,0x00CFDF80,2,2,16,,0,1,0,{ bonus bVit,1; bonus bHPrecovRate,5; bonus2 bAddItemHealRate,IG_Recovery,3; },{},{}
 2388,Gandora,Gandora,5,20,,300,,4,,1,0x00021040,2,2,16,,70,1,0,{ bonus bAgi,1; bonus bFlee,5; bonus bAspdRate,2; },{},{}
 2389,Naga_Scale_Armor,Naga Scale Armor,5,20,,1000,,5,,1,0x00CFDF80,2,2,16,,0,1,0,{ bonus bMDef,2; bonusautoscript2 "{ sc_start SC_INCBASEATK,10000,10; }",10; },{},{}
 2390,Refined_Tights,Refined Tights,5,20,,400,,6,,1,0x00080808,2,2,16,,75,1,0,{ bonus bMDef,2; bonus bFlee2,3; },{},{}
@@ -1448,8 +1448,8 @@
 2714,Marvelous_Pandent,Marvelous Pendant,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 2715,Skul_Ring_,Skull Ring,5,10000,,100,,0,,1,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bSubRace,RC_Undead,1; },{},{}
 2716,Librarian_Gloves,Librarian Gloves,5,20,,100,,0,,1,0x00812200,7,2,136,,0,0,0,{ bonus MaxSP,20; if (getiteminfo(getequipid(EQI_HAND_R),11) == 15 && isequipped(2717)) { bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; } },{},{}
-2717,Pocket_Watch,Pocket Watch,5,20,,100,,0,,0,0x00010204,7,2,136,,80,0,0,{},{},{}
-2718,Lunatic_Brooch,Lunatic Brooch,5,20,,100,,0,,1,0x00080808,7,2,136,,65,0,0,{},{},{}
+2717,Pocket_Watch,Pocket Watch,5,20,,200,,0,,0,0x00010204,7,2,136,,80,0,0,{},{},{}
+2718,Lunatic_Brooch,Lunatic Brooch,5,20,,200,,0,,1,0x00080808,7,2,136,,65,0,0,{},{},{}
 2719,Iron_Wrist,Iron Wrist,5,20,,700,,1,,0,0x000444A2,2,2,136,,50,0,0,{ bonus2 bSkillAtk,"SM_BASH",6; bonus2 bSkillAtk,"MC_MAMMONITE",6; },{},{}
 2720,Medal_Swordman,Medalion,5,0,,0,,1,,0,0x00004082,7,2,136,,70,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bHit,10; bonus bMaxHP,500; bonus bMaxSP,50; bonus2 bAddEff,Eff_Stun,100; },{},{}
 2721,Medal_Thief,Medalion,5,0,,0,,1,,0,0x00021040,7,2,136,,70,0,0,{ bonus bAtkRate,5; bonus bMatkRate,5; bonus bFlee,10; bonus bMaxHP,300; bonus bMaxSP,80; bonus2 bAddEff,Eff_Poison,100; },{},{}
@@ -1915,11 +1915,11 @@
 4410,Echio_Card,Echio Card,6,20,,10,,,,,,,,16,,,,,{ bonus bBaseAtk,15; if (BaseClass == Job_Swordman) bonus bMaxHP,500; },{},{}
 4411,Vanberk_Card,Vanberk Card,6,20,,10,,,,,,,,769,,,,,{ bonus bStr,2; bonusautoscript "{ specialeffect2 EF_ENHANCE; sc_start SC_INCCRI,5000,100; }",50; },{},{}
 4412,Isilla_Card,Isilla Card,6,20,,10,,,,,,,,769,,,,,{ bonus bInt,2; bonusautoscript "{ specialeffect2 EF_SUFFRAGIUM; sc_start SC_FASTCAST,5000,50; sc_start SC_INCFLEE,5000,30; }",500,BF_MAGIC; },{},{}
-4413,Hodremlin_Card,Hodremlin Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubSize,0,15; bonus2 bSubSize,1,15; bonus2 bSubSize,2,15; bonusautoscript2 "{ sc_start SC_INCFLEE2,10000,30; }",10,BF_WEAPON|BF_MAGIC; },{},{}
+4413,Hodremlin_Card,Hodremlin Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubSize,0,15; bonus2 bSubSize,1,15; bonus2 bSubSize,2,15; bonusautoscript2 "{ specialeffect2 EF_WIND; sc_start SC_INCFLEE2,10000,30; }",30,BF_WEAPON|BF_MAGIC; },{},{}
 4414,Seeker_Card,Seeker Card,6,20,,10,,,,,,,,32,,,,,{ skill "MG_STONECURSE",1; bonus2 bResEff,Eff_Stone,3000; bonus bMdef,10; },{},{}
 4415,Snowier_Card,Snowier Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItem,536,200; bonus2 bAddItemHealRate,536,100; },{},{}
 4416,Siroma_Card,Siroma Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bSkillAtk,14,25; bonus2 bCastrate,14,-25; },{},{}
-4417,Ice_Titan_Card,Ice Titan Card,6,20,,10,,,,,,,,64,,,,,{ bonus bVit,2; bonusautoscript2 "{ sc_start SC_INCDEF,10000,10; }",10,BF_WEAPON|BF_MAGIC; },{},{}
+4417,Ice_Titan_Card,Ice Titan Card,6,20,,10,,,,,,,,64,,,,,{ bonus bVit,2; bonusautoscript2 "{ specialeffect2 EF_FREEZED; sc_start SC_INCDEF,10000,10; }",30,BF_WEAPON|BF_MAGIC; },{},{}
 4418,Gazeti_Card,Gazeti Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,"MG_COLDBOLT",2,10; },{},{}
 4419,Ktullanux_Card,Ktullanux Card,6,20,,10,,,,,,,,16,,,,,{  bonus2 bAddEle,Ele_Fire,50; bonus5 bAutoSpellWhenHit,"WZ_FROSTNOVA",10,30,BF_WEAPON|BF_MAGIC,0; },{},{}
 4420,Muscipular_Card,Muscipular Card,6,20,,10,,,,,,,,32,,,,,{ bonus5 bAutoSpellWhenHit,"AL_HEAL",1,10,BF_SHORT,0; bonus5 bAutoSpellWhenHit,"AL_INCAGI",1,10,BF_SHORT,0; },{},{}
@@ -2323,7 +2323,7 @@
 //5376,Satanic_Chain_P,Flying Evil Wing,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,0,1,382,{ bonus bMaxSP,120; bonus3 bAddEffWhenHit,Eff_Curse,300,ATF_SELF; },{},{}
 //5377,Antique_Pipe,Gentleman's Pipe,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,0,0,383,{ bonus2 bSubRace,RC_DemiHuman,2; },{},{}
 //5378,Rabbit_Ear_Hat,Bunny Top Hat,5,20,,300,,0,,0,0xFFFFFFFF,7,2,256,,0,1,384,{ bonus bAgi,3; bonus3 bAutoSpellWhenHit,"AL_INCAGI",5,30; },{},{}
-5379,Balloon_Hat,Balloon Hat,5,20,,800,,3,,1,0xFFFFFFFF,7,2,256,,0,1,385,{ bonus bCastrate,-getrefine(); },{},{}
+//5379,Balloon_Hat,Balloon Hat,5,20,,800,,3,,1,0xFFFFFFFF,7,2,256,,0,1,385,{ bonus bCastrate,-getrefine(); },{},{}
 5380,Fish_Head_Hat,Fish Head Hat,5,20,,400,,1,,0,0xFFFFFFFF,7,2,256,,0,1,386,{ bonus3 bAutoSpell,"SA_FROSTWEAPON",1,5; },{},{}
 5381,SantaPoring_Cap,SantaPoring Cap,5,20,,100,,2,,1,0xFFFFFFFF,7,2,256,,0,0,387,{ bonus bMdef,2; bonus2 bAddEle,Ele_Dark,3; bonus2 bSubEle,Ele_Dark,3; },{},{}
 5382,Bell_Ribbon,Bell Ribbon,5,20,,200,,3,,1,0xFFFFFFFF,7,2,256,,0,1,388,{ bonus bVit,1; skill "AL_ANGELUS",1; },{},{ sc_end SC_ANGELUS; }
@@ -3888,8 +3888,8 @@
 13407,Nagan_C,Refined Nagan,4,,,0,148,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bDoubleRate,40; bonus2 bAddRace,RC_DemiHuman,5; },{},{}
 13408,Fire_brand_C,Refined Fireblend,4,,,0,120,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Fire; bonus bInt,2; skill "MG_FIREBOLT",5; bonus3 bAutoSpell,"MG_FIREBOLT",5,100; },{},{}
 13409,Immaterial_Sword_C,Refined Immaterial Sword,4,,,0,160,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Ghost; bonus2 bSPVanishRate,45,30; bonus bSPDrainValue,-1; bonus bUnbreakableWeapon,0; },{},{}
-13410,Gladiator_Blade,Gladiator Blade,4,0,,0,115,,1,0,0x020654E3,7,2,2,3,80,1,2,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; },{},{}
-13411,Gladiator_Blade_,Gladiator Blade,4,0,,0,115,,1,0,0x020654E3,7,2,2,3,80,1,2,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bMatkRate,10; bonus bUnbreakableWeapon,0; },{},{}
+13410,Gladiator_Blade,Gladiator Blade,4,0,,0,115,,1,0,0x020654E3,7,2,2,3,80,1,2,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; },{},{}
+13411,Gladiator_Blade_,Gladiator Blade,4,0,,0,115,,1,0,0x020654E3,7,2,2,3,80,1,2,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bMatkRate,10; bonus bUnbreakableWeapon,0; },{},{}
 13412,Naght_Seiger_Twin_Edge,Naght Seiger Twin Edge,4,0,,1500,150,,1,3,0x000654E2,2,2,2,4,75,1,2,{ bonus bAtkEle,Ele_Water; skill "MG_FROSTDIVER",5; },{},{}
 13413,Naght_Seiger_Twin_Edge_,Naght Seiger Twin Edge,4,0,,1500,160,,1,3,0x000654E2,2,2,2,4,75,1,2,{ bonus bAtkEle,Ele_Fire; skill "WZ_METEOR",3; },{},{}
 //13414#Elemental_Sword#
@@ -4647,21 +4647,21 @@
 14278,Quagmire_30_Scroll_Box2,Quagmire Scroll 30ea Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,30; },{},{}
 14279,Quagmire_50_Scroll_Box2,Quagmire Scroll 50ea Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,50; },{},{}
 14280,Healing_Staff_Box2,Healing Staff Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1638,1; },{},{}
-14281,Praccsinos_Box,Praccsinos_Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14282,Emperium_Box,Emperium_Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14283,Marriage_Certificate_Box,Marriage_Certificate_Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14284,Muffler_Box,Muffler Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14285,Balkiriah_Shield_Box,Balkiriah Shield Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14286,Skull_Ring_Box,Skull Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14287,Baricade_Repair_Kit,Barricade Repair Kit,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14288,Guardian_Stone_Repair_Kit,Guardian Stone Repair Kit,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14289,Clothing_Dye_Coupon_Box1,Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14290,Clothing_Dye_Coupon_Box2,Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14291,Clothing_Dye_Coupon_Box3,Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14292,Clothing_Dye_Coupon_Box4,Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14293,Mercenary_Contract_Box,Mercenary Contract Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14294,Mercenary_Contract_Box5,Mercenary Contract Box 5ea,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14295,Mercenary_Contract_Box10,Mercenary Contract Box 10ea,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+//14281,Praccsinos_Box,Praccsinos_Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2752,1; },{},{}
+14282,Emperium_Box,Emperium_Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 714,1; },{},{}
+14283,Marriage_Certificate_Box,Marriage_Certificate_Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6026,1; },{},{}
+//14284,Muffler_Box,Muffler Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2548,1; },{},{}
+//14285,Balkiriah_Shield_Box,Balkiriah Shield Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2137,1; },{},{}
+//14286,Skull_Ring_Box,Skull Ring Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2763,1; },{},{}
+14287,Baricade_Repair_Kit,Barricade Repair Kit,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1019,30; getitem 999,10; getitem 1011,10; getitem 984,5; },{},{}
+14288,Guardian_Stone_Repair_Kit,Guardian Stone Repair Kit,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 984,1; getitem 985,1; getitem 7049,30; getitem 717,5; getitem 716,5; getitem 715,5; },{},{}
+14289,Clothing_Dye_Coupon_Box1,Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6046,1; },{},{}
+14290,Clothing_Dye_Coupon_Box2,Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6047,1; },{},{}
+14291,Clothing_Dye_Coupon_Box3,Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6046,1; },{},{}
+14292,Clothing_Dye_Coupon_Box4,Clothing Dye Coupon Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6047,1; },{},{}
+//14293,Mercenary_Contract_Box,Mercenary Contract Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6050,1; },{},{}
+//14294,Mercenary_Contract_Box5,Mercenary Contract Box 5ea,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6050,5; },{},{}
+//14295,Mercenary_Contract_Box10,Mercenary Contract Box 10ea,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 6050,10; },{},{}
 //
 14500,Insurance_,Life Insurance,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFEINSURANCE,3600000,0; },{},{}
 //
@@ -4744,7 +4744,7 @@
 14584,Red_Butterfly_Wing,Red Butterfly Wing,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashCity",3; },{},{}
 14585,Blue_Butterfly_Wing,Blue Butterfly Wing,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashCity",4; },{},{}
 14586,Jumping_Candy,Jumping candy,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14587,Equipment_Repair_Book,Equipment Repair Book,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+14587,Equipment_Repair_Book,Equipment Repair Book,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "BS_REPAIRWEAPON",1; },{},{}
 14588,Party_Blessing_Scroll,Party Blessing Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 14589,Party_Increase_Agility_Scroll,Party Increase AGI Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 14590,Party_Assumptio_Scroll,Party Assumtio Scroll,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 5f035417b..ed36c31b0 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -846,137 +846,137 @@
 1810,B_KATRINN_,High Wizard Katrinn,High Wizard Kathryne,99,1069920,0,4008200,1636700,1,1197,4394,10,88,1,89,42,223,128,93,10,12,1,7,68,0x37B5,150,1152,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1811,G_SMOKIE_,Smokie,Bandit,18,641,0,0,0,1,61,72,0,10,1,18,36,25,26,35,10,12,0,2,22,0x91,200,1576,576,420,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1812,EVENT_LUDE,Lude,Delightful Lude,99,15,0,0,0,0,0,0,100,99,1,1,1,1,255,1,0,0,0,0,20,0x40,190,890,960,480,0,0,0,0,0,0,0,0,7225,5000,1062,5000,535,5000,7609,5000,0,0,0,0,0,0,0,0,0,0,0,0
-1813,EVENT_HYDRO,Hydro,Hydrolancer,99,5880000,0,4000000,2000000,3,15000,40000,60,55,1,142,250,86,189,32,10,12,2,8,48,0x37B5,100,140,672,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1813,EVENT_HYDRO,Hydro,Hydrolancer,99,1880000,0,4000000,2000000,3,15000,40000,60,55,1,142,200,250,189,32,10,12,2,8,28,0x37B5,100,972,672,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1814,EVENT_MOON,Moonlight Flower,Moonlight Flower,80,30000,0,30000,30000,1,500,800,50,50,1,35,45,112,69,93,10,12,1,2,63,0x37B5,150,1276,576,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1815,EVENT_RICECAKE,Rice Cake,Rice Cake,12,20,0,0,0,1,1,2,100,99,1,1,1,1,1,1,0,0,1,0,20,0x40,2000,1320,0,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1816,EVENT_GOURD,Gourd,Gourd,12,1000,0,0,0,1,1,2,100,99,1,1,1,1,1,1,0,0,1,0,20,0x40,2000,96,96,96,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1817,EVENT_DETALE,Detale,Detarderous,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1818,EVENT_ALARM_,Alarm,Alarm,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1819,EVENT_BATHORY_,Bathory,Bathory,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1820,EVENT_BIGFOOT_,Bigfoot,Bigfoot,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1821,EVENT_DESERT_WOLF_,Desert Wolf,Desert Wolf,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1822,EVENT_DEVIRUCHI_,Deviruchi,Deviruchi,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1823,EVENT_FREEZER_,Freezer,Freezer,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1824,EVENT_GARM_BABY_,Garm Baby,Garm Baby,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1825,EVENT_GOBLINE_XMAS_,Chistmas Goblin,Chistmas Goblin,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1826,EVENT_MYST_,Myst,Myst,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1827,EVENT_SASQUATCH_,Sasquatch,Sasquatch,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1828,EVENT_GULLINBURSTI_,Gullinbrusti,Gullinbrusti,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1817,EVENT_DETALE,Detale,Detarderous,99,8880000,0,4500000,2500000,3,32767,32767,65,65,1,142,200,250,189,50,10,12,2,8,48,0x37B5,100,972,936,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1818,EVENT_ALARM,Alarm,Alarm,58,10647,0,0,0,0,1,1,15,15,1,62,72,10,85,45,10,12,1,0,60,0x3695,1000,1020,500,768,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7703,7000
+1819,EVENT_BATHORY,Bathory,Bathory,44,5415,0,0,0,1,198,200,0,60,1,76,24,85,65,15,10,12,1,7,27,0x3695,100,1504,840,900,0,0,0,0,0,0,0,0,7850,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1820,EVENT_BIGFOOT,Bigfoot,Bigfoot,25,1619,0,0,0,1,198,220,10,0,1,25,55,15,20,25,10,12,2,2,22,0x91,300,1260,192,192,0,0,0,0,0,0,0,0,7850,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1821,EVENT_DESERT_WOLF,Desert Wolf,Desert Wolf,27,1716,0,0,0,1,169,39,0,10,56,27,45,15,56,10,10,12,1,2,23,0x308D,200,1120,420,288,0,0,0,0,0,0,0,0,7850,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1822,EVENT_DEVIRUCHI,Deviruchi,Deviruchi,46,6666,0,0,0,1,475,85,10,25,1,69,40,55,70,30,10,12,0,6,27,0x3795,150,980,600,384,0,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1823,EVENT_FREEZER,Freezer,Freezer,72,8636,0,0,0,2,671,312,55,43,69,41,59,5,67,100,10,12,1,2,41,0x3695,250,1452,483,528,0,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1824,EVENT_GARM_BABY,Garm Baby,Garm Baby,61,20199,0,0,0,1,680,499,34,13,45,30,56,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,7850,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1825,EVENT_GOBLINE_XMAS,Christmas Goblin,Christmas Goblin,25,1176,0,0,0,1,118,22,10,5,1,53,25,20,38,45,10,12,1,7,24,0x3695,100,1120,620,240,0,0,0,0,0,0,0,0,7850,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1826,EVENT_MYST,Myst,Myst,38,3745,0,0,0,1,365,80,0,40,1,38,18,0,53,10,10,12,2,0,25,0x3695,200,1576,576,384,0,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1827,EVENT_SASQUATCH,Sasquatch,Sasquatch,30,3163,0,0,0,1,250,30,5,0,75,25,60,10,34,20,10,12,2,2,60,0x3695,300,1260,192,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1828,EVENT_GULLINBURSTI,Gullinbrusti,Gullinbrusti,20,20,0,0,0,1,59,72,100,99,1,14,14,0,19,15,10,12,2,2,42,0x3695,150,1960,960,384,0,0,0,0,0,0,0,0,7303,6000,570,9000,571,8000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1829,SWORD_GUARDIAN,Sword Guardian,Sword Master,86,152533,0,155013,122604,2,7590,9140,60,33,110,40,54,65,125,65,14,16,2,7,80,0x37B5,170,140,384,288,0,0,0,0,0,0,0,0,7069,3000,1370,30,1163,50,1168,1,2122,10,1176,50,0,0,0,0,0,0,4427,1
 1830,BOW_GUARDIAN,Bow Guardian,Bow Master,80,80404,0,50149,23006,12,1840,2520,40,62,95,80,33,90,165,55,14,16,2,7,80,0x37B5,170,76,384,288,0,0,0,0,0,0,0,0,7069,3000,1723,30,1701,50,2367,20,2701,4,0,0,0,0,0,0,0,0,4428,1
 1831,SALAMANDER,Salamander,Salamander,91,97934,0,72000,55000,2,7590,10860,65,50,90,55,44,45,180,25,10,12,2,0,63,0x37B5,160,140,384,288,0,0,0,0,0,0,0,0,7097,3000,994,30,716,100,2680,1,1920,50,2621,1,2364,20,0,0,0,0,4429,1
 1832,IFRIT,Ifrit,Ifrit,99,7700000,0,3154321,3114520,3,13530,17000,40,50,120,180,25,190,199,50,10,12,2,0,83,0x37B5,130,212,384,360,1577160,10000,603,5500,617,5000,616,2000,994,10000,2677,3000,2678,100,2679,100,1471,2000,1133,2000,1473,2000,0,0,0,0,4430,1
 1833,KASA,Kasa,Kasa,85,80375,0,49000,38000,2,3030,3500,23,70,45,110,31,200,140,30,10,12,2,0,63,0x37B5,150,800,600,288,0,0,0,0,0,0,0,0,7097,3000,7122,2500,994,30,2680,1,2344,10,1730,10,1626,10,0,0,0,0,4431,1
-1834,G_SALAMANDER,Salamander,Salamander,91,97934,0,0,0,2,7590,10860,65,50,90,55,44,45,180,25,10,12,2,0,63,0x37B5,160,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1834,G_SALAMANDER,Salamander,Salamander,91,97934,0,0,0,2,9590,12860,65,60,90,55,44,45,180,25,10,12,2,0,63,0x37B5,160,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1835,G_KASA,Kasa,Kasa,85,80375,0,0,0,2,3030,3500,23,70,45,158,31,250,160,30,10,12,2,0,63,0x37B5,150,800,600,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1836,MAGMARING,Magmaring,Magmaring,40,5300,0,2110,1910,1,550,700,25,24,40,60,30,10,60,17,10,12,0,0,43,0x83,300,1472,384,288,0,0,0,0,0,0,0,0,7097,3000,757,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4432,1
 1837,IMP,Imp,Fire Imp,76,46430,0,25200,11077,1,1059,1509,27,50,37,76,30,150,99,10,10,12,0,6,63,0x3395,150,824,432,360,0,0,0,0,0,0,0,0,7122,3000,13303,3,7098,2500,1376,10,1972,25,0,0,0,0,0,0,0,0,4433,1
 1838,KNOCKER,Knocker,Knocker,50,7755,0,2202,4023,1,889,990,28,50,25,44,50,62,65,60,10,12,0,6,22,0x191,200,1548,384,288,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2208,10,2124,3,1732,5,0,0,0,0,4434,1
 1839,BYORGUE,Byorgue,Byorgue,86,38133,0,19000,9500,2,1340,2590,20,13,25,80,12,30,70,10,14,16,1,7,20,0x37B5,170,800,600,360,0,0,0,0,0,0,0,0,1270,50,5096,3,1232,20,12087,500,603,40,2530,1,7110,4365,0,0,0,0,4426,1
 1840,GOLDEN_SAVAGE,Golden Savage,Golden Savage,99,500,0,1,1,1,500,700,100,99,0,1,1,50,120,1,10,12,2,2,42,0xF1,150,1960,960,384,0,0,0,0,0,0,0,0,610,3000,7444,100,616,5,969,500,714,100,5159,1,0,0,0,0,0,0,0,0
-1841,G_SNAKE_,Snake,Boa,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1842,G_ANACONDAQ_,Anacondaq,Anacondaq,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1843,G_SIDE_WINDER_,Side Winder,Side Winder,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1844,G_ISIS_,Isis,Isis,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1845,TREASURE_BOX_1,Treasure Box,Treasure Box,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1846,DREAMMETAL,Dream Metal,Dream Metal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1847,EVENT_PORING,Poring,Poring,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1848,EVENT_BAPHOMET,Baphomet,Baphomet,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1849,EVENT_OSIRIS,Osiris,Osiris,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1850,EVENT_ORK_HERO,Orc Hero,Orc Hero,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1851,EVENT_MOBSTER,Mobster,Mobster,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1852,EM_ANGELING,Angeling,Angeling,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1853,EM_DEVILING,Deviling,Deviling,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1854,E_MUKA,Muka,Muka,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1855,E_POISON_SPORE_,Poison Spore,Poison Spore,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1856,E_MAGNOLIA,Magnolia,Magnolia,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1857,E_MARIN_,Marin,Marin,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1858,E_PLANKTON,Plankton,Plankton,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1859,E_MANDRAGORA_,Mandragora,Mandragora,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1860,E_COCO,Coco,Coco,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1861,E_CHOCO,Choco,Choco,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1862,E_MARTIN,Martin,Martin,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1863,E_SPRING_RABBIT,Spring Rabbit,Spring Rabbit,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1841,G_SNAKE_,Snake Lord's Minion,Snake Lord's Minion,15,10,0,1,1,1,46,55,100,99,1,15,15,10,35,5,10,12,1,2,22,0x81,200,1576,576,576,0,0,0,0,0,0,0,0,7720,2000,12245,200,7721,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1842,G_ANACONDAQ_,Snake Lord's Minion,Snake Lord's Minion,23,15,0,1,1,1,124,157,100,99,1,23,28,10,36,5,10,12,1,2,25,0x91,200,1576,576,576,0,0,0,0,0,0,0,0,7720,3500,12245,400,7721,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1843,G_SIDE_WINDER_,Snake Lord's Minion,Snake Lord's Minion,43,18,0,1,1,1,240,320,100,99,38,43,40,15,115,20,10,12,1,2,25,0x3095,200,1576,576,576,0,0,0,0,0,0,0,0,7720,7000,12245,600,7721,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1844,G_ISIS_,Snake Lord's Minion,Snake Lord's Minion,47,25,0,1,1,1,423,507,100,99,38,65,43,50,66,15,10,12,2,6,27,0x3195,200,1384,336,768,0,0,0,0,0,0,0,0,7720,8000,12245,800,7721,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1845,G_TREASURE_BOX_,Treasure Box,Treasure Box,98,0,0,0,0,0,0,10,0,0,0,0,0,0,999,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1846,DREAMMETAL,Dream Metal,Dream Metal,90,999,0,1,1,1,1,1,100,99,1,1,1,1,1,1,10,12,0,0,26,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1847,EVENT_PORING,Poring,Poring,98,10000000,0,1000000,1000000,1,15000,20000,60,60,1,60,120,120,160,30,10,12,1,8,28,0x37B5,100,76,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1848,EVENT_BAPHOMET,Baphomet,Baphomet,50,45000,0,1000,1000,2,1500,1500,10,10,1,60,15,15,160,30,10,12,2,6,67,0x37B5,100,768,768,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1849,EVENT_OSIRIS,Osiris,Osiris,60,125000,0,2000,2000,1,3500,5000,20,20,1,60,25,25,160,30,10,12,1,1,89,0x37B5,100,1072,672,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1850,EVENT_ORCHERO,Orc Hero,Orc Hero,50,175000,0,3000,3000,1,4000,5500,25,45,1,60,35,80,160,30,10,12,2,7,82,0x37B5,150,1678,780,648,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1851,EVENT_MOBSTER,Mobster,Mobster,30,2000,0,1,1,1,70,100,10,5,15,5,20,35,30,10,10,12,1,7,20,0x3695,250,1100,560,580,0,0,0,0,0,0,0,0,2339,5000,2523,5000,7859,10000,660,2000,1951,2000,0,0,0,0,0,0,0,0,0,0
+1852,G_EM_ANGELING,Angeling,Angeling,99,120,0,0,0,1,60,71,100,99,1,17,80,80,126,20,10,12,0,8,66,0x37B5,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1853,G_EM_DEVILING,Deviling,Deviling,99,120,0,0,0,1,60,71,100,99,1,17,80,80,126,20,10,12,0,8,66,0x37B5,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1854,E_MUKA,Muka,Muka,17,610,0,273,120,1,40,49,5,5,15,15,30,5,20,10,10,12,2,3,22,0x83,300,1960,960,384,0,0,0,0,0,0,0,0,993,70,952,9000,713,2000,7742,400,507,1000,1451,50,1002,250,0,0,0,0,4036,1
+1855,E_POISONSPORE,Poison Spore,Poison Spore,19,665,0,186,93,1,89,101,0,0,1,19,25,0,24,0,10,12,1,3,25,0x3885,200,1672,672,288,0,0,0,0,0,0,0,0,7033,9000,2221,20,511,550,7743,60,972,50,921,1200,912,5,0,0,0,0,4048,1
+1856,E_MAGNOLIA,Magnolia,Magnolia,26,3195,0,393,248,1,120,151,5,30,1,26,26,0,39,5,10,12,0,6,21,0x183,250,1560,360,360,0,0,0,0,0,0,0,0,7031,9000,910,800,911,100,912,10,737,40,7744,400,12127,5,0,0,0,0,4076,1
+1857,E_MARIN,Marin,Marin,15,742,0,66,44,1,39,43,0,10,1,10,10,5,35,15,10,12,1,3,41,0x81,400,1872,672,480,0,0,0,0,0,0,0,0,910,3200,938,1500,700,100,720,40,7745,75,529,350,5035,1,0,0,0,0,4196,1
+1858,E_PLANKTON,Plankton,Plankton,10,354,0,23,18,1,26,31,0,5,1,10,10,0,15,0,10,12,0,3,61,0x81,400,2208,1008,324,0,0,0,0,0,0,0,0,1052,9000,7746,300,938,700,970,4,713,1000,630,20,645,50,0,0,0,0,4024,1
+1859,E_MANDRAGORA,Mandragora,Mandragora,12,405,0,45,32,4,26,35,0,25,1,12,24,0,36,15,10,12,1,3,62,0x84,1000,1768,768,576,0,0,0,0,0,0,0,0,993,50,905,9000,1405,30,7747,350,711,300,706,3,1967,10,0,0,0,0,4030,1
+1860,E_COCO,Coco,Coco,17,817,0,120,78,1,56,67,0,0,24,17,34,20,24,10,10,12,0,2,22,0x91,150,1864,864,1008,0,0,0,0,0,0,0,0,1026,9000,2502,20,914,3000,919,2500,516,500,2402,25,7748,600,0,0,0,0,4041,1
+1861,E_CHOCO,Choco,Choco,43,4278,0,1265,1265,1,315,402,5,5,65,68,55,45,65,25,10,12,0,2,23,0x3095,200,1500,500,1000,0,0,0,0,0,0,0,0,7011,5335,942,7000,985,53,513,5000,634,20,7749,1000,607,25,0,0,0,0,4285,1
+1862,E_MARTIN,Martin,Martin,18,1109,0,134,86,1,52,63,0,5,12,18,30,15,15,5,10,12,0,2,42,0x81,300,1480,480,480,0,0,0,0,0,0,0,0,1017,9000,7750,500,1251,10,2225,5,5009,1,10010,10,2224,15,0,0,0,0,4046,1
+1863,E_SPRING_RABBIT,Spring Rabbit,Spring Rabbit,25,4500,0,0,0,1,292,406,14,10,20,15,15,5,15,5,10,12,1,2,42,0x83,160,1120,552,511,0,0,0,0,0,0,0,0,7860,5000,7861,5000,7862,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Cursed Abbey
 1864,ZOMBIE_SLAUGHTER,Zombie Slaughter,Zombie Slaughter,77,43000,0,12000,8500,1,855,1655,35,45,1,30,50,1,75,35,10,12,1,1,69,0x3695,200,676,648,432,0,0,0,0,0,0,0,0,7752,3000,13404,10,934,1500,7753,3000,938,3000,0,0,0,0,0,0,0,0,4435,1
 1865,RAGGED_ZOMBIE,Ragged Zombie,Ragged Zombie,75,25000,0,8500,5500,9,1200,1500,25,35,1,77,25,10,101,50,10,12,1,1,69,0x3695,150,1960,576,420,0,0,0,0,0,0,0,0,7752,3000,2424,15,934,1500,932,4500,2703,2,13107,10,0,0,0,0,0,0,4436,1
 1866,HELL_POODLE,Hell Poodle,Hell Poodle,71,9000,0,4000,3000,1,400,600,35,20,5,26,14,5,39,10,10,12,0,6,27,0x3795,140,824,432,360,0,0,0,0,0,0,0,0,528,5000,13028,10,1268,10,932,4500,628,20,919,5500,537,400,0,0,0,0,4437,1
 1867,BANSHEE,Banshee,Banshee,81,35111,0,17000,12000,1,1666,2609,30,55,30,74,1,120,75,1,10,12,1,6,47,0x3795,150,676,504,504,0,0,0,0,0,0,0,0,7751,3000,2365,10,13027,10,2528,10,934,1500,7054,5335,0,0,0,0,0,0,4438,1
-1868,G_BANSHEE,Banshee,Banshee,81,35111,0,0,0,1,1666,2609,30,55,30,74,1,120,75,1,10,12,1,6,47,0x3795,150,674,504,504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1868,G_BANSHEE,Banshee,Banshee,81,35111,0,0,0,1,1666,2609,30,55,30,74,1,120,75,1,10,12,1,6,47,0x3795,150,676,504,504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1869,FLAME_SKULL,Flame Skull,Flame Skull,60,10800,0,3000,2600,1,100,1200,20,40,50,100,30,40,140,110,10,12,0,6,68,0x3195,150,972,648,432,0,0,0,0,0,0,0,0,7005,5000,2425,20,13170,20,958,6000,0,0,0,0,0,0,0,0,0,0,4439,1
 1870,NECROMANCER,Necromancer,Necromancer,88,98000,0,45000,35000,1,3500,4000,0,40,1,50,1,190,166,10,10,12,1,1,89,0x37B5,150,1816,1320,420,0,0,0,0,0,0,0,0,7752,3000,1624,20,932,4500,2532,10,717,100,609,100,7117,1500,0,0,0,0,4440,1
-1871,FALLINGBISHOP,Fallen Bishop,Fallen Bishop Hibram,80,3333333,0,1111111,1111111,1,3220,5040,50,0,1,80,15,126,120,20,10,12,1,6,47,0x37B5,150,432,720,360,555555,10000,607,5500,617,5000,617,5000,523,10000,1420,500,2677,500,1422,500,985,5432,1614,2000,0,0,0,0,0,0,4441,1
-1872,BEELZEBUB_FLY,Beelzebub Fly,Hell Fly,66,500000,0,0,0,1,1200,2000,25,15,33,105,60,15,72,30,10,12,0,4,84,0x37B5,100,676,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1871,FALLINGBISHOP,Fallen Bishop,Fallen Bishop Hibram,80,3333333,0,1111111,1111111,1,3220,5040,50,0,1,80,15,126,120,20,10,12,1,6,47,0x37B5,150,432,432,360,555555,10000,607,5500,617,5000,617,5000,523,10000,1420,500,2677,500,1422,500,985,5432,1614,2000,0,0,0,0,0,0,4441,1
+1872,BEELZEBUB_FLY,Hell Fly,Hell Fly,66,500000,0,0,0,1,1200,2000,25,15,33,105,60,15,72,30,10,12,0,4,84,0x37B5,100,676,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1873,BEELZEBUB,Beelzebub,Beelzebub,98,6666666,0,0,0,1,4100,4960,40,35,6,110,200,250,120,66,10,12,0,6,88,0x37B5,100,100,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1874,BEELZEBUB_,Beelzebub,Beelzebub,98,6666666,0,6666666,6666666,2,10000,13410,40,40,6,110,200,250,166,66,10,12,2,6,88,0x37B5,100,212,504,432,3333333,10000,607,5500,617,5000,617,5000,7754,9000,2423,2000,1565,2000,2000,2000,2702,2000,985,5432,742,5500,0,0,0,0,4145,1
-1875,TRISTAN_3RD,Tristan 3RD,Dead King,80,43000,0,1,1,2,1366,1626,25,30,5,10,10,69,70,1,10,12,1,1,89,0x3695,175,1816,1152,360,0,0,0,0,0,0,0,0,7754,9000,938,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1876,E_LORD_OF_DEATH,Lord of Death,Lord of the Dead,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1877,G_CRYSTAL,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1878,E_SHINING_PLANT,Shining Plant,Shining Plant,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1879,ECLIPSE_P,Spring Rabbit,Spring Rabbit,58,9045,0,3982,1766,1,585,813,29,21,45,61,5,15,77,90,10,12,1,2,42,0x83,160,1120,552,511,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1875,TRISTAN_3RD,Tristan III,Dead King,80,43000,0,1,1,2,1366,1626,25,30,5,10,10,69,70,1,10,12,1,1,89,0x3695,175,1816,1152,360,0,0,0,0,0,0,0,0,7754,9000,938,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1876,E_LORD_OF_DEATH,Lord of the Dead,Lord of the Dead,99,99000000,0,131343,43345,3,3430,4232,75,73,120,120,120,169,150,106,10,12,2,6,67,0x37B5,180,1446,1296,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1877,CRYSTAL_5,Crystal,Crystal,1,15,0,0,0,0,0,10,100,99,1,1,1,1,255,1,0,0,0,0,00,0x1E1,190,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1878,E_SHINING_PLANT,Shining Plant,Shining Plant,1,20,0,0,0,1,1,1,100,99,0,0,0,0,0,90,7,12,0,3,26,0x40,2000,1,1,1,0,0,0,0,0,0,0,0,7864,3000,906,1500,511,500,507,2000,508,1500,914,500,0,0,0,0,0,0,0,0
+1879,ECLIPSE_P,Eclipse Pet,Eclipse,6,1800,0,0,0,1,20,26,0,40,1,36,6,0,11,80,10,12,1,2,60,0x37B5,200,1456,456,336,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Moscovia monsters
-1880,WOOD_GOBLIN,Wood Goblin,Leshij,42,6982,0,2201,1552,1,600,620,32,3,1,5,45,45,55,155,10,12,1,3,62,0x81,320,2304,360,840,0,0,0,0,0,0,0,0,509,1000,7203,4000,7201,2000,907,2000,916,500,7032,500,574,50,0,0,0,0,0,0
-1881,LES,Mavka,Mavka,39,3080,0,1521,912,1,102,113,0,17,1,33,12,32,52,38,10,12,1,3,82,0x81,230,1728,720,576,0,0,0,0,0,0,0,0,7100,2000,511,1000,711,1000,905,2500,2270,1,521,500,510,50,0,0,0,0,0,0
-1882,VAVAYAGA,Babayaga,Baba-Yaga,49,7444,0,2583,2583,2,255,387,4,29,1,76,24,88,55,18,10,12,1,7,21,0x3295,270,1536,600,420,0,0,0,0,0,0,0,0,7099,1000,7762,5000,525,100,7226,150,539,1500,519,1500,580,1500,0,0,0,0,0,0
-1883,UZHAS,Uzdas,Kikimora,61,13707,0,4002,3003,1,293,667,11,34,1,33,19,72,75,77,10,12,1,7,61,0x3295,200,576,672,384,0,0,0,0,0,0,0,0,520,900,678,1,621,100,522,100,918,3500,579,1500,603,3,0,0,0,0,0,0
-1884,MAVKA,Lesavka,Lesavka,63,19200,0,8301,6353,7,589,623,32,19,1,42,55,35,89,177,10,12,1,3,62,0x3295,170,1536,504,360,0,0,0,0,0,0,0,0,703,100,629,300,707,300,710,50,747,1500,748,300,510,3000,0,0,0,0,0,0
-1885,GOPINICH,Gorynych,Zmey Gorynych,85,299321,0,45250,16445,3,1868,4256,20,42,50,65,55,103,152,35,10,12,2,2,62,0x37B5,150,1536,864,432,22625,10000,607,5500,617,5000,617,5000,617,4000,2621,200,12080,1000,985,3000,1417,5,7444,5000,5007,1,0,0,0,0,0,0
-1886,G_MAVKA,Lesavka,Lesavka,63,19200,0,0,0,7,589,623,32,19,1,42,55,35,89,177,10,12,1,3,62,0x3295,170,1536,504,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1880,WOOD_GOBLIN,Leshij,Leshij,42,6982,0,2201,1552,1,600,620,32,3,1,5,45,45,55,155,10,12,1,3,62,0x81,320,2304,840,360,0,0,0,0,0,0,0,0,509,1000,7203,4000,7201,2000,907,2000,916,500,7032,500,574,50,0,0,0,0,0,0
+1881,LES,Lesavka,Lesavka,39,3080,0,1521,912,1,102,113,0,17,1,33,12,32,52,38,10,12,1,3,82,0x81,230,1728,720,576,0,0,0,0,0,0,0,0,7100,2000,511,1000,711,1000,905,2500,2270,1,521,500,510,50,0,0,0,0,0,0
+1882,VAVAYAGA,Baba-Yaga,Baba-Yaga,49,7444,0,2583,2583,2,255,387,4,29,1,76,24,88,55,18,10,12,1,7,21,0x3295,270,1536,600,420,0,0,0,0,0,0,0,0,7099,1000,7762,5000,525,100,7226,150,539,1500,519,1500,580,1500,0,0,0,0,0,0
+1883,UZHAS,Kikimora,Kikimora,61,13707,0,4002,3003,1,293,667,11,34,1,33,19,72,75,77,10,12,1,7,61,0x3295,200,576,672,384,0,0,0,0,0,0,0,0,520,900,678,1,621,100,522,100,918,3500,579,1500,603,3,0,0,0,0,0,0
+1884,MAVKA,Mavka,Mavka,63,19200,0,8301,6353,7,589,623,32,19,1,42,55,35,89,177,10,12,1,3,62,0x3295,170,1536,504,360,0,0,0,0,0,0,0,0,703,100,629,300,707,300,710,50,747,1500,748,300,510,3000,0,0,0,0,0,0
+1885,GOPINICH,Zmey Gorynych,Zmey Gorynych,85,299321,0,45250,16445,3,1868,4256,20,42,50,65,55,103,152,35,10,12,2,2,62,0x37B5,150,1536,864,432,22625,10000,607,5500,617,5000,617,5000,617,4000,2621,200,12080,1000,985,3000,1417,5,7444,5000,5007,1,0,0,0,0,0,0
+1886,G_MAVKA,Mavka,Mavka,63,19200,0,0,0,7,589,623,32,19,1,42,55,35,89,177,10,12,1,3,62,0x3295,170,1536,504,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Additional Monsters
-1887,FREEZER_R,Freezer,Freezer,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1888,GARM_BABY_R,Garm Baby,Garm Baby,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1889,GARM_R,Garm,Garm,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1890,GOPINICH_R,Gopinich,Gopinich,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1891,G_RANDGRIS_,Valkyrie,Valkyrie,99,1567200,0,0,0,3,5560,4420,25,42,100,120,80,120,220,210,10,12,2,8,86,0x37B5,100,576,480,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1892,G_LOLI_RURI,Loli Ruri,Loli Ruri,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1893,G_KNIGHT_OF_ABYSS,Knight of the Abyss,Abysmal Knight,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1894,POURING,Pouring,Pouring,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1895,EVENT_SEYREN,Seyren,Seyren Windsor,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1896,EVENT_KATRINN,Katrinn,Kathryne Keyron,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1897,EVENT_BAPHOMET_,Baphomet,Baphomet,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1898,G_ZOMBIE,Zombie,Zombie,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1887,FREEZER_R,Freezer,Freezer,72,8636,0,0,0,2,671,983,55,43,69,41,59,5,67,100,10,12,1,2,41,0x3695,250,1452,483,528,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1888,GARM_BABY_R,Hatii Baby,Hatii Baby,61,15199,0,100,100,1,680,900,24,13,45,30,36,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,0,7066,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1889,GARM_R,Marozka's Guard,Marozka's Guard,73,100000,0,1000,1000,3,900,1300,20,23,85,126,10,50,95,60,10,12,2,2,81,0x37B5,400,608,408,336,0,0,0,0,0,0,0,0,7053,2000,7066,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1890,GOPINICH_R,Koshei¸ the Immortal,Koshei¸ the Immortal,85,299321,0,1000,1000,3,1868,4256,20,42,50,65,55,50,152,35,10,12,2,2,62,0x3295,150,1536,864,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1891,G_RANDGRIS_,Valkyrie,Valkyrie,99,1567200,0,0,0,3,5560,9980,25,42,100,120,80,120,220,210,10,12,2,8,86,0x37B5,100,576,576,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1892,G_LOLI_RURI,Lolo Ruri,Lolo Ruri,71,23470,0,0,0,2,1476,841,39,44,0,66,54,74,81,43,10,12,2,6,87,0x3985,125,747,576,1632,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1893,G_KNIGHT_OF_ABYSS,Knight of the Abyss,Abysmal Knight,79,36140,0,0,0,1,1600,2150,55,50,66,68,64,25,135,50,10,12,2,7,87,0x3695,300,1500,1000,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1894,POURING,Pouring,Pouring,50,100000,0,0,0,1,550,900,20,50,45,30,36,55,85,30,0,0,0,3,61,0x11AB,300,1672,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1895,EVENT_SEYREN,Seyren,Seyren Windsor,91,88402,0,0,0,1,2100,2530,63,12,90,89,72,20,99,25,10,12,1,6,63,0x3295,170,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1896,EVENT_KATRINN,Katrinn,Kathryne Keyron,92,47280,0,0,0,1,497,1200,10,74,1,5,77,180,110,39,10,12,1,7,68,0x3295,150,1152,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1897,EVENT_BAPHOMET_,Baphomet,Baphomet,81,668000,0,0,0,2,3220,4040,35,45,1,152,30,85,120,95,10,12,2,6,67,0x37B5,100,768,768,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1898,EVENT_ZOMBIE,Zombie,Zombie,12,434,0,0,0,1,67,79,0,10,1,1,1,1,1,1,10,12,1,1,29,0x3885,400,2612,912,288,0,0,0,0,0,0,0,0,7884,10000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1899,SWORD_GUARDIAN_,Sword Guardian,Sword Guardian,86,152533,0,0,0,2,7590,1550,60,33,110,40,54,65,125,65,14,16,2,7,80,0x20A5,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1900,BOW_GUARDIAN_,Archer Guardian,Archer Guardian,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x20A5,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1901,E_CONDOR,Condor,Condor,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1902,E_TREASURE_BOX1,Treasure Box,Treasure Box,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1903,E_TREASURE_BOX2,Treasure Box,Treasure Box,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1904,BOMBPORING,Bomb Poring,Bomb Poring,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+//1900,BOW_GUARDIAN_,Archer Guardian,Archer Guardian,80,80404,0,0,0,12,1840,680,40,62,95,80,33,90,165,55,14,16,2,7,80,0x20A5,170,76,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1901,E_CONDOR,Condor,Condor,5,8000,0,100,100,1,200,200,10,15,1,13,10,25,95,10,10,12,0,8,26,0x1089,150,1148,648,480,0,0,0,0,0,0,0,0,7781,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1902,E_TREASURE1,Treasure Box,Treasure Box,99,49,0,0,0,0,0,10,100,0,0,0,0,0,2,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7782,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1903,E_TREASURE2,Treasure Box,Treasure Box,99,49,0,0,0,0,0,10,100,0,0,0,0,0,255,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7783,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,0,461,284,1,120,200,100,99,1,28,28,0,33,50,10,12,0,0,20,0x11AB,300,1672,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // WoE Second Edition; Battle Fields
-1905,BARRICADE,Barricade,Barricade,98,120000,0,0,0,1,0,0,0,0,1,17,1,80,126,20,10,12,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1905,BARRICADE,Barricade,Barricade,98,600000,0,0,0,1,0,0,0,0,1,17,1,80,126,20,10,12,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1906,BARRICADE_,Barricade,Barricade,98,150,0,0,0,1,0,0,100,99,1,17,1,80,126,20,10,12,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1907,S_EMPEL_1,Guardian Stone,Guardian Stone,90,120000,0,0,0,0,1,1,40,50,1,1,1,1,1,1,0,0,0,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1908,S_EMPEL_2,Guardian Stone,Guardian Stone,90,120000,0,0,0,0,1,1,40,50,1,1,1,1,1,1,0,0,0,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1909,OBJ_A,Flag,Flag,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1910,OBJ_B,Flag,Flag,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1911,OBJ_NEUTRAL,Flag,Flag,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1912,OBJ_FLAG_A,Flag,Flag,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1913,OBJ_FLAG_B,Flag,Flag,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1914,OBJ_A2,Flag,Flag,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1915,OBJ_B2,Flag,Flag,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1909,OBJ_A,Food Storage,Food Storage,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1910,OBJ_B,Food Depot,Food Depot,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1911,OBJ_NEUTRAL,Neutrality Flag,Neutrality Flag,90,200,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1912,OBJ_FLAG_A,Lion Flag,Lion Flag,90,200,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1913,OBJ_FLAG_B,Eagle Flag,Eagle Flag,90,200,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1914,OBJ_A2,Blue Crystal,Blue Crystal,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1915,OBJ_B2,Pink Crystal,Pink Crystal,90,1000,0,0,0,0,1,1,100,99,1,1,1,1,1,1,0,0,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Satan Morroc
 1916,MOROCC,Satan Morroc,Satan Morroc,99,20000000,0,6700000,4500000,2,32000,32001,29,65,140,160,30,250,180,50,10,12,2,6,87,0x37B5,100,76,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1917,MOROCC_,Satan Morroc,Wounded Morroc,99,15000000,0,3600000,3000000,2,15000,18000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x37B5,100,76,540,432,3600000,5000,607,5500,617,5000,617,5000,5808,1000,2374,2000,2375,2000,2433,2500,7799,9000,7798,9000,0,0,0,0,0,0,0,0
-1918,MOROCC_1,Morroc Shadow,Morroc Shadow,97,190000,0,61000,140000,2,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,26,0x37B5,110,576,540,432,0,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,0,0,0,0,0,0,0,0
-1919,MOROCC_2,Morroc Shadow,Morroc Shadow,97,190000,0,65000,120000,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x37B5,150,576,540,432,0,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,0,0,0,0,0,0,0,0,0,0
-1920,MOROCC_3,Morroc Shadow,Morroc Shadow,96,143000,0,50000,80000,1,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x37B5,150,212,540,432,0,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,0,0,0,0,0,0,0,0
-1921,MOROCC_4,Morroc Shadow,Morroc Shadow,98,150000,0,51000,70000,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x37B5,150,1536,540,432,0,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,0,0,0,0,0,0,0,0,0,0
-1922,G_MOROCC_1,Morroc Shadow,Morroc Shadow,97,120000000,0,0,0,2,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,26,0x37B5,110,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1923,G_MOROCC_2,Morroc Shadow,Morroc Shadow,97,120000000,0,0,0,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x37B5,150,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1924,G_MOROCC_3,Morroc Shadow,Morroc Shadow,96,120000000,0,0,0,1,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x37B5,150,212,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1925,G_MOROCC_4,Morroc Shadow,Morroc Shadow,98,120000000,0,0,0,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x37B5,150,1536,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1917,MOROCC_,Wounded Morroc,Wounded Morroc,99,15000000,0,3600000,3000000,2,15000,18000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x37B5,100,76,540,432,3600000,5000,607,5500,617,5000,617,5000,5808,1000,2374,2000,2375,2000,2433,2500,7799,9000,7798,9000,0,0,0,0,0,0,0,0
+1918,MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,190000,0,61000,140000,2,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,26,0x37B5,110,576,540,432,0,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,0,0,0,0,0,0,0,0
+1919,MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,97,190000,0,65000,120000,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x37B5,150,576,540,432,0,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,0,0,0,0,0,0,0,0,0,0
+1920,MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,96,143000,0,50000,80000,1,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x37B5,150,212,540,432,0,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,0,0,0,0,0,0,0,0
+1921,MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,98,150000,0,51000,70000,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x37B5,150,1536,540,432,0,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,0,0,0,0,0,0,0,0,0,0
+1922,G_MOROCC_1,Incarnation of Morroc,Incarnation of Morroc,97,120000000,0,0,0,2,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,26,0x37B5,110,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1923,G_MOROCC_2,Incarnation of Morroc,Incarnation of Morroc,97,120000000,0,0,0,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x37B5,150,576,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1924,G_MOROCC_3,Incarnation of Morroc,Incarnation of Morroc,96,120000000,0,0,0,1,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x37B5,150,212,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1925,G_MOROCC_4,Incarnation of Morroc,Incarnation of Morroc,98,120000000,0,0,0,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x37B5,150,1536,540,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // God Item Creation (WoE SE); Catacombs
 1926,JAKK_H,Jakk,Jakk,38,300,0,0,0,1,5,5,5,30,1,38,38,43,75,45,10,12,1,0,43,0x3695,200,1180,648,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1927,WHISPER_H,Whisper,Whisper,34,100,0,0,0,1,5,5,0,45,1,51,14,0,60,0,10,12,0,6,68,0x3195,150,1960,504,960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1928,DEVIRUCHI_H,Deviruchi,Deviruchi,46,500,0,0,0,1,5,5,10,25,1,69,40,55,70,30,10,12,0,6,27,0x3795,150,980,384,600,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1929,I_BAPHOMET,Great Demon Baphomet,Great Demon Baphomet,98,4520000,0,4520000,2520000,1,16000,16001,35,45,1,152,5,85,200,95,10,12,2,6,67,0x37B5,100,768,768,576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1930,PIAMETTE,Piamette,Piamette,90,300000,0,0,0,1,7,10,35,35,1,1,1,1,6,30,10,12,0,7,20,0x37B5,150,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1931,WISH_MAIDEN,Wish Maiden,Wish Maiden,98,3500000,0,0,0,1,7,10,25,42,1,1,1,1,6,30,10,12,2,8,28,0x37B5,150,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1932,GARDEN_KEEPER,Garden Keeper,Garden Keeper,1,200,0,0,0,1,7,10,100,99,1,1,1,1,6,30,10,12,1,3,22,0xC1,512,1872,512,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1933,GARDEN_WATCHER,Garden Watcher,Garden Watcher,1,10000,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,26,0x37B5,512,1872,512,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1934,BLUE_FLOWER,Blue Flower,Blue Flower,1,10000,0,0,0,1,7,10,100,99,1,1,1,1,6,30,10,12,1,3,22,0x40,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1935,RED_FLOWER,Red Flower,Red Flower,1,10000,0,0,0,1,7,10,100,99,1,1,1,1,6,30,10,12,1,3,22,0x40,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1936,YELL_FLOWER,Yellow Flower,Yellow Flower,1,10000,0,0,0,1,7,10,100,99,1,1,1,1,6,30,10,12,1,3,22,0x40,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1937,G_CONSTANT_,Constant,Constant,55,10000,0,3230,116,1,460,580,12,12,50,28,26,47,66,14,10,12,0,0,67,0x3885,150,720,360,360,0,0,0,0,0,0,0,0,7512,100,7507,1500,7325,10,999,10,757,10,0,0,0,0,0,0,0,0,0,0
+1930,PIAMETTE,Piamette,Piamette,90,3000000,0,0,0,1,15000,20000,35,35,1,1,5,100,1,30,10,12,0,7,20,0x37B5,150,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1931,WISH_MAIDEN,Wish Maiden,Wish Maiden,98,3567200,0,0,0,1,32000,32001,25,42,1,1,30,130,1,30,10,12,2,8,28,0x37B5,150,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1932,GARDEN_KEEPER,Garden Keeper,Garden Keeper,80,200,0,0,0,1,1,2,100,99,1,1,1,1,1,1,10,12,1,3,42,0xC1,512,1872,512,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1933,GARDEN_WATCHER,Garden Watcher,Garden Watcher,81,300000,0,0,0,1,1666,2609,55,55,1,1,56,150,1,30,10,12,1,3,80,0x37B5,512,1872,512,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1934,BLUE_FLOWER,Blue Flower,Blue Flower,98,10000,0,0,0,1,1,2,100,99,1,1,1,1,1,1,10,12,1,3,22,0x40,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1935,RED_FLOWER,Red Flower,Red Flower,98,10000,0,0,0,1,1,2,100,99,1,1,1,1,1,1,10,12,1,3,22,0x40,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1936,YELL_FLOWER,Yellow Flower,Yellow Flower,98,10000,0,0,0,1,1,2,100,99,1,1,1,1,1,1,10,12,1,3,22,0x40,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1937,CONSTANT_,Constant,Constant,55,10000,0,3230,116,1,460,580,12,12,50,28,26,47,66,14,10,12,0,0,67,0x3885,150,720,360,360,0,0,0,0,0,0,0,0,7512,100,7507,1500,7325,10,999,10,757,10,0,0,0,0,0,0,0,0,0,0
 1938,TREASURE_BOX41,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7830,80,658,500,12999,10000,984,4850,985,7275,2514,40,1625,150,1268,150,0,0,0,0
 1939,TREASURE_BOX42,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7831,80,658,500,12999,10000,984,4850,985,7275,2513,40,1375,150,1269,150,0,0,0,0
 1940,TREASURE_BOX43,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7832,80,658,500,12999,10000,984,4850,985,7275,13027,150,1376,150,1271,150,0,0,0,0
@@ -986,36 +986,36 @@
 1944,TREASURE_BOX47,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7836,80,658,500,12999,10000,984,4850,985,7275,1478,150,1732,150,2531,50,0,0,0,0
 1945,TREASURE_BOX48,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7837,80,658,500,12999,10000,984,4850,985,7275,1624,150,1733,150,1821,150,0,0,0,0
 1946,TREASURE_BOX49,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7838,80,658,500,12999,10000,984,4850,985,7275,1626,150,1270,150,2532,50,0,0,0,0
-1947,G_PIAMETTE,Piamette,Piamette,90,300000,0,0,0,1,7,10,35,35,1,1,1,1,6,30,10,12,0,7,20,0x37B5,150,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1949,G_SWORD_GUARDIAN_,Sword Guardian,Sword Wardian,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1950,G_ARCHER_GUARDIAN_,Archer Guardian,Archer Guardian,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1947,G_PIAMETTE,Piamette,Piamette,90,500000,0,0,0,1,5000,6000,35,35,1,1,5,100,1,30,10,12,0,7,20,0x37B5,150,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1948,G_YGNIZEM,Ygnizem,Egnigem Cenia,58,11200,0,0,0,1,823,1212,35,8,60,35,52,18,79,20,10,12,1,7,43,0x3885,145,576,432,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1949,B_S_GUARDIAN_,Camp Guardian,Camp Gardian,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1950,B_B_GUARDIAN_,Camp Guardian,Camp Guardian,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // ??
-1951,G_CRYSTAL_1,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1952,G_CRYSTAL_2,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1953,G_CRYSTAL_3,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1954,G_CRYSTAL_4,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1955,TREASURE_BOX50,Treasure Box,Treasure Box,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1951,G_CRYSTAL_6,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1952,G_CRYSTAL_7,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1953,G_CRYSTAL_8,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1954,G_CRYSTAL_9,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1955,TREASURE_BOX_I,Treasure Chest,Treasure Chest,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Endless Tower
 1956,NAGHT_SIEGER,Naght Seiger,Naght Seiger,99,8000000,0,4000000,2000000,1,32000,64000,60,40,1,50,80,220,220,30,10,12,2,6,88,0x37B5,100,868,768,480,2000000,10000,617,5500,603,5000,732,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1957,ENTWEIHEN,Entweihen Knothen,Entweihen Knothen,90,5400000,0,2700000,1350000,12,32000,40000,44,66,1,70,40,250,220,30,10,12,1,6,87,0x1A4,400,1872,672,480,1350000,10000,617,5500,603,5000,732,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1958,G_ENTWEIHEN_1,Thorn of Recovery,Thorn of Recovery,89,350000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1959,G_ENTWEIHEN_2,Thorn of Bone,Thorn of Bone,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1960,G_ENTWEIHEN_3,Thorn of Magic,Thorn of Magic,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1961,G_ENTWEIHEN_4,Thorn of Purity,Thorn of Purity,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1962,G_ANTONIO,Antoni,Antonio,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-// New Pet
-1963,P_CHUNG_E,Chung E,New Year Doll,49,23900,0,2396,993,1,460,1050,8,15,38,65,43,30,90,15,10,12,1,7,40,0x3695,170,1728,816,1188,0,0,0,0,0,0,0,0,7053,4850,740,100,1806,10,518,500,0,0,0,0,0,0,5042,2,0,0,0,0
-// Unknown Monsters
-//1964,NIGHTMARE,Nightmare,Nightmare,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1965,WILD_RoSE,Wild Rose,Wild Rose,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1966,DOPPELGANGER,Doppelganger,Doppelganger,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1967,YGNIZEM,Ygnizem,Egnigem Cenia,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1968,STROUF,Strouf,Strouf,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1969,MARC,Marc,Marc,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1970,OBEUNE,Obeune,Obeune,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1971,VADON,Vadon,Vadon,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1972,MARINA,Marina,Marina,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1973,PORING,Poring,Poring,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1957,ENTWEIHEN,Entweihen Crothen,Entweihen Crothen,90,5400000,0,2700000,1350000,12,32000,40000,44,66,1,70,40,250,220,30,10,12,1,6,87,0x1A4,400,1872,672,480,1350000,10000,617,5500,603,5000,732,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1958,G_ENTWEIHEN_R,Thorny Skeleton,Thorny Skeleton,89,350000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1959,G_ENTWEIHEN_H,Thorn of Recovery,Thorn of Recovery,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1960,G_ENTWEIHEN_M,Thorn of Magic,Thorn of Magic,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1961,G_ENTWEIHEN_S,Thorn of Purification,Thorn of Purification,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+// Additional Monsters
+1962,ANTONIO_,Christmas Thief,Christmas Thief,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1963,P_CHUNG_E,New Year Doll,New Year Doll,49,23900,0,2396,993,1,460,1050,8,15,38,65,43,30,90,15,10,12,1,7,40,0x3695,170,1728,816,1188,0,0,0,0,0,0,0,0,7053,4850,740,100,1806,10,518,500,0,0,0,0,0,0,5042,2,0,0,0,0
+1964,NIGHTMARE_T,Nightmare,Nightmare,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1965,M_WILD_RoSE,Wild Rose,Wild Rose,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1966,M_DOPPELGANGER,Doppelganger,Doppelganger,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1967,M_YGNIZEM,Ygnizem,Egnigem Cenia,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1968,E_STROUF,Strouf,Strouf,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1969,E_MARC,Marc,Marc,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1970,E_OBEUNE,Obeune,Obeune,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1971,E_VADON,Vadon,Vadon,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1972,E_MARINA,Marina,Marina,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1973,E_PORING,Poring,Poring,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // WoE SE Guild Dungeon
 1974,BANSHEE_MASTER,Banshee Master,Banshee Master,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1975,BEHOLDER_MASTER,Beholder Master,Beholder master,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1024,20 +1024,24 @@
 1978,HELL_APOCALIPS,Hell Apocalips,Hell Apocalypse,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1979,ZUKDAM,Zukadam,Zukadam,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1980,KUBLIN,Kubkin,Kublin,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-// New Orc Dungeon
-1981,HIGH_ORC,High Orc,High Orc,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1982,ORC_ARCHER,Orc Archer,Orc Archer,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1983,ZENORC,Zenorc,Zenorc,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1984,ORC_LORD,Orc Lord,Orc Lord,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+// Orc Dungeon Instance
+1981,I_HIGH_ORC,High Orc,High Orc,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1982,I_ORC_ARCHER,Orc Archer,Orc Archer,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1983,I_ZENORC,Zenorc,Zenorc,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1984,I_ORC_LORD,Orc Lord,Orc Lord,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 // Another World (13.1)
 1985,DANDELION,Dandelion,Dandelion,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1986,TATACHO,Tatacho,Tatacho,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1987,CENTIPEDE,Centipede,Centipede,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1988,NEPENTHES,Nepenthes,Nepenthes,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1989,HILLSRION,Hill Lion,Hill Lion,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1989,HILLSRION,Hills Lion,Hills Lion,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1990,HARDROCK_MOMMOTH,Hardrock Mammoth,Hardrock Mammoth,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1991,TENDRILRION,Tendril Lion,Tendril Lion,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1992,CORNUS,Cornus,Cornus,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1993,NAGA,Naga,Naga,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1994,LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1995,PINGUICULA,Pinguicula,Pinguicula,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
\ No newline at end of file
+1995,PINGUICULA,Pinguicula,Pinguicula,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+//1996,BACSOJIN_T
+//1997,G_TATACHO
+//1998,G_HILLSRION
+//1999,CENTIPEDE_LARVA
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index e3052379f..e97a4eb70 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,12 @@
 Date		Added
 ======
+2008/08/19
+	* Rev. 13091 Rather large update to the Keil Hyre quest. [L0ne_W0lf]
+	- Update does not add any of the changes made by iRO.
+	- Many updates, see script or tracker for details.
+	* Fixed condition check in turtle island warper. (bugreport:1943)
+	* Removed the duplicate NPC "Mudie" from Hugel City. (bugreport:2079)
+	* Corrected Umbala Dismantle/create Essence NPC. (bugreport:2089)
 2008/08/16
 	* Rev. 13085 Fixed typo in disable/enable npc's (bugreport:2027) [Yommy]
 2008/08/11
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index 1c0012a36..2ff6ec683 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -4,7 +4,7 @@
 //= vicious_pucca, Poki#3, erKURITA, Munin, and everybody in the
 //= comments
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= eAthena 1.0
 //===== Description: =========================================
@@ -25,6 +25,7 @@
 //= 1.3 Moved some quests-related NPCs to proper file. [SinSloth]
 //= 1.4 Optimized the Party Supplies Shop [DZeroX]
 //= 1.5 Fixed Party Supplies Shop. [L0ne_W0lf]
+//= 1.6 Removed duplicate "Mudie". [L0ne_W0lf]
 //============================================================
 
 //---------------------------------------------------------------------------
@@ -67,36 +68,6 @@ hugel,126,151,3	script	Emily	90,{
 	
 }
  
-//Mudie
-//---------------------------------------------------------------------------
-hugel,85,93,3	script	Mudie	866,{
-
-	mes "[Mudie]";
-	mes "The Monster Races";
-	mes "are probably the biggest";
-	mes "attraction here in Hugel.";
-	mes "We don't have much else";
-	mes "going on here, I'm afraid.";
-	next;
-	mes "[Mudie]";
-	mes "If you want to go visit";
-	mes "the Monster Race Arena,";
-	mes "just head towards the";
-	mes "7 'o clock direction on";
-	mes "your Mini-Map, and look for";
-	mes "the hill surrounded by a fence.";
-	next;
-	mes "[Mudie]";
-	mes "You should find the arena";
-	mes "somewhere around that area.";
-	mes "Anyway, if you want to wager";
-	mes "or just watch the races, just";
-	mes "ask one of the Eckar brothers.";
-	mes "I hope you enjoy our little town~";
-	close;
-	
-}
-
 //Kayplas
 //---------------------------------------------------------------------------
 hugel,86,165,5	script	Kayplas	896,{
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 6d2fc1dae..12f006709 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf (Script), DZeroX (Timer)
 //===== Current Version: ===================================== 
-//= 3.9
+//= 4.0
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -27,7 +27,7 @@
 //	Corrected Elly showing cutin but not text for some states of the quest (causing players to log off to continue).
 //	Let fisherman talk to you when you have 10 fishes OR MORE.
 //	Corrected not letting you enter the tombstone after finishing the quest.
-//= 1.8 Elly now deletes the Steel_box, and Kiel Hyre deletes the Pin. [L0ne_W0lf]
+//= 1.8 Elly now deletes the Iron_Box, and Kiel Hyre deletes the Pin. [L0ne_W0lf]
 //= 	More security on the 5th Big Door, now makes sure no one outside of who-
 //=	acticated it initially can use it. Resets after 10 minutes to make it.
 //=	Made it so that you need to be at least step 84 to activate the final door.
@@ -45,7 +45,7 @@
 //=	Added some of the missing dialogs for several NPCs, and fixed a few NPC locations.
 //=	ALL books can now trigger the wall.
 //=	Allysia will now summon 4 (was 2) G_CONSTANTS instead of REGULAR constants.
-//=	Fixed where Golden_Key and Exquisite_Button are deleted.
+//=	Fixed where Golden_Key and Kiel_Button are deleted.
 //=	Removed KHTimerEnd, and instead use OnReset.
 //=	Fixed typo in the second NPC that gives Black Keycards.
 //=	Added Monster Warps. (Keeps monsters from being in dungeon quest area.) [Non-functional]
@@ -75,7 +75,20 @@
 //= 3.7 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 3.8 Corrected some delitems. (bugreport:690) [Samuray22]
 //= 3.9 Fixed a cutin not being erased. (bugreport:1539) [L0ne_W0lf]
+//= 4.0 A whole bunch-a-updates to various npcs. [L0ne_W0lf]
+//=     Corrected condition checks throughout the quest.
+//=     Npcs no longer make use of the goto command.
+//=     Uses temp npc vars now instead of temp char.
+//=     Reduced the amount of variables used.
+//=     Corrected some of the cutins in npcs with them.
+//=     Added the missing dialogs and weight checks.
+//=     Fixed many typos, and grammatical errors.
+//=     NPC now names use '#<name>' instead of labels.
+//=     Updated some NPC positions, and facings.
+//=     Changed the way some NPCs work.
+//=     Updated comments for get/delitem commands.
 //============================================================ 
+
 //============================================================================
 // Kiel Hyre Quest/Robotic Lab Dungeon
 //
@@ -88,21 +101,10 @@
 //  - Let it be noted that ALL DIALOG IS OFFICIAL TO IRO UNLESS SPECIFIED.
 //  - I've fixed a few of iRO's mistakes, but I'm sure I made some of my own. 
 //  - Will probably require a major optimizing.
-//  - Accidentally progressed Elly's dialog while reading 'Letter to Elly'. Improvising.
-//  - Possible missing dialog for some getitem weight checks.
-//  - Possible missing dialog for "Test Tube" if you haven't read the second poem.
-//  - Possible missing dialog for Elly in Dromitory if you don't have "Steel Box"
-//  - Possible missing dialog for "Grave" if you don't have "Yellow Keycard"
 //  - Not going to list ALL of the more usless NPCs. (Doors + Empty "Beautiful Ladies")
-//  - Accidently progressed Kiel Hyre's dialog. Improvising.
-//  - Improvising for getting back in to see Mitchell if you butterfly wing and need to get back in.
-//  - Possible missing dialog for "Odd Grandma"
-//  - Possible missing dialog for "Shelf"
 //  - Near the end I finshed the quest with some people. Used packet logging to get dialog.
 //    Because of the above mentioned, NPC placement and dialog is a little sloppier.
-//  - Possible missing dialog for "Kiel Hyre" (Accept and Okay responses)
 //  - Parties are *NOT REQUIRED* as per Doddler's Wiki information.
-//  - Possible missing dialog for "Kiel Hyre" if you don't have Allysia's Ring.
 //
 //----------------------------------------------------------------------------
 // [Maps]                [Use]
@@ -120,9 +122,6 @@
 // [Variables in Use]
 //  KielHyreQuest 	- Main quest tracking variable (Quest finished at 106)
 //
-//  KHPubMasterEnd	- Finished with Pun Master if set to 1
-//			- Deleted once no longer needed.
-//
 //  KHToastGirlEnd	- Pick up delivery if set to 1, 
 //			- picked up delivery if set to 2
 //			- finished if set to 3 
@@ -134,7 +133,7 @@
 //  KHCottagePoem2	- Tracks Poem 2 quest in cottage. (finished = 3)
 //			- Deleted once no longer needed.
 //
-//  @KHInput$		- Used with "Security Guard"
+//  .@KHInput$		- Used with "Security Guard"
 //  			- Used with "Test Tube"
 //  			- Used when "Elly" (inputing string in attempt to wake her)
 //  			- Used with "Grave", (twice)
@@ -142,27 +141,20 @@
 //  			- Used with "Mechanical Device"
 //  			- Used for opening various doors in Kiehl's area.
 //
-//  @KHFirstKeyhole	- Holds 1 (green keycard) or 2 (cottage key)
-//  @KHSecondKeyhole	- Holds 1 (green keycard) or 2 (cottage key)
-//
-//  @KHPotionColor$	- Holds 'red', 'green', or 'yellow' depending on what wrong potion is selected.
+//  .@KHFirstKeyhole	- Holds 1 (green keycard) or 2 (cottage key)
+//  .@KHSecondKeyhole	- Holds 1 (green keycard) or 2 (cottage key)
 //
-//  @KHFirstSword 	- holds 1, 2, 3 or 4. Used to keep track of swords and snakes.
-//  @KHSecondSword 	- holds 1, 2, 3 or 4. Used to keep track of swords and snakes.
-//  @KHThirdSword	- holds 1, 2, 3 or 4. Used to keep track of swords and snakes.
-//  @KHFourthSword	- holds 1, 2, 3 or 4. Used to keep track of swords and snakes.
+//  .@KHPotionColor$	- Holds 'red', 'green', or 'yellow' depending on what wrong potion is selected.
 //
-//  @KHClimbAttempt	- Set to random (1-5) to determine if you fail at climbing the water pipe.
+//  .@KHSwords 		- Used with "Sword Hilt"
 //
-//  @KHQ1Read		- Make sure player has asked question 1 to Kiel Hyre
-//  @KHQ2Read		- Make sure player has asked question 2 to Kiel Hyre
-//  @KHQ3Read		- Make sure player has asked question 3 to Kiel Hyre
+//  .@KHQRead		- Make sure player has asked questions to Kiel Hyre
 //
-//  @KHTitle$		- Holds "Mr", "Mrs", or "Miss"
+//  .@KHTitle$		- Holds "Mr", "Mrs", or "Miss"
 //
-//  @KHDoorPushAttempt	- Keeps track of how many times a person has attmepted pushed the door open.
+//  .@KHDoorPushAttempt	- Keeps track of how many times a person has attmepted to push the door open.
 //
-//  @KHPryingItem$	- Used for incorrect options when prying open last door.
+//  .@KHPryingItem$	- Used for incorrect options when prying open last door.
 //
 //  .KHKilled		- Tracks how many monsters have been killed. Used with "Receiver", "Robots", and "Kiehl" NPCs
 //
@@ -196,7 +188,7 @@
 //  Book ........................ kh_vila	[181, 20]
 //  Book ........................ kh_vila	[178, 20]
 //  Book ........................ kh_vila	[175, 19]
-//  KH_Letter_Trigger ........... kh_vila	[179, 11]
+//  Letter ...................... kh_vila	[179, 11]
 //  Box ......................... kh_vila	[ 16,175]
 //  Apple Box ................... kh_vila	[ 30,184]
 //  Map ......................... kh_vila	[ 44,125]
@@ -234,6 +226,7 @@
 //  Shelf ....................... kh_rossi	[ 92, 40]
 //  Desk ........................ kh_rossi	[144,146]
 //  Bookshelf ................... kh_rossi	[144,146]
+//  Bed ......................... kh_rossi	[154,286]
 //  Old Fisherman ............... yuno_fild12	[232,222]
 //  Wooden Board ................ yuno_fild09	[158,217]
 //  Kiehl_Room_Warp ............. kh_mansion	[ 29, 27]
@@ -257,7 +250,6 @@
 //  Kiehl_Room_Trap ............. kh_kiehl02	[ 49, 15]
 //  Kiehl#Original .............. kh_kiehl02	[ 50, 52]
 //  KiehlRoom ................... kh_kiehl02	[  1,  1]
-//  Floating NPC (Agent#KHAgent0::KHAgent)
 //  Mitchell#KiehlRoom .......... kh_kiehl02	[ 49, 55]
 //  Agent#KHAgent1 ....   ....... kh_kiehl02	[ 53, 52]
 //  Agent#KHAgent2 .............. kh_kiehl02	[ 51, 49]
@@ -276,7 +268,6 @@
 //
 //============================================================================
 
-
 //============================================================================
 // Affiliated NPCs
 //============================================================================
@@ -284,7 +275,7 @@
 //----------------------------------------------------------------------------
 // Juno Pub Master/Starting point.
 //----------------------------------------------------------------------------
-yuno_in01,35,179,1	script	Pub Master	46,4,4,{
+yuno_in01,35,179,4	script	Pub Master#kh	46,5,5,{
 	if (checkweight(7487,1) == 0) {
 		mes "[Vandt]";
 		mes "Just a second! You're";
@@ -295,16 +286,59 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 		mes "able to pick up anything new...";
 		close;
 	}
-
+	if (KielHyreQuest == 0) {
+		mes "[Vandt]";
+		mes "Hi there, welcome";
+		mes "to my pub. So what";
+		mes "would you like to have?";
+		next;
+		switch(select("Beer, please.","A cocktail, please.","Soju, please.","Maybe later.")) {
+		case 1:
+			mes "[Vandt]";
+			mes "Alright, let me get";
+			mes "you a glass of beer on";
+			mes "tap. There you are, this";
+			mes "is out special Schwaltz Beer.";
+			next;
+			mes "^3355FF*Gulp gulp gulp*^000000";
+			percentheal 5,-5;
+			next;
+			mes "["+strcharinfo(0)+"]";
+			mes "Ahhh, it's really";
+			mes "good! That really";
+			mes "hits the spot!";
+			close;
+		case 2:
+			mes "[Vandt]";
+			mes "I'm sorry, but I have to";
+			mes "deliver all of our cocktail";
+			mes "ingredients to other customers.";
+			mes "Maybe I'll have enough to make";
+			mes "you something next time, okay?";
+			close;
+		case 3:
+			mes "[Vandt]";
+			mes "S-soju? I'm sorry,";
+			mes "but we don't serve that";
+			mes "here. It's too much of";
+			mes "a tough guy drink for me...";
+			close;
+		case 4:
+			mes "[Vandt]";
+			mes "Sure, just take";
+			mes "your time, relax,";
+			mes "and order something";
+			mes "when you're ready.";
+			close;
+		}
+	}
 	if (KielHyreQuest == 1) {
 		mes "[Vandt]";
 		mes "Hi there, welcome";
 		mes "to my pub. So what";
 		mes "would you like to have?";
 		next;
-
-		switch(select("Beer, please","A cocktail, please","Soju, please.","You look worried, what's up?","Cancel")) {
- 
+		switch(select("Beer, please:A cocktail, please:Soju, please.:You look worried, what's up?:Cancel")) {
 		case 1:
 			mes "[Vandt]";
 			mes "Alright, let me get";
@@ -320,7 +354,6 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 			mes "good! That really";
 			mes "hits the spot!";
 			close;
-
 		case 2:
 			mes "[Vandt]";
 			mes "I'm sorry, but I have to";
@@ -329,7 +362,6 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 			mes "Maybe I'll have enough to make";
 			mes "you something next time, okay?";
 			close;
-
 		case 3:
 			mes "[Vandt]";
 			mes "S-soju? I'm sorry,";
@@ -337,7 +369,6 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 			mes "here. It's too much of";
 			mes "a tough guy drink for me...";
 			close;
-
 		case 4:
 			mes "[Vandt]";
 			mes "Oh, did you overhear?";
@@ -355,9 +386,7 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 			mes "that's available for this";
 			mes "kind of temporary job.";
 			next;
-
-			switch(select("I'm sorry to hear that","Do you want me to help you?")) {
-
+			switch(select("I'm sorry to hear that:Do you want me to help you?")) {
 			case 1:
 				mes "[Vandt]";
 				mes "Well, I'm sure that I'll";
@@ -366,7 +395,6 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 				mes "that'd be interested in";
 				mes "some part time work?";
 				close;
-
 			case 2:
 				mes "[Vandt]";
 				mes "Really? That's great!";
@@ -376,9 +404,7 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 				mes "I expect you to complete the";
 				mes "delivery, no matter what.";
 				next;
-
-				switch(select("Sure I'll do it", "Wait, let me think about it...")) {
-
+				switch(select("Sure I'll do it:Wait, let me think about it...")) {
 				case 1:
 					mes "[Vandt]";
 					mes "I'm glad to hear that.";
@@ -387,10 +413,9 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 					mes "Mrs. ^ff0000Lecollane^000000 in the Kiel";
 					mes "Hyre Academy. I'll pay you";
 					mes "once you finish the job, okay?";
-					getitem 7487,1; //Culinary_Wine
+					getitem 7487,1; //Tavern_Wine
 					set KielHyreQuest,2;
 					close;
-
 				case 2:
 					mes "[Vandt]";
 					mes "Sure thing. I really need";
@@ -400,11 +425,8 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 					mes "people that can, then please";
 					mes "tell them about my situation.";
 					close;
-
 				}
-
 			}
-
 		case 5:
 			mes "[Vandt]";
 			mes "Sure, just take";
@@ -413,9 +435,7 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 			mes "when you're ready.";
 			close;
 		}
-
 	}
-
 	else if ((KielHyreQuest >= 2) && (KielHyreQuest < 6)) {
 		mes "[Vandt]";
 		mes "Please deliver that bottle";
@@ -426,18 +446,16 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 		mes "can complain about the delivery.";
 		close;
 	}
-
-	else if ((KielHyreQuest == 6) && (KHPubMasterEnd != 1)) {
-		mes "[Vandt]";
-		mes "Oh, you're back.";
-		mes "Thanks for making that";
-		mes "delivery. Just give me";
-		mes "a moment, and then I can";
-		mes "pay you in zeny, okay?";
-		next;
-		switch(select("I need more wine...")) {
-
-		case 1:
+	else if (KielHyreQuest > 6) {
+		if (countitem(7487) == 0) {
+			mes "[Vandt]";
+			mes "Oh, you're back.";
+			mes "Thanks for making that";
+			mes "delivery. Just give me";
+			mes "a moment, and then I can";
+			mes "pay you in zeny, okay?";
+			next;
+			select("I need more wine...");
 			mes "[Vandt]";
 			mes "Oh, you need to deliver";
 			mes "another bottle? Alright,";
@@ -452,24 +470,32 @@ yuno_in01,35,179,1	script	Pub Master	46,4,4,{
 			mes "There you go!";
 			mes "Thank you so much";
 			mes "for helping me out~";
-			getitem 7487,1; //Culinary_Wine
+			getitem 7487,1; //Tavern_Wine
 			set zeny,zeny+1000;
-			set KHPubMasterEnd,1;
+			close;
+		}
+		else {
+			mes "[Vandt]";
+			mes "Hey, thanks a lot";
+			mes "for helping me out that";
+			mes "last time. I knew I asked";
+			mes "you out of the blue, but";
+			mes "you ended up being a life";
+			mes "saver! I really appreciate it!";
 			close;
 		}
 	}
-
-	else if ((KielHyreQuest > 6) || (KHPubMasterEnd == 1)) {
-		mes "[Vandt]";		
-		mes "Hey, thanks a lot";
-		mes "for helping me out that";
-		mes "last time. I knew I asked";
-		mes "you out of the blue, but";
-		mes "you ended up being a life";
-		mes "saver! I really appreicate it!";
+	else {
+		mes "[Vandt]";
+		mes "You're a really good";
+		mes "worker, you know that?";
+		mes "Dependable, responsible,";
+		mes "willing to help others, and";
+		mes "proactive too! I think you'll^FFFFFF ^000000 go far in life, kid, I really do~";
 		close;
 	}
 
+//OnTouch2:
 OnTouch:
 	if (KielHyreQuest < 1) {
 		mes "[Vandt]";
@@ -485,7 +511,7 @@ OnTouch:
 //----------------------------------------------------------------------------
 // Juno Toast Sales Girl.
 //----------------------------------------------------------------------------
-yuno,217,114,4	script	Little Kid	96,{
+yuno,217,114,6	script	Little Kid#kh	96,{
 	if (KielHyreQuest < 6) {
 		mes "[Cezu]"; 
 		mes "Fresh, crunchy toast!";
@@ -493,8 +519,7 @@ yuno,217,114,4	script	Little Kid	96,{
 		mes "and get some tooooast~";
 		close;
 	}
-
-	else if ((KielHyreQuest == 6) && (KHToastGirlEnd != 3)) {
+	else if (KielHyreQuest == 6) {
 		if (KHToastGirlEnd < 1) {
 			mes "[Cezu]"; 
 			mes "Fresh, crunchy toast!";
@@ -503,9 +528,7 @@ yuno,217,114,4	script	Little Kid	96,{
 			mes "Oh! Hi hi~ Did you want";
 			mes "to buy some yummy toast?";
 			next;
-
-			switch(select("I'm here for Elly","No, thanks")) {
-
+			switch(select("I'm here for Elly:No, thanks")) {
 			case 1:
 				mes "[Cezu]"; 
 				mes "Oh, I see. Elly must have";
@@ -540,7 +563,6 @@ yuno,217,114,4	script	Little Kid	96,{
 				mes "why, they just are!";
 				set KHToastGirlEnd,1;
 				close;
-
 			case 2:
 				mes "[Cezu]";
 				mes "Okay okay~";
@@ -548,7 +570,6 @@ yuno,217,114,4	script	Little Kid	96,{
 				close;
 			}
 		}
-
 		else if (KHToastGirlEnd == 1) {
 			mes "[Cezu]";
 			mes "Would you please go to";
@@ -559,7 +580,6 @@ yuno,217,114,4	script	Little Kid	96,{
 			mes "to me as soon as you can~";
 			close;
 		}
-
 		else if (KHToastGirlEnd == 2) {
 			mes "[Cezu]";
 			mes "Hey, you're back with the";
@@ -573,9 +593,7 @@ yuno,217,114,4	script	Little Kid	96,{
 			set KHToastGirlEnd,3;
 			close;
 		}
-
 	}
-
 	else if ((KielHyreQuest >= 6) || (KHToastGirlEnd == 3)) {
 		//KHToastGirlEnd no longer needed-- deleting.
 		set KHToastGirlEnd,0;
@@ -585,13 +603,12 @@ yuno,217,114,4	script	Little Kid	96,{
 		mes "Come and get some!";
 		close;
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Lighthalzen WindMill Owner.
 //----------------------------------------------------------------------------
-lighthalzen,365,300,2	script	Windmill Owner	46,{
+lighthalzen,366,299,4	script	Windmill Owner#kh	46,{
 	if (checkweight(7488,1) == 0) {
 		mes "[Mills]";
 		mes "Hey, you've got too much";
@@ -602,7 +619,6 @@ lighthalzen,365,300,2	script	Windmill Owner	46,{
 		mes "here to the miss, didn't you?";
 		close;
 	}
-
 	if (KHToastGirlEnd < 1) {
 		mes "[Mills]";
 		mes "Hey, whaddya want?";
@@ -611,7 +627,6 @@ lighthalzen,365,300,2	script	Windmill Owner	46,{
 		mes "back later? Then we'll talk.";
 		close;
 	}
-
 	else if (KHToastGirlEnd == 1) {
 		mes "[Mills]";
 		mes "Hey, whaddya want?";
@@ -621,9 +636,7 @@ lighthalzen,365,300,2	script	Windmill Owner	46,{
 		mes "you'd better spit it out quick";
 		mes "before things get hectic again.";
 		next;
-
-		switch(select("I'm here for Cezu","......")) {
-
+		switch(select("I'm here for Cezu:......")) {
 		case 1:
 			mes "[Mills]";
 			mes "Oh, Cezu from the";
@@ -644,7 +657,6 @@ lighthalzen,365,300,2	script	Windmill Owner	46,{
 			getitem 7488,1; //Delivery_Package
 			set KHToastGirlEnd,2;
 			close;
-
 		case 2:
 			mes "[Mills]";
 			mes "......";
@@ -654,11 +666,8 @@ lighthalzen,365,300,2	script	Windmill Owner	46,{
 			mes "Cuts, Cutz where are you?";
 			mes "You'd better not be goofing off!";
 			close;
-
 		}
-
 	}
-
 	else if (KHToastGirlEnd >= 2) {
 		mes "[Mills]";
 		mes "That Cutz is such";
@@ -669,7 +678,35 @@ lighthalzen,365,300,2	script	Windmill Owner	46,{
 		mes "a better assistant. He'll learn...";
 		close;
 	}
+}
 
+lighthalzen,366,289,2	script	Windmill Owner's Helper	97,{
+	if (KHToastGirlEnd < 1) {
+		mes "[Cutz]";
+		mes "Man, why are we";
+		mes "always so busy?";
+		mes "Why does Mills have";
+		mes "to work me to the bone?";
+		mes "Eh, it's a living, I suppose...";
+		close;
+	}
+	else if (KHToastGirlEnd >= 2) {
+		mes "[Cutz]";
+		mes "Wh-what makes you";
+		mes "think I'm goofing off,";
+		mes "Mills? L-look, look,";
+		mes "my hands are moving,";
+		mes "I'm busy, I'm working!";
+		close;
+	}
+	else {
+		mes "[Cutz]";
+		mes "Hey, you're from";
+		mes "Cezu's toast stand,";
+		mes "right? How is cute";
+		mes "little Cezu doing?";
+		close;
+	}
 }
 
 //============================================================================
@@ -679,7 +716,7 @@ lighthalzen,365,300,2	script	Windmill Owner	46,{
 //----------------------------------------------------------------------------
 // Girl (Talks about the academy)
 //----------------------------------------------------------------------------
-yuno_fild08,196,196,5	script	Hanie	102,{
+yuno_fild08,196,196,5	script	Hanie#kh1	102,{
 	mes "[Hanie]";
 	mes "Oh, I wish I could study";
 	mes "at the Kiel Hyre Academy...";
@@ -687,35 +724,31 @@ yuno_fild08,196,196,5	script	Hanie	102,{
 	mes "really nice jobs! I'm almost";
 	mes "jealous of the students!";
 	next;
-
-	switch(select("Kiel Hyre Academy?")) {
-
-	case 1:
-		mes "[Hanie]";
-		mes "Oh, the Kiel Hyre Academy";
-		mes "is a school founded by Kiel";
-		mes "Hyre, an inventor that became";
-		mes "rich from his strange machines.";
-		mes "He decided to give back to society";
-		mes "by building this private academy.";
-		next;
-		mes "[Hanie]";
-		mes "However, the school will";
-		mes "only accept orphans that are";
-		mes "too poor to enroll in any other";
-		mes "schools. Sometimes, it makes";
-		mes "me wish that I was an orphan too!";
-		mes "Well, not really, but you know...";
-		close;
-	}
+	select("Kiel Hyre Academy?");
+	mes "[Hanie]";
+	mes "Oh, the Kiel Hyre Academy";
+	mes "is a school founded by Kiel";
+	mes "Hyre, an inventor that became";
+	mes "rich from his strange machines.";
+	mes "He decided to give back to society";
+	mes "by building this private academy.";
+	next;
+	mes "[Hanie]";
+	mes "However, the school will";
+	mes "only accept orphans that are";
+	mes "too poor to enroll in any other";
+	mes "schools. Sometimes, it makes";
+	mes "me wish that I was an orphan too!";
+	mes "Well, not really, but you know...";
+	close;
 }
 
 
 //----------------------------------------------------------------------------
 // Academy Security Guards
 //----------------------------------------------------------------------------
-yuno_fild08,158,194,5	script	Security Guard#1::KHAGuard	852,{
-	if ((KielHyreQuest < 2) && (KielHyreQuest >= 30)) { 
+yuno_fild08,158,194,6	script	Security Guard#1::KHAGuard	852,{
+	if ((KielHyreQuest < 2) && (KielHyreQuest > 31)) { 
 		mes "[Security Guard]";
 		mes "I'm sorry, but if you aren't";
 		mes "associated with this institution,";
@@ -725,8 +758,6 @@ yuno_fild08,158,194,5	script	Security Guard#1::KHAGuard	852,{
 		mes "an appointment with the staff.";
 		close;
 	}
-
-
 	else if (KielHyreQuest == 2) { 
 		mes "[Security Guard]";
 		mes "I'm sorry, but if you aren't";
@@ -736,7 +767,7 @@ yuno_fild08,158,194,5	script	Security Guard#1::KHAGuard	852,{
 		mes "Please leave if you don't have";
 		mes "an appointment with the staff.";
 		next;
-		switch(select("I'm here for a delivery.","......")) {
+		switch(select("I'm here for a delivery.:......")) {
 		case 1:
 			mes "[Security Guard]";
 			mes "You're here to deliver";
@@ -746,25 +777,23 @@ yuno_fild08,158,194,5	script	Security Guard#1::KHAGuard	852,{
 			mes "delivered, and I'll verify it";
 			mes "before letting you inside.";
 			next;
-
-			input @KHDelivery$;
-			if (@KHDelivery$ != "Lecollane") {
+			input .@KHDelivery$;
+			if (.@KHDelivery$ != "Lecollane") {
 				mes "[Security Guard]";
 				mes "You're here to deliver some";
 				mes "Wine to...to who? What was";
 				mes "the name? I...I don't think";
 				mes "we have anybody in the";
-				mes "academy named "+@KHDelivery$+"";
+				mes "academy named "+.@KHDelivery$+"";
 				close;
 			}
-
-			input @KHDelivery$ ;
-			if (@KHDelivery$ != "Culinary Wine") {
+			input .@KHDelivery$ ;
+			if (.@KHDelivery$ != "Culinary Wine") {
 				mes "[Security Guard]";
 				mes "So you're here to make";
 				mes "a delivery to Mrs. Lecollane?";
 				mes "What is it you've brought for";
-				mes "her? Some ^3355FF"+@KHDelivery$+"^000000?";
+				mes "her? Some ^3355FF"+.@KHDelivery$+"^000000?";
 				next;
 				mes "[Security Guard]";
 				mes "Let me buzz her first,";
@@ -785,7 +814,6 @@ yuno_fild08,158,194,5	script	Security Guard#1::KHAGuard	852,{
 				mes "to see if there's been a mixup...";
 				close;
 			}
-
 			mes "[Security Guard]";
 			mes "Alright....";
 			mes "So you're here to";
@@ -806,7 +834,6 @@ yuno_fild08,158,194,5	script	Security Guard#1::KHAGuard	852,{
 			close2;
 			warp "kh_school",71,155;
 			end;
-
 		case 2:
 			mes "[Security Guard]";
 			mes "If you don't have";
@@ -814,12 +841,9 @@ yuno_fild08,158,194,5	script	Security Guard#1::KHAGuard	852,{
 			mes "don't loiter around in";
 			mes "front of the academy!";
 			close;
-
 		}
-
 	}
-
-	else if (KielHyreQuest >= 4) { 
+	else if (KielHyreQuest < 32) { 
 		mes "[Security Guard]";
 		mes "Oh, did you have";
 		mes "other business inside";
@@ -831,7 +855,6 @@ yuno_fild08,158,194,5	script	Security Guard#1::KHAGuard	852,{
 		warp "kh_school",71,155;
 		end;
 	}
-
 }
 
 yuno_fild08,158,183,7	duplicate(KHAGuard)	Security Guard#2	852
@@ -839,7 +862,7 @@ yuno_fild08,158,183,7	duplicate(KHAGuard)	Security Guard#2	852
 //----------------------------------------------------------------------------
 // Gossiping Teenagers/Story NPCs
 //----------------------------------------------------------------------------
-kh_school,57,142,7	script	Student::StudentKHQ1	893,3,3,{
+kh_school,57,142,6	script	Student#kha	893,3,3,{
 	mes "[Laci]";
 	mes "Oh, wow! We usually";
 	mes "don't get visitors on";
@@ -873,7 +896,7 @@ OnTouch:
 	close;
 }
 
-kh_school,57,139,1	script	Student::StudentKHQ2	893,{
+kh_school,57,139,0	script	Student#khb	893,{
 	mes "[Gui Nesha]";
 	mes "Aren't we a little";
 	mes "old to be talking about";
@@ -888,7 +911,7 @@ kh_school,57,139,1	script	Student::StudentKHQ2	893,{
 //----------------------------------------------------------------------------
 // Mrs. Lecollane
 //----------------------------------------------------------------------------
-kh_school,176,60,4	script	Lady::LadyKHQ	101,{
+kh_school,176,60,4	script	Lady#kh	101,{
 	if (KielHyreQuest < 2) {
 		mes "[Mrs. Lecollane]";
 		mes "Is there a problem?";
@@ -896,7 +919,6 @@ kh_school,176,60,4	script	Lady::LadyKHQ	101,{
 		mes "in here, please leave.";
 		close;
 	}
-
 	else if (KielHyreQuest == 2) { 
 		mes "[Mrs. Lecollane]";
 		mes "Oh, hello. Ah!";
@@ -905,9 +927,7 @@ kh_school,176,60,4	script	Lady::LadyKHQ	101,{
 		mes "security guard called and";
 		mes "mentioned you were coming.";
 		next;
-
-		switch(select("Yes, that's right!","Er, s-sorry!")) {
-
+		switch(select("Yes, that's right!:Er, s-sorry!")) {
 		case 1:
 			mes "[Mrs. Lecollane]";
 			mes "Well, you've come a little";
@@ -944,10 +964,9 @@ kh_school,176,60,4	script	Lady::LadyKHQ	101,{
 			mes "may go now, and please";
 			mes "don't wander needlessly";
 			mes "around the academy.";
-			delitem 7487,1; //Culinary_Wine
+			delitem 7487,1; //Tavern_Wine
 			set KielHyreQuest,4;
 			close;
-
 		case 2:
 			mes "[Mrs. Lecollane]";
 			mes "Hm...?";
@@ -957,9 +976,7 @@ kh_school,176,60,4	script	Lady::LadyKHQ	101,{
 			mes "were somebody else.";
 			close;
 		}
-		return;
 	}
-
 	else if (KielHyreQuest == 4) {
 		mes "[Mrs Lecollane]";
 		mes "Well, our business is";
@@ -975,166 +992,153 @@ kh_school,176,60,4	script	Lady::LadyKHQ	101,{
 //----------------------------------------------------------------------------
 // Elly (In school)
 //----------------------------------------------------------------------------
-kh_school,179,39,1	script	Cute Student	895,{
-	set @now_weight,MaxWeight-Weight;
-	if (@now_weight < 2000) {
+kh_school,179,39,0	script	Cute Student#kh	895,{
+	if (checkweight(908,200) == 0) {
 		mes "[Elly]";
 		mes "I'm sorry, but would you";
 		mes "put some of your things in";
-		mes "your kafra Storage first or";
-		mes "soemthing? I can't really";
-		mes "help you whne you're";
+		mes "your Kafra Storage first or";
+		mes "something? I can't really";
+		mes "help you when you're ";
 		mes "carrying so much stuff.";
 		close;
 	}
-
 	cutin "kh_elly01",2;
 	if (KielHyreQuest < 4) { 
 		cutin "kh_elly03",2;
 		mes "[Elly]";
 		mes "W-wah! Oh...!";
-		mes "*Phew* That was close,";
-		mes "I almost dropped them";
+		mes "^333333*Phew*^000000 That was close,";
+		mes "I almost dropped them ";
 		mes "again! Why do I have so much";
 		mes "trouble handling ingredients?";
-		goto KH_Elly_end;
 	}
-
 	else if (KielHyreQuest == 4) { 
 		cutin "kh_elly03",2;
 		mes "[Elly]";
 		mes "Oh no, what should";
-		mes "I do? *Sob* Wh-what";
-		mes "am I going to do? *sniff*";
+		mes "I do? ^333333*Sob*^000000 Wh-what";
+		mes "am I going to do? ^333333*Sniff*^000000";
 		next;
-		switch(select("What happened?","......")) {
-
+		switch(select("What happened?:......")) {
 		case 1:
 			mes "[Elly]";
-			mes "I...I have to finish baking";
+			mes "I... I have to finish baking";
 			mes "this batch of cookies by the";
 			mes "end of today, but then I spilled";
 			mes "all of the ingredients on the";
 			mes "floor. I don't know how I can";
 			mes "bake those cookies now...";
 			next;
-			switch(select("What can I do to help you?","Oh, I'm so sorry.")) {
-
-			case 1: 
+			switch(select("What can I do to help you?:Oh, I'm so sorry.")) {
+			case 1:
 				cutin "kh_elly02",2;
 				mes "[Elly]";
 				mes "What was that...?";
 				mes "You'll really help";
 				mes "me? That's wonderful!";
-				mes "Thank you! Thank you so much!";
-				next;
-				L_Accept:
-				cutin "kh_elly04",2;
-				mes "[Elly]";
-				mes "Well, I guess the only way";
-				mes "I can bake these cookies is";
-				mes "to get some new ingredients.";
-				mes "I'm sorry to be such a burden,";
-				mes "but if you didn't offer to help";
-				mes "me, then I'd have no one to ask!";
-				next;
-				mes "[Elly]";
-				mes "You don't understand how";
-				mes "important it is that I bake";
-				mes "these cookies...If I don't";
-				mes "finish the assignment, then";
-				mes "Mrs. Crank will fail me for";
-				mes "the entire semester!";
-				next;
-				cutin "kh_elly03",2;
-				mes "[Elly]";
-				mes "Okay, I need to calm";
-				mes "down. I think I can do";
-				mes "this with your help.";
-				mes "Would you please do me";
-				mes "this huge favor and bring";
-				mes "all these ingredients?";
-				next;
-				cutin "kh_elly01",2;
-				mes "[Elly]";
-				mes "^3355FF1 Wine^000000";
-				mes "^3355FF7 Milks^000000";
-				mes "^3355FF5 Cacaos^000000";
-				mes "^3355FF2 Cheeses^000000";
-				mes "^3355FF1 Egg^000000, and";
-				mes "^3355FF1 Bag of flour^000000";
+				mes "Thank you! Thanks so much!";
 				next;
-				mes "[Elly]";
-				mes "Let's see...You can";
-				mes "get Wine from the pub in";
-				mes "Juno, Cacaos from hunting";
-				mes "Yoyos, and you can get flour";
-				mes "and Eggs from the girl that";
-				mes "runs the Toast Stand in Juno.";
-				next;
-				mes "[Elly]";
-				mes "Good luck, getting";
-				mes "everything, and I hope";
-				mes "you hurry back here with";
-				mes "those cookie ingredients";
-				mes "as quickly as you can, okay?";
-				set KielHyreQuest,6;
-				goto KH_Elly_end;
-
+				break;
 			Case 2:
 				mes "[Elly]";
-				mes "What, you don't go";
+				mes "Wait, you don't go";
 				mes "to this school, don't";
 				mes "you? Y-you're one of";
 				mes "those adventurers, right?";
 				next;
-				switch(select("Yeah, that's right.")) {
-
-					mes "Listen, I know you";
-					mes "probably have your own";
-					mes "plans, but do  you think";
-					mes "you can help me with this";
-					mes "huge problem that I have?";
+				select("Yeah, that's right.");
+				mes "Listen, I know you";
+				mes "probably have your own";
+				mes "plans, but do  you think";
+				mes "you can help me with this";
+				mes "huge problem that I have?";
+				next;
+				switch(select("Accept:Decline")) {
+				case 1:
+					cutin "kh_elly02",2;
+					mes "How Wonderful!";
+					mes "Thank you! Thank you";
+					mes "so much! I'm supposed to";
+					mes "finish baking this batch of";
+					mes "cookies soon, but I spilled";
+					mes "all of the ingredients...";
 					next;
-					switch(select("Accept","Decline")) {
-		
-					case 1:
-						//bigsmile
-						mes "How Wonderful!";
-						mes "Thank you! Thank you";
-						mes "so much! I'm supposed to";
-						mes "finish baking this batch of";
-						mes "cookies soon, but I spilled";
-						mes "all of the ingredients...";
-						next;
-						goto L_Accept;
-
-					case 2:
-						mes "["+strcharinfo(0)+"]";
-						mes "I'm outta here.";
-						next;
-						emotion e_sob;
-						mes "W-wait...!";
-						mes "Come back, you";
-						mes "d-don't...! I really";
-						mes "need some help!";
-						goto KH_Elly_end;
-
-					}
-
+					break;
+				case 2:
+					mes "["+strcharinfo(0)+"]";
+					mes "I'm outta here.";
+					next;
+					cutin "kh_elly04",2;
+					mes "[Elly]";
+					mes "W-wait...!";
+					mes "Come back, you";
+					mes "d-don't...! I really";
+					mes "need some help!";
+					emotion e_sob;
+					close2;
+					cutin "",255;
+					end;
 				}
-
 			}
-
+			cutin "kh_elly01",2;
+			mes "[Elly]";
+			mes "Well, I guess the only way";
+			mes "I can bake these cookies is";
+			mes "to get some new ingredients.";
+			mes "I'm sorry to be such a burden,";
+			mes "but if you didn't offer to help";
+			mes "me, then I'd have no one to ask!";
+			next;
+			cutin "kh_elly04",2;
+			mes "[Elly]";
+			mes "You don't understand how";
+			mes "important it is that I bake";
+			mes "these cookies... If I don't";
+			mes "finish this assignment, then";
+			mes "Mrs. Crank will fail me for";
+			mes "the entire semester!";
+			next;
+			mes "[Elly]";
+			cutin "kh_elly01",2;
+			mes "Okay, I need to calm";
+			mes "down. I think I can do";
+			mes "this with your help.";
+			mes "Would you please do me";
+			mes "this huge favor and bring";
+			mes "all of these ingredients?";
+			next;
+			mes "[Elly]";
+			mes "^3355FF1 Wine^000000,";
+			mes "^3355FF7 Milks^000000,";
+			mes "^3355FF5 Cacaos^000000,";
+			mes "^3355FF2 Cheeses^000000,";
+			mes "^3355FF1 Egg^000000, and";
+			mes "^3355FF1 Bag of Flour^000000.";
+			next;
+			mes "[Elly]";
+			mes "Let's see... You can";
+			mes "get Wine from a pub in";
+			mes "Juno, Cacaos from hunting";
+			mes "Yoyos, and you can get flour";
+			mes "and Eggs from the girl that";
+			mes "runs the Toast Stand in Juno.";
+			next;
+			mes "[Elly]";
+			mes "Good luck, getting";
+			mes "everything, and I hope";
+			mes "you hurry back here with";
+			mes "those cookie ingredients";
+			mes "as quickly as you can, okay?";
+			set KielHyreQuest,6;
+			break;
 		case 2:
+			mes "[Elly]";
 			mes "*Sob*...";
-			goto KH_Elly_end;
+			break;
 		}
-
 	}
-
 	else if (KielHyreQuest == 6) {
-		//519 - Milk; 548 - Cheese; 7182 - Cacao; 7487 - Culinary_Wine; 7488 - Delivery_Package
 		if ((countitem(519) < 7) || (countitem(548) < 2) || (countitem(7182) < 5) || (countitem(7487) < 1) || (countitem(7488) < 1)) {
 			mes "[Elly]";
 			mes "Let's see, would you";
@@ -1145,24 +1149,23 @@ kh_school,179,39,1	script	Cute Student	895,{
 			mes "quickly bake some cookies~";
 			next;
 			mes "[Elly]";
-			mes "^3355FF1 Wine^000000";
-			mes "^3355FF7 Milks^000000";
-			mes "^3355FF5 Cacaos^000000";
-			mes "^3355FF2 Cheeses^000000";
+			mes "^3355FF1 Wine^000000,";
+			mes "^3355FF7 Milks^000000,";
+			mes "^3355FF5 Cacaos^000000,";
+			mes "^3355FF2 Cheeses^000000,";
 			mes "^3355FF1 Egg^000000, and";
-			mes "^3355FF1 Bag of flour^000000";
+			mes "^3355FF1 Bag of Flour^000000.";
 			next;
+			cutin "kh_elly01",2;
 			mes "[Elly]";
-			mes "Let's see...You can";
-			mes "get Wine from the pub in";
+			mes "Let's see... You can";
+			mes "get Wine from a pub in";
 			mes "Juno, Cacaos from hunting";
 			mes "Yoyos, and you can get flour";
 			mes "and Eggs from the girl that";
 			mes "runs the Toast Stand in Juno.";
-			goto KH_Elly_end;
 		}
 		else {
-			emotion e_ho;
 			cutin "kh_elly02",2;
 			mes "[Elly]";
 			mes "Hooray! Finally, I have";
@@ -1177,29 +1180,25 @@ kh_school,179,39,1	script	Cute Student	895,{
 			delitem 519,7; //Milk
 			delitem 548,2; //Cheese
 			delitem 7182,5; //Cacao
-			delitem 7487,1; //Culinary_Wine
+			delitem 7487,1; //Tavern_Wine
 			delitem 7488,1; //Delivery_Package
-			goto KH_Elly_end;
-
+			emotion e_ho;
 		}
-
 	}
-
 	else if (KielHyreQuest == 8) {
-		cutin "kh_elly01",2;
 		mes "[Elly]";
 		mes "Tadah! I did it!";
 		mes "They're finally done!";
-		mes "''Elly's Special Cookies~''";
-		mes "I'd like you to have some ";
-		mes "as a thanks for helping me out";
+		mes "Elly's special cookies.";
+		mes "I'd like you to have some";
+		mes "as thanks for helping me out.";
 		next;
 		mes "[Elly]";
 		mes "I'm sorry, but I was so";
 		mes "preoccupied with baking";
 		mes "these cookies that I didn't";
 		mes "even ask for your name. I'm";
-		mes "^FF0000Ellyja^000000, but everyone calls me,";
+		mes "^FF0000Ellyja^000000, but everybody calls me,";
 		mes "''Elly.'' What's your name?";
 		next;
 		mes "["+strcharinfo(0)+"]";
@@ -1212,11 +1211,8 @@ kh_school,179,39,1	script	Cute Student	895,{
 		mes "...that name! It's wonderful!";
 		set KielHyreQuest,10;
 		getitem 538,5; //Well_Baked_Cookie
-		goto KH_Elly_end;
 	}
-
 	else if (KielHyreQuest == 10) {
-		cutin "kh_elly01",2;
 		mes "[Elly]";
 		mes "I'm sorry, but I have";
 		mes "another favor to ask you";
@@ -1225,9 +1221,7 @@ kh_school,179,39,1	script	Cute Student	895,{
 		mes "you won't have to hurry as";
 		mes "quickly as you did last time.";
 		next;
-
-		switch(select("What do you need?","Sorry, but I'm pretty busy...")) {
-
+		switch(select("What do you need?:Sorry, but I'm pretty busy...")) {
 		case 1:
 			mes "[Elly]";
 			mes "You know how you helped";
@@ -1245,9 +1239,7 @@ kh_school,179,39,1	script	Cute Student	895,{
 			mes "campus. Would you deliver these";
 			mes "cookies to my grandfather for me?";
 			next;
-
-			switch(select("Sure","I'm busy.")) {
-
+			switch(select("Sure:I'm busy.")) {
 			case 1:
 				cutin "kh_elly02",2;
 				mes "[Elly]";
@@ -1255,7 +1247,7 @@ kh_school,179,39,1	script	Cute Student	895,{
 				mes "Thank you so much, I knew";
 				mes "you'd understand! Would you";
 				mes "please bring the cookies to";
-				mes "him at ^FF0000Kiel Hyre cottage^000000?";
+				mes "him at ^FF0000Kiel Hyre's cottage^000000?";
 				next;
 				mes "[Elly]";
 				mes "Oh, right! They're really";
@@ -1265,41 +1257,36 @@ kh_school,179,39,1	script	Cute Student	895,{
 				mes "my name, they'll let you in.";
 				mes "Alright then, see you~";
 				set KielHyreQuest,12;
-				goto KH_Elly_end;
-
+				break;
 			case 2:
 				cutin "kh_elly03",2;
 				mes "[Elly]";
 				mes "Oh, um...";
-				mes "okay, I'm sorry to";
+				mes "Okay, I'm sorry to";
 				mes "have bothered you...";
-				goto KH_Elly_end;
+				break;
 			}
-
-
+			break;
 		case 2:
 			cutin "kh_elly03",2;
 			mes "[Elly]";
 			mes "Oh, um...";
-			mes "okay, I'm sorry to";
+			mes "Okay, I'm sorry to";
 			mes "have bothered you...";
-			goto KH_Elly_end;
+			break;
 		}
 	}
-
 	else if (KielHyreQuest == 12) {
 		mes "[Elly]";
 		mes "Oh, you don't know where";
-		mes "to find Kiel Hyre cottage?";
+		mes "to find Kiel Hyre's cottage?";
 		mes "It's just north from this";
 		mes "academy. Please deliver my";
-		mes "cookies to grandfather, and";
+		mes "cookies to Grandfather, and";
 		mes "let him know I really miss him.";
-		goto KH_Elly_end;
-
 	}
-
 	else if (KielHyreQuest == 14) {
+		cutin "kh_elly03",2;
 		mes "[Elly]";
 		mes "Hm? Grandfather's not";
 		mes "home? That's strange, he";
@@ -1310,45 +1297,56 @@ kh_school,179,39,1	script	Cute Student	895,{
 		cutin "kh_elly04",2;
 		mes "[Elly]";
 		mes "Would you go back to his";
-		mes "cottage once more time? Here,";
+		mes "cottage one more time? Here,";
 		mes "you can use this Cottage Key.";
 		mes "That way, you can just go";
 		mes "inside and talk to him~";
-		getitem 7489,1; //Cottage Key
+		getitem 7489,1; //Villa_Spare_Key
 		set KielHyreQuest,16;
-		goto KH_Elly_end;
 	}
-
 	else if ((KielHyreQuest >= 14) && (KielHyreQuest < 20)) {
 		mes "[Elly]";
 		mes "That's so weird...";
 		mes "I thought Grandfather";
 		mes "said that he'd be at";
 		mes "home all day today...";
-		goto KH_Elly_end;
 	}
-
 	else if (KielHyreQuest == 20) {
 		mes "[Elly]";
-		mes "Hmmm...?";
+		mes "Hmm...?";
 		mes "What's this,";
 		mes "a letter for me?";
 		next;
-		mes "^3355FFElly opened the envelope^000000";
-		mes "^3355FFand started reading the letter^000000";
+		mes "^3355FFElly opened the envelope";
+		mes "and started reading the letter.^000000";
 		next;
-		mes "Dearest Elly";
-		mes "^FFFFFF_^000000";
+		mes "^333333Dearest Elly,";
+		mes " ";
 		mes "I have something to discuss";
 		mes "with my son Kiehl, so I am";
 		mes "leaving to meet with him.";
 		mes "If you don't hear from me";
-		mes "7 days after I've written";
-		mes "it's possible I may be in";
-		mes "trouble. Don't trust anyone";
-		mes "at the Academy, Elly.";
-		mes "I've left something for you";
-		mes "in the Study.";
+		mes "after 7 days after I've written";
+		mes "this letter, then you must";
+		mes "escape the academy as soon";
+		mes "as possible, and retrieve";
+		mes "something inside our ";
+		mes "cottage's study.";
+		mes " ";
+		mes "If you have a friend you";
+		mes "can trust, please ask him";
+		mes "to follow my traces in the";
+		mes "cottage. I might be in danger,";
+		mes "and in dire need of rescue.";
+		mes " ";
+		mes "Elly, don't trust anyone";
+		mes "in the academy, even your";
+		mes "classmates, since they may";
+		mes "be influenced by Kiehl.";
+		mes " ";
+		mes "Be careful, and I love you.";
+		mes " ";
+		mes "--Grandpa^000000";
 		next;
 		cutin "kh_elly03",2;
 		mes "[Elly]";
@@ -1359,24 +1357,22 @@ kh_school,179,39,1	script	Cute Student	895,{
 		mes "Oh no, what should I do?";
 		delitem 7490,1; //Letter_to_Elly
 		set KielHyreQuest,22;
-		goto KH_Elly_end;
 	}
-
 	else if (KielHyreQuest == 22) {
+		cutin "kh_elly03",2;
 		mes "[Elly]";
 		mes "......";
 		mes ".........";
 		mes "............";
 		next;
-		switch(select("About your grandpa","Tell me about Kiehl","What's with this academy?")) {
-
+		switch(select("About your grandpa:Tell me about Kiehl:What's with this academy?")) {
 		case 1:
 			mes "[Elly]";
 			mes "Oh! My grandfather is";
 			mes "Kiel Hyre, founder and";
 			mes "CEO of the Kiel Hyre";
 			mes "foundation. He looks";
-			mes "strict and cold hearted";
+			mes "strict and cold hearted,";
 			mes "but he's actually very nice!";
 			next;
 			mes "[Elly]";
@@ -1384,10 +1380,9 @@ kh_school,179,39,1	script	Cute Student	895,{
 			mes "blood, but he's taken";
 			mes "care of me ever since";
 			mes "I lost my parents. Oh,";
-			mes "Grandpa, where are you?";
+			mes "Grandapa, where are you?";
 			mes "I'm getting so worried!";
-			goto KH_Elly_end;
-
+			break;
 		case 2:
 			mes "[Elly]";
 			mes "Kiehl? That's my";
@@ -1409,9 +1404,8 @@ kh_school,179,39,1	script	Cute Student	895,{
 			mes "I have no idea why my";
 			mes "grandpa and Kiehl don't";
 			mes "get along. They're both";
-			mes "really good at what they do.";
-			goto KH_Elly_end;
-
+			mes "really good at what they do...";
+			break;
 		case 3:
 			mes "[Elly]";
 			mes "Well, I know the security";
@@ -1425,8 +1419,8 @@ kh_school,179,39,1	script	Cute Student	895,{
 			mes "special curriculum where";
 			mes "you learn more of what you";
 			mes "want. Personally, I want to";
-			mes "become a great career woman,";
-			mes "like ^3355FFMs. Allysia^000000. Heh heh~";
+			mes "become a great career woman";
+			mes "like ^0000FFMs. Allysia^000000. Heh heh~";
 			next;
 			mes "[Elly]";
 			mes "This place certainly";
@@ -1446,11 +1440,10 @@ kh_school,179,39,1	script	Cute Student	895,{
 			mes "[Elly]";
 			mes "But I'll be okay!";
 			mes "You'll be there to";
-			mes "rescue me from danger";
+			mes "rescue me from danger,";
 			mes "right, "+strcharinfo(0)+"?";
 			next;
-			switch(select("Who is Ms. Allysia?","Strange incidents?")) {
-
+			switch(select("Who is Ms. Allysia?:Strange incidents?")) {
 			case 1:
 				mes "[Elly]";
 				mes "Oh, Ms. Allysia is";
@@ -1458,8 +1451,7 @@ kh_school,179,39,1	script	Cute Student	895,{
 				mes "She's so beautiful, and";
 				mes "my grandfather really";
 				mes "trusts her with everything!";
-				goto KH_Elly_end;
-
+				break;
 			case 2:
 				cutin "kh_elly04",2;
 				mes "[Elly]";
@@ -1472,10 +1464,10 @@ kh_school,179,39,1	script	Cute Student	895,{
 				mes "[Elly]";
 				mes "I know it sounds crazy,";
 				mes "but this ghost wanders the";
-				mes "campus, and curses it's victims,";
+				mes "campus, and curses its victims,";
 				mes "making them so cold and lifeless.";
 				mes "It happened to my roommate,";
-				mes "Mayo. It's like she's a statue.";
+				mes "Mayo. It's like she's a statue...";
 				next;
 				mes "[Elly]";
 				mes "I snuck into the medical";
@@ -1492,28 +1484,19 @@ kh_school,179,39,1	script	Cute Student	895,{
 				mes "''^FF0000Wake up, Elly!^000000''";
 				mes "That'll wake me up for sure!";
 				set KielHyreQuest,24;
-				goto KH_Elly_end;
-
+				break;
 			}
-
 		}
-
 	}
-
-	else if (KielHyreQuest == 24) {
+	else if (KielHyreQuest >= 24 || KielHyreQuest >= 26) {
 		cutin "kh_elly04",2;
 		mes "[Elly]";
-		mes "Arg, I'm in a fix!";
+		mes "Argh, I'm in a fix!";
 		mes "I have to finish my";
 		mes "homework before it's due!";
 		mes "Yeah, I've got to go see";
 		mes "Mrs. Lecollane now.";
 		next;		
-		goto KH_Step26;
-	}
-
-	else if (KielHyreQuest == 26) {
-	KH_Step26:
 		mes "[Elly]";
 		mes "Say, "+strcharinfo(0)+",";
 		mes "if it's okay, would you";
@@ -1541,173 +1524,155 @@ kh_school,179,39,1	script	Cute Student	895,{
 		mes "Hurry, hurry, the";
 		mes "teacher's coming!";
 		set KielHyreQuest,26;
-		goto KH_Elly_end;
 	}
-
-	else if (KielHyreQuest > 26) {
-		mes "[Elly]";
-		mes "Say, "+strcharinfo(0)+",";
-		mes "if it's okay, would you";
-		mes "please go find what my";
-		mes "grandpa left for me in";
-		mes "the ^FF0000cottage study^000000? You're";
-		mes "the only one I can trust!";
-		next;
-		mes "[Elly]";
-		mes "Anyway, I'll see you later";
-		mes "in the evening! Please come";
-		mes "by my ^FF0000dorm room^000000. Um, the";
-		mes "dorms are in the church just";
-		mes "behind the academy, okay?";
-		next;
-		mes "[Elly]";
-		mes "My room is in the back,";
-		mes "and it's on the ^FF0000second floor^000000";
-		mes "^FF0000on the left side^000000. Please use";
-		mes "a ladder to come up, okay?";
-		mes "I'll leave my window open";
-		mes "for you, so just come, okay?";
-		next;
+	else {
 		mes "[Elly]";
 		mes "Hurry, hurry, the";
 		mes "teacher's coming!";
-		goto KH_Elly_end;
 	}
-
-	KH_Elly_end:
-		close2;
-		cutin "",255;
-		end;
+	close2;
+	cutin "",255;
+	end;
 }
 
 //----------------------------------------------------------------------------
 // Elly's Window 
 //----------------------------------------------------------------------------
-yuno_fild08,69,185,0	script	Window::WindowKHQ1	111,{
-	if ((KielHyreQuest <= 28) || (KielHyreQuest >= 46)){
-		mes "^3355FFThis must be Elly's room.^000000";
-		mes "^3355FFIt doesn't sound like anyone^000000";
-		mes "^3355FFis inside, so the probably^000000";
-		mes "^3355FFisn't back yet. For now, you^000000";
-		mes "^3355FFshould try to find what her^000000";
-		mes "^3355FFgrandfather left for her^000000";
-		mes "^3355FFin their cottage's study.^000000";
+yuno_fild08,69,185,0	script	Window#kh	111,{
+	if (KielHyreQuest > 29) {
+		mes "^3355FFYou can see a curtain";
+		mes "decorated with a cute";
+		mes "design through the";
+		mes "window of this room,";
+		mes "which is probably";
+		mes "used by a young girl.^000000";
 		close;
 	}
-
-	if (KielHyreQuest >= 30) {
-		mes "^3355FFThis slightly open window^000000";
-		mes "^3355FFmust lead into Elly's room.^000000";
-		mes "^3355FFAlthought she asked you to^000000";
-		mes "^3355FFfind a ladder to enter her^000000";
-		mes "^3355FFwindow, you probably won't^000000";
-		mes "^3355FFfind one. You might be able^000000";
-		mes "^3355FFto climb up that water pipe...^000000";
+	if (KielHyreQuest > 30) {
+		mes "^3355FFThis must be Elly's room.";
+		mes "It doesn't sound like anyone";
+		mes "is inside, so she probably";
+		mes "isn't back yet. For now, you";
+		mes "should try to find what her";
+		mes "grandfather left for her";
+		mes "in their cottage's Study.^000000";
+		close;
+	}
+	if ((KielHyreQuest <= 30) && (KielHyreQuest >= 45)) {
+		mes "^3355FFThis slightly open window";
+		mes "must lead into Elly's room.";
+		mes "Although she asked you to";
+		mes "find a ladder to enter her";
+		mes "window, you probably won't";
+		mes "find one. You might be able";
+		mes "to climb up that water pipe...^000000";
 		next;
-		switch(select("Climb Water Pipe","Find Another Way")) {
-
+		switch(select("Climb Water Pipe:Find Another Way")) {
 		case 1:
-			set @KHClimbAttempt,rand(1,5);
-			if (@KHClimbAttempt == 1) {
-				mes "^3355FFYou climbed up the^000000";
-				mes "^3355FFwater pipe, and sneaked^000000";
-				mes "^3355FFinto Elly's room successfully.^000000";
+			if (rand(1,3) == 2) {
+				mes "^3355FFYou climbed up the";
+				mes "water pipe, and sneaked";
+				mes "into Elly's room successfully.^000000";
 				close2;
 				warp "kh_school",185,185;
 				end;
 			}
-
 			else {
-				mes "^3355FFYou tried to climb^000000";
-				mes "^3355FFthe water pope, but^000000";
-				mes "^3355FFyou ended up failing^000000";
-				mes "^3355FFand bumping your head^000000";
+				mes "^3355FFYou tried to climb";
+				mes "the water pipe, but";
+				mes "you ended up falling";
+				mes "and bumping your head.^000000";
 				percentheal -10,0;
 				close;
 			}
-
 		case 2:
-			mes "^3355FFThere must be some^000000";
-			mes "^3355FFother way to get into^000000";
-			mes "^3355FFElly's room, aside from^000000";
-			mes "^3355FFclimbing up this water pipe...^000000";
+			mes "^3355FFThere must be some";
+			mes "other way to get into";
+			mes "Elly's room, aside from";
+			mes "climbing up this water pipe...^000000";
 			close;
 
 		}
-
 	}
-
+	else {
+		mes "^3355FFYou can't go up into";
+		mes "that open window.^000000";
+		close;
+	}
 }
 
 //----------------------------------------------------------------------------
 // Elly (In Dormitory)
 //----------------------------------------------------------------------------
-kh_school,178,180,5	script	Elly	895,{
-	set @now_weight,MaxWeight-Weight;
-	if (@now_weight < 2000) {
-		mes "^3355FF- Wait!! -";
-		mes "- You are carrying too many items";
-		mes "- and are unable to accept any more. -";
-		mes "- Please make some space avaliable";
-		mes "- in your inventory before returning. -^000000";
+kh_school,178,180,4	script	Elly	895,{
+	if (checkweight(908,200) == 0) {
+		mes "^3355FFJust a second...";
+		mes "You're carrying too";
+		mes "many items with you";
+		mes "right now, so you'll";
+		mes "need to free up more";
+		mes "Inventory space first...^000000";
 		close;
 	}
-
 	if (KielHyreQuest < 30) {
 		mes "[Elly]";
-		mes "Oh~!";
-		mes "Who are you!";
-		mes "How did you get here? Please leave";
+		mes "Who the heck are you?";
+		mes "Y-you're not supposed";
+		mes "to be able to get inside!";
+		mes "Get out of here right now!";
 		close2;
 		percentheal -99,0;
 		warp "yuno_fild08",100,100;
 		end;
 	}
-
+	else if (KielHyreQuest < 32) {
+		mes "[Elly]";
+		mes "......";
+		mes ".........";
+		mes "............";
+		close;
+	}
 	else if (KielHyreQuest == 32) {
 		mes "[Elly]";
 		mes "......";
 		mes ".........";
 		mes "............";
 		next;
-		mes "^3355FFElly seems to have^000000";
-		mes "^3355FFbeen cursed, and is^000000";
-		mes "^3355FFcompletely still and^000000";
-		mes "^3355FFlifeless. You've got to^000000";
-		mes "^3355FFtry something, but what?^000000";
+		mes "^3355FFElly seems to have";
+		mes "been cursed, and is";
+		mes "completely still and";
+		mes "lifeless. You've got to";
+		mes "try something, but what?^000000";
 		next;
-
-		switch(select("Wake her up by shaking.","Wake her up by yelling.","Ignore")) {
-
+		switch(select("Wake her up by shaking.:Wake her up by yelling.:Ignore")) {
 		case 1:
-			mes "^3355FFYou grab Elly by the^000000";
-			mes "^3355FFshoulders and try to get^000000";
-			mes "^3355FFher to respond by violently^000000";
-			mes "^3355FFshaking her entire body.^000000";
+			mes "^3355FFYou grab Elly by the";
+			mes "shoulders, and try to get";
+			mes "her to respond by violently";
+			mes "shaking her entire body.^000000";
 			next;
 			mes "["+strcharinfo(0)+"]";
-			mes "Elly? Elly? no!";
+			mes "Elly? Elly! No!";
 			mes "Come back to us!";
 			next;
 			mes "^3355FFElly's not responding...^000000";
 			close;
-
 		case 2:
-			input @KHInput$;
-			if (@KHInput$ == "Wake up, Elly!") {
+			input .@KHInput$;
+			if (.@KHInput$ == "Wake up, Elly!") {
 				mes "[Elly]";
-				mes ".........";
-				mes "^3355FFAs soon as you said those^000000";
-				mes "^3355FFwords, a ^000000Small Golden Key^000000";
-				mes "^3355FFand a ^000000Button^3355FF drop from Elly's^000000";
-				mes "^3355FFhands. It looks like she woke^000000";
-				mes "^3355FFup, but only for an instant.^000000";
+				mes ".............";
+				next;
+				mes "^3355FFAs soon as you said those";
+				mes "words, a ^000000Small Golden Key^3355FF";
+				mes "and a ^000000Button^3355FF drop from Elly's";
+				mes "hands. It looks like she woke";
+				mes "up, but only for an instant.^000000";
 				getitem 7493,1; //Golden_Key
-				getitem 7494,1; //Exquisite_Button
+				getitem 7494,1; //Kiel_Button
 				set KielHyreQuest,34;
 				close;
 			}
-
 			else {
 				mes "[Elly]";
 				mes "......";
@@ -1717,18 +1682,14 @@ kh_school,178,180,5	script	Elly	895,{
 				mes "^3355FFElly's not responding...^000000";
 				close;
 			}
-
 		case 3:
-			mes "^3355FFAlright.^000000";
-			mes "^3355FFBut sooner or later,^000000";
-			mes "^3355FFyou should try to break^000000";
-			mes "^3355FFthe curse placed on Elly.^000000";
+			mes "^3355FFAlright...";
+			mes "But sooner or later,";
+			mes "you should try to break";
+			mes "the curse placed on Elly.^000000";
 			close;
-
 		}
-
 	}
-
 	else if (KielHyreQuest == 34) {
 		if (countitem(7491) < 1) {
 			//Missing text, needs another run through.
@@ -1737,20 +1698,20 @@ kh_school,178,180,5	script	Elly	895,{
 			mes "Cottage. Let's take another look.^000000";
 			close;
 		}
-
 		else {
-			mes "^3355FFIt looks like Elly's^000000";
-			mes "^3355FFGolden Key might fit^000000";
-			mes "^3355FFinto the keyhole on the^000000";
-			mes "^3355FFSteel Box you found inside^000000";
-			mes "^3355FFKiel Hyre's Cottage.^000000";
+			mes "^3355FFIt looks like Elly's";
+			mes "Golden Key might fit";
+			mes "into the keyhole on the";
+			mes "Grey Box you found inside";
+			mes "Kiel Hyre's Cottage.^000000";
+			next;
 			next;
-			mes "^3355FFYou successfully open the^000000";
-			mes "^3355FFSteel Box with the Golden Key,^000000";
-			mes "^3355FFand find a Blue Keycard, along^000000";
-			mes "^3355FFwith a folded note, inside the^000000";
-			mes "^3355FFSteel Box. You quickly read^000000";
-			mes "^3355FFthe note's contents...^000000";
+			mes "^3355FFYou successfully open the";
+			mes "Grey Box with the Golden Key,";
+			mes "and find a Blue Keycard, along";
+			mes "with a folded note, inside the";
+			mes "Grey Box. You quickly read";
+			mes "the note's contents...^000000";
 			next;
 			mes "Dearest Elly,";
 			mes "Kiehl finally broke the taboo,";
@@ -1777,21 +1738,19 @@ kh_school,178,180,5	script	Elly	895,{
 			mes "^FFFFFF_^000000";
 			mes "Sorry about that,";
 			mes "Grandpa";
-			getitem 7495,1; //Blue_Keycard
-			delitem 7491,1; //Steel_box
+			getitem 7495,1; //Blue_Key_Card
+			delitem 7491,1; //Iron_Box
 			set KielHyreQuest,36;
 			close;
 		}
-
 	}
-
 	else if (KielHyreQuest >= 36) {
-		mes "^3355FFThis is where you^000000";
-		mes "^3355FFdiscovered the note^000000";
-		mes "^3355FFlocked inside the Steel Box.^000000";
-		mes "^3355FFThe following message was^000000";
-		mes "^3355FFwritten in the note by Elly's^000000";
-		mes "^3355FFgrandfather, Kiel Hyre.^000000";
+		mes "^3355FFThis is where you";
+		mes "discovered the note";
+		mes "locked inside the Grey Box.";
+		mes "The following message was";
+		mes "written in the note by Elly's";
+		mes "grandfather, Kiel Hyre.^000000";
 		next;
 		mes "Dearest Elly,";
 		mes "Kiehl finally broke the taboo,";
@@ -1820,23 +1779,26 @@ kh_school,178,180,5	script	Elly	895,{
 		mes "Grandpa";
 		close;
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Cookie Basket
 //----------------------------------------------------------------------------
-kh_school,175,175,0	script	Cookie Basket	111,{
-	if (KielHyreQuest == 30) {
-		mes "^3355FFThis must be^000000";
-		mes "^3355FFElly's cookie basket.^000000";
-		mes "^3355FFThere appears to be^000000";
-		mes "^3355FFa folded note wedged^000000";
-		mes "^3355FFbetween the cookies.^000000";
+kh_school,175,176,0	script	Cookie Basket#kh	111,{
+	if (KielHyreQuest < 30) {
+		mes "^3355FFIt's a cookie";
+		mes "basket filled with";
+		mes "delicious cookies.^000000";
+		close;
+	}
+	else if (KielHyreQuest == 30) {
+		mes "^3355FFThis must be";
+		mes "Elly's cookie basket.";
+		mes "There appears to be";
+		mes "a folded note wedged";
+		mes "between the cookies.^000000";
 		next;
-
-		switch(select("Read Note","Ignore")) {
-
+		switch(select("Read Note:Ignore")) {
 		case 1:
 			mes ""+strcharinfo(0)+", help!";
 			mes "There's this guy dressed in";
@@ -1854,22 +1816,76 @@ kh_school,175,175,0	script	Cookie Basket	111,{
 			mes "doesn't cast his curse on me!";
 			set KielHyreQuest,32;
 			close;
-
 		case 2:
-			mes "^3355FFThat note probably^000000";
-			mes "^3355FFwasn't written just^000000";
-			mes "^3355FFfor you, anyway.^000000";
+			mes "^3355FFThat note probably";
+			mes "wasn't written just";
+			mes "for you, anyway.^000000";
 			close;
-
 		}
 	}
-
-	else if (KielHyreQuest >= 32) {
-		mes "^3355FFThese cookies aren't^000000";
-		mes "^3355FFstale yet, but they're no^000000";
-		mes "^3355FFlonger warm. If they're^000000";
-		mes "^3355FFnot room temperature,^000000";
-		mes "^3355FFthen they're a little cold.^000000";
+	else if (KielHyreQuest < 108) {
+		mes "^3355FFThese cookies aren't";
+		mes "stale yet, but they're no";
+		mes "longer warm. If they're";
+		mes "not at room temperature,";
+		mes "then they're a little cold.^000000";
+		close;
+	}
+	else if (KielHyreQuest == 108) {
+		mes "^3355FFAs you stare at the";
+		mes "cookie basket, the wind";
+		mes "from the window jostles";
+		mes "it, revealing a letter that";
+		mes "was placed underneath.";
+		mes "It was probably written";
+		mes "by Elly for you to read.^000000";
+		next;
+		mes "^333333Dearest "+name_kh+",";
+		mes " ";
+		mes "My teachers usually yell at me";
+		mes "since I make so many mistakes,";
+		mes "but today Mrs. Lecollane gave me";
+		mes "praise for my yummy cookies!";
+		mes "It's all thanks to you, my friend.";
+		mes "I'm very happy we've met:";
+		mes "you've taught me that there";
+		mes "are good people in the world.";
+		mes "And I know Grandpa will like";
+		mes "you, though, I don't know";
+		mes "where he could be...";
+		mes " ";
+		mes "Someday, I hope to become";
+		mes "as nice a person as you are.";
+		mes "Let's keep in touch and be";
+		mes "really good friends, okay?";
+		mes " ";
+		mes "Yours, Elly^000000";
+		next;
+		mes "^3355FFIt feels like you can";
+		mes "still sense Elly's warmth";
+		mes "and kindness from her";
+		mes "cookie basket. You picked";
+		mes "out a cookie, and put it";
+		mes "in your mouth. It was";
+		mes "deliciously bittersweet.";
+		set KielHyreQuest,109;
+		next;
+		input .@input$;
+		mes "["+strcharinfo(0)+"]";
+		mes ""+.@input$+"";
+		mes "It's time to go back. I can't";
+		mes "stay here much longer.";
+		close2;
+		warp "yuno_fild08",69,183;
+		end;
+	}
+	else {
+		mes "^3355FFAll the cookies";
+		mes "in this basket are";
+		mes "stale! Well, it shouldn't";
+		mes "come as a surprise.";
+		mes "It's been a long time";
+		mes "since they were baked.^000000";
 		close;
 	}
 	end;
@@ -1878,7 +1894,7 @@ kh_school,175,175,0	script	Cookie Basket	111,{
 //----------------------------------------------------------------------------
 // Elly's Window (In Dormitory)
 //----------------------------------------------------------------------------
-kh_school,188,185,0	script	Window::WindowKHQ2	111,{
+kh_school,188,185,0	script	Window#kh2	111,{
 	warp "yuno_fild08",69,183;
 	end;
 }
@@ -1886,67 +1902,57 @@ kh_school,188,185,0	script	Window::WindowKHQ2	111,{
 //----------------------------------------------------------------------------
 // Grave/Kiel Hyre dungeon entry
 //----------------------------------------------------------------------------
-yuno_fild08,72,170,0	script	Grave	111,{
+yuno_fild08,71,170,0	script	Grave#kh	111,{
 	if (KielHyreQuest < 36) {
-		//Missing text, needs another run through.
-		mes "^3355FFIt's just a grave.^000000";
-		mes "^3355FFIt might be important^000000";
-		mes "^3355FFto you later, but now^000000";
-		mes "^3355FFit's not really all that^000000";
-		mes "^3355FFhelpful to you.^000000";
+		mes "^3355FFIt's just a grave.";
+		mes "It might be important";
+		mes "to you later, but now";
+		mes "it's not really all that";
+		mes "helpful to you.^000000";
 		close;
 	}
-
 	else if (KielHyreQuest == 36) {
 		if (countitem(7492) < 1) {
-			
-			mes "^3355FFThere's a secret door^000000";
-			mes "^3355FFnear this grave. It looks^000000";
-			mes "^3355FFlike there's some kind of^000000";
-			mes "^3355FFslot and a number pad^000000";
-			mes "^3355FFinstalled on the door.^000000";
+			mes "^3355FFIt's just a grave.";
+			mes "It might be important";
+			mes "to you later, but now";
+			mes "it's not really all that";
+			mes "helpful to you.^000000";
 			close;
 		}
-
 		else {
-			mes "^3355FFThere's a secret door^000000";
-			mes "^3355FFnear this grave. It looks^000000";
-			mes "^3355FFlike there's some kind of^000000";
-			mes "^3355FFslot and a number pad^000000";
-			mes "^3355FFinstalled on the door.^000000";
+			mes "^3355FFThere's a secret door";
+			mes "near this grave. It looks";
+			mes "like there's some kind of";
+			mes "slot and a number pad";
+			mes "installed on the door.^000000";
 			next;
-			mes "^3355FFWhat should you^000000";
-			mes "^3355FFinsert into the slot?^000000";
+			mes "^3355FFWhat should you";
+			mes "insert into the slot?^000000";
 			next;
-
-			input @KHInput$;
-
-			if (@KHInput$ == "Yellow Keycard") {
-				mes "^3355FFAn electronic confirmation^000000";
-				mes "^3355FFchime sounds once you insert^000000";
-				mes "^3355FFthe Yellow Keycard, followed by^000000";
-				mes "^3355FFan automated voice that asks:^000000";
+			input .@KHInput$;
+			if (.@KHInput$ == "Yellow Keycard") {
+				mes "^3355FFAn electronic confirmation";
+				mes "chime sounds once you insert";
+				mes "the Yellow Keycard, followed by";
+				mes "an automated voice that asks:^000000";
 				next;
 				mes "[Security System]";
 				mes "Please enter the password.";
 				next;
-
-				input @KHInput$;
-
+				input .@KHInput$;
 				next;
-
-				if (@KHInput$ == "4772961") {
+				if (.@KHInput$ == "4772961") {
 					mes "[Security System]";
 					mes "Password confirmed.";
 					mes "Welcome, Kiel Hyre.";
 					next;
-					mes "^3355FFYou hear another^000000";
-					mes "^3355FFpleasant beep, and^000000";
-					mes "^3355FFa secret path opens.^000000";
+					mes "^3355FFYou hear another ";
+					mes "pleasant beep, and";
+					mes "a secret path opens.^000000";
 					set KielHyreQuest,38;
 					close;
 				}
-
 				else {
 					mes "[Security System]";
 					mes "Incorrect password.";
@@ -1954,25 +1960,19 @@ yuno_fild08,72,170,0	script	Grave	111,{
 					close;
 				}
 			}
-
 			else {
-				mes "^3355FFWhatever you're trying^000000";
-				mes "^3355FFto insert into the slot^000000";
-				mes "^3355FFisn't working at all...^000000";
+				mes "^3355FFWhatever you're trying";
+				mes "to insert into the slot";
+				mes "isn't working at all...^000000";
 				close;
 			}
-
 		}
-
 	}
-
 	else if ((KielHyreQuest >= 38) && (KielHyreQuest < 106)) {
-		mes "^3355FFThe door to the^000000";
-		mes "^3355FFfactory is wide open.^000000";
+		mes "^3355FFThe door to the";
+		mes "factory is wide open.^000000";
 		next;
-
-		switch(select("Enter","Cancel")) {
-
+		switch(select("Enter:Cancel")) {
 		case 1:
 			warp "kh_dun01",3,230;
 			end;
@@ -1982,7 +1982,6 @@ yuno_fild08,72,170,0	script	Grave	111,{
 			mes "............";
 			close;
 		}
-
 	}
 
 	else if (KielHyreQuest >= 106) {
@@ -1991,47 +1990,35 @@ yuno_fild08,72,170,0	script	Grave	111,{
 			mes "has now been sealed.^000000";
 			close;
 		}
-
 		else {
 			mes "As you aproach the";
 			mes "grave, it begins to";
 			mes "emit flashes of light.^000000";
 			next;
-
-			switch(select("Use the ^0000FFLuxurious Keycard^000000","Ignore")) {
-
+			switch(select("Use the ^0000FFLuxurious Keycard^000000:Ignore")) {
 			case 1:
 				mes "Once you use the";
 				mes "Luxurious Keycard,";
 				mes "a secret path opens^000000";
 				next;
-
-				switch(select("Enter","cancel")) {
-
+				switch(select("Enter:cancel")) {
 				case 1:
 					warp "kh_dun01",3,230;
 					end;
-
 				case 2:
 					mes "......";
 					mes ".........";
 					mes "............";
 					close;
-
 				}
-
 			case 2:
 				mes "......";
 				mes ".........";
 				mes "............";
 				close;
-
 			}
-
 		}
-
 	}
-
 }
 
 //============================================================================
@@ -2043,7 +2030,7 @@ yuno_fild08,72,170,0	script	Grave	111,{
 //----------------------------------------------------------------------------
 // Cottage Keeper
 //----------------------------------------------------------------------------
-yuno_fild02,93,210,3	script	Cottage Keeper	85,{
+yuno_fild02,93,210,4	script	Cottage Keeper#kh	85,{
 	if ((KielHyreQuest < 12) || (KielHyreQuest > 12)) {
 		mes "[Cottage Keeper]";
 		mes "This is private property,";
@@ -2051,16 +2038,13 @@ yuno_fild02,93,210,3	script	Cottage Keeper	85,{
 		mes "area unless you're authorized.";
 		close;
 	}
-
 	else if (KielHyreQuest == 12) {
 		mes "[Cottage Keeper]";
 		mes "This is private property,";
 		mes "so please do not enter this";
 		mes "area unless you're authorized.";
 		next;
-
-		switch(select("I have an appointment with Kiel Hyre.","Alright.")) {
-
+		switch(select("I have an appointment with Kiel Hyre.:Alright.")) {
 		case 1:
 			mes "[Cottage Keeper]";
 			mes "You have an";
@@ -2068,8 +2052,7 @@ yuno_fild02,93,210,3	script	Cottage Keeper	85,{
 			mes "Master Kiel Hyre?";
 			mes "Um, are you sure?";
 			next;
-			switch(select("Yes","No")) {
-
+			switch(select("Yes:No")) {
 			case 1:
 				mes "[Cottage Keeper]";
 				mes "There must be some sort";
@@ -2079,7 +2062,6 @@ yuno_fild02,93,210,3	script	Cottage Keeper	85,{
 				mes "an appointment...";
 				set KielHyreQuest,14;
 				close;
-
 			case 2:
 				mes "[Cottage Keeper]";
 				mes "Well unless you have";
@@ -2088,7 +2070,6 @@ yuno_fild02,93,210,3	script	Cottage Keeper	85,{
 				mes "meet with Mister Hyre.";
 				close;
 			}
-
 		case 2:
 			mes "[Cottage Keeper]";
 			mes "Goodbye.";
@@ -2100,31 +2081,28 @@ yuno_fild02,93,210,3	script	Cottage Keeper	85,{
 //----------------------------------------------------------------------------
 // Cottage Door (left)
 //----------------------------------------------------------------------------
-yuno_fild02,75,218,0	script	Door::DoorKHQ1	111,{
+yuno_fild02,75,218,0	script	Door#kh2	111,{
 	if (KielHyreQuest < 16) {
-		mes "^3355FFThis door is locked.^000000";
-		mes "^3355FFIf someone inside won't^000000";
-		mes "^3355FFopen it for you, then you'll^000000";
-		mes "^3355FFneed the right key to unlock it.^000000";
+		mes "^3355FFThis door is locked.";
+		mes "If someone inside won't";
+		mes "open it for you, then you'll";
+		mes "need the right key to unlock it.";
 		close;
 	}
-
 	if (KielHyreQuest == 16) {
-		mes "^3355FFThis door is locked.^000000";
-		mes "^3355FFIf someone inside won't^000000";
-		mes "^3355FFopen it for you, then you'll^000000";
-		mes "^3355FFneed the right key to unlock it.^000000";
+		mes "^3355FFThis door is locked.";
+		mes "If someone inside won't";
+		mes "open it for you, then you'll";
+		mes "need the right key to unlock it.";
 		next;
-
-		switch(select("Unlock","Cancel")) {
-
+		switch(select("Unlock:Cancel")) {
 		case 1:
-			mes "^3355FFYou unlock the door with the^000000";
-			mes "^3355FFkey that Elly gave you, and^000000";
-			mes "^3355FFas you push it open, a folded^000000";
-			mes "^3355FFnote dropped from the top of the^000000";
-			mes "^3355FFdoor. The following words^000000";
-			mes "^3355FFare written on this crude note.^000000";
+			mes "^3355FFYou unlock the door with the";
+			mes "key that Elly gave you, and";
+			mes "as you push it open, a folded";
+			mes "note dropped from top of the";
+			mes "door. The following words";
+			mes "are written on this crude note.";
 			next;
 			mes "6 Forward,";
 			mes "3 Left,";
@@ -2134,7 +2112,6 @@ yuno_fild02,75,218,0	script	Door::DoorKHQ1	111,{
 			set KielHyreQuest,18;
 			warp "kh_vila",188,18;
 			end;
-
 		case 2:
 			mes "......";
 			mes ".........";
@@ -2142,17 +2119,13 @@ yuno_fild02,75,218,0	script	Door::DoorKHQ1	111,{
 			close;
 		}
 	}
-
-	if (KielHyreQuest >= 18) {
+	else {
 		mes "^3355FFThe door is open.^000000";
 		next;
-
-		switch(select("Enter","Cancel")) {
-
+		switch(select("Enter:Cancel")) {
 		case 1:
 			warp "kh_vila",188,18;
 			end;
-
 		case 2:
 			close;
 		}
@@ -2162,30 +2135,26 @@ yuno_fild02,75,218,0	script	Door::DoorKHQ1	111,{
 //----------------------------------------------------------------------------
 // Cottage Door (Right)
 //----------------------------------------------------------------------------
-yuno_fild02,109,218,0	script	Door::DoorKHQ2	111,{
-	if (KielHyreQuest < 16) {
-		mes "^3355FFThis door is locked.^000000";
-		mes "^3355FFIf someone inside won't^000000";
-		mes "^3355FFopen it for you, then you'll^000000";
-		mes "^3355FFneed the right key to unlock it.^000000";
+yuno_fild02,109,218,0	script	Door#kh1	111,{
+	if (KielHyreQuest != 16) {
+		mes "^3355FFThis door is locked.";
+		mes "If someone inside won't";
+		mes "open it for you, then you'll";
+		mes "need the right key to unlock it.";
 		close;
 	}
-
-	if (KielHyreQuest >= 16) {
-		mes "^3355FFThis door is locked.^000000";
-		mes "^3355FFIf someone inside won't^000000";
-		mes "^3355FFopen it for you, then you'll^000000";
-		mes "^3355FFneed the right key to unlock it.^000000";
+	if (KielHyreQuest == 16) {
+		mes "^3355FFThis door is locked.";
+		mes "If someone inside won't";
+		mes "open it for you, then you'll";
+		mes "need the right key to unlock it.";
 		next;
-
-		switch(select("Open","Cancel")) {
-
+		switch(select("Open:Cancel")) {
 		case 1:
-			mes "^3355FFYou don't have^000000";
-			mes "^3355FFthe key that can^000000";
-			mes "^3355FFunlock this door.^000000";
+			mes "^3355FFYou don't have";
+			mes "the key that can";
+			mes "unlock this door.^000000";
 			close;
-
 		case 2:
 			mes "......";
 			mes ".........";
@@ -2199,30 +2168,25 @@ yuno_fild02,109,218,0	script	Door::DoorKHQ2	111,{
 //----------------------------------------------------------------------------
 // Store room interior; Wall
 //----------------------------------------------------------------------------
-kh_vila,191,14,0	script	Wall	111,{
+kh_vila,191,14,0	script	Wall#kh	139,1,1,{
 	if (KielHyreQuest < 28) {
-		mes "^3355FFIt's just a wall.^000000";
-		mes "^3355FFIt's not particularly^000000";
-		mes "^3355FFstanding in your way.^000000";
+		mes "^3355FFIt's just a wall.";
+		mes "It's not particularly";
+		mes "standing in your way.^000000";
 		close;
 	}
-
 	if (KielHyreQuest >= 28) {
-		mes "^3355FFThe wall is now^000000";
-		mes "^3355FFopen, revealing^000000";
-		mes "^3355FFa secret path.^000000";
+		mes "^3355FFThe wall is now";
+		mes "open, revealing";
+		mes "a secret path.^000000";
 		next;
-
-		switch(select("Enter","Cancel")) {
-
+		switch(select("Enter:Cancel")) {
 		case 1:
 			warp "kh_vila",17,177;
 			end;
-
 		case 2:
 			close;
 		}
-
 	}
 
 OnOpenDoor:
@@ -2233,8 +2197,8 @@ OnOpenDoor:
 //----------------------------------------------------------------------------
 // Store room interior; books
 //----------------------------------------------------------------------------
-kh_vila,184,20,0	script	Book#1::BookKHQ1	111,{
-	if ((KielHyreQuest < 26) || (KielHyreQuest > 26)) {
+kh_vila,184,20,0	script	Book#kh1::BookKHQ1	111,{
+	if (KielHyreQuest != 26) {
 		mes "^3355FFThis bookshelf is^000000";
 		mes "^3355FFcrammed with many^000000";
 		mes "^3355FFlarge, hardcover books^000000";
@@ -2242,21 +2206,20 @@ kh_vila,184,20,0	script	Book#1::BookKHQ1	111,{
 	}
 	else if (KielHyreQuest == 26) {
 		if (rand(1,10) == 8) {
-			mes "^3355FFWithout thinking, you^000000";
-			mes "^3355FFreach for a book from^000000";
-			mes "^3355FFthe bookshelf. As you^000000";
-			mes "^3355FFpull it toward you, the^000000";
-			mes "^3355FFwall slides open to^000000";
-			mes "^3355FFreveal a secret path.^000000";
-			donpcevent "Wall::OnOpenDoor";
+			mes "^3355FFWithout thinking, you";
+			mes "reach for a book from";
+			mes "the bookshelf. As you";
+			mes "pull it towards you, the";
+			mes "wall slides opens open";
+			mes "to reveal a secret path.^000000";
+			donpcevent "Wall#kh::OnOpenDoor";
 			set KielHyreQuest,28;
 			close;
 		}
-
 		else {
-			mes "^3355FFThis bookshelf is^000000";
-			mes "^3355FFcrammed with many^000000";
-			mes "^3355FFlarge, hardcover books^000000";
+			mes "^3355FFThis bookshelf is";
+			mes "crammed with many";
+			mes "large, hardcover books.^000000";
 			close;
 		}
 
@@ -2264,298 +2227,277 @@ kh_vila,184,20,0	script	Book#1::BookKHQ1	111,{
 
 }
 
-kh_vila,181,20,0	duplicate(BookKHQ1)	Book#2::BookKHQ2	111
+kh_vila,181,20,0	duplicate(BookKHQ1)	Book#kh2	111
 
-kh_vila,178,20,0	duplicate(BookKHQ1)	Book#3::BookKHQ3	111
+kh_vila,178,20,0	duplicate(BookKHQ1)	Book#kh3	111
 
-kh_vila,175,19,0	duplicate(BookKHQ1)	Book#4::BookKHQ4	111
+kh_vila,175,19,0	duplicate(BookKHQ1)	Book#kh4	111
 
 //----------------------------------------------------------------------------
 // Store room interior; Letter to Elly on the floor.
 //----------------------------------------------------------------------------
-kh_vila,179,11,0	script	KH_Letter_Trigger	-1,2,2,{
+kh_vila,179,11,0	script	Letter#kh	-1,1,1,{
+//OnTouch2:
 OnTouch:
 	if (KielHyreQuest == 18) {
 		if (checkweight(7490,1) == 0) {
-			mes "^3355FF- Wait!! -";
-			mes "- You are carrying too many items";
-			mes "- and are unable to accept any more. -";
-			mes "- Please make some space avaliable";
-			mes "- in your inventory before returning. -^000000";
+			mes "^3355FFJust a minute...!";
+			mes "There's something on";
+			mes "the floor here, but you";
+			mes "can't pick it up since";
+			mes "you're carrying too";
+			mes "many items now.^000000";
 			close;
 		}
-		mes "^3355FFYou've found a letter^000000";
-		mes "^3355FFon the floor. Naturally,^000000";
-		mes "^3355FFyou pick it up, despite^000000";
-		mes "^3355FFthe fact that it's not^000000";
-		mes "^3355FFaddressed to you.^000000";
-		getitem 7490,1; //Letter to Elly
+		mes "^3355FFYou've found a letter";
+		mes "on the floor. Naturally,";
+		mes "you pick it up, despite";
+		mes "the fact that it's not";
+		mes "addressed to you.^000000";
+		getitem 7490,1; //Kyll_Hire_Letter
 		set KielHyreQuest,20;
 		close;
 	} 
+	else{
+		mes "^3355FFYou entered the room.^000000";
+		close;
+	}
 	end; 
 }
 
 //----------------------------------------------------------------------------
 // Cottage interior, kitchen; Box (Pet Food vending machine)
 //----------------------------------------------------------------------------
-kh_vila,16,175,0	script	Box::BoxKHQ1	111,{
-		mes "^FFFFFF##^000000*Tasty-Nutricious-Delicious*";
-		mes "*Cute Pet Doof Vending Machine*";
-		mes "The best food for your Cute Pets";
-		mes "that is superior to the Pet Food";
-		mes "you can buy in the market!";
-		mes "^FFFFFF_^000000";
-		mes "Price: 1,100 zeny (cheap!)";
-		next;
-
-		switch(select("Buy!","Cancel")) {
-
-		case 1:
+kh_vila,16,175,0	script	Box#khp1	111,{
+	mes "^FFFFFF##^000000*Tasty-Nutricious-Delicious*";
+	mes "*Cute Pet Doof Vending Machine*";
+	mes "The best food for your Cute Pets";
+	mes "that is superior to the Pet Food";
+	mes "you can buy in the market!";
+	mes "^FFFFFF_^000000";
+	mes "Price: 1,100 zeny (cheap!)";
+	next;
+	switch(select("Buy!:Cancel")) {
+	case 1:
+		if (zeny < 1100) {
+			mes "^3355FFUnfortunately, you";
+			mes "don't have enough";
+			mes "zeny to insert into";
+			mes "the vending machine.^000000";
+			close;
+		}
+		else {
+			mes "^3355FFOh no...!^000000";
 			mes "^3355FF1,100 zeny seems kind";
-			mes "^3355FFof expensive for Pet Food,";
-			mes "^3355FFbut if it's better than the";
-			mes "^3355FFnormal stuff, it might";
-			mes "^3355FFbe worth a shot.";
+			mes "of expensive for Pet Food,";
+			mes "but if it's better than the";
+			mes "normal stuff, it might";
+			mes "be worth a shot.^000000";
 			next;
-			if (zeny < 1100) {
-				//Adlibbed dialog. Need weight check, too.
-				mes "^3355FFYou don't have enough zeny...^000000";
-				close;
-			}
-			else {
-				mes "^3355FFOh no...!^000000";
-				mes "^3355FFThere's nothing^000000";
-				mes "^3355FFspecial about it^000000";
-				mes "^3355FFat all! It's just^000000";
-				mes "^3355FFnormal Pet Food!^000000";
-				set zeny,zeny-1100;
-				getitem 537,1;	//Pet_Food
-				close;
-			}
-
-		case 2:
-			mes "^3355FFThis vending machine^000000";
-			mes "^3355FFseems really shady and^000000";
-			mes "^3355FFsuspicious for some reason.^000000";
+			mes "^3355FFOh no...!";
+			mes "There's nothing";
+			mes "special about it";
+			mes "at all! It's just";
+			mes "normal Pet Food!";
+			set zeny,zeny-1100;
+			getitem 537,1;	//Pet_Food
 			close;
 		}
-
+	case 2:
+		mes "^3355FFThis vending machine";
+		mes "seems really shady and";
+		mes "suspicious for some reason.^000000";
+		close;
+	}
 }
 
 //----------------------------------------------------------------------------
 // Cottage interior, kitchen; Apple Box (Useless?)
 //----------------------------------------------------------------------------
-kh_vila,30,184,0	script	Apple Box	111,{
-	mes "^3355FFYou find a box filled with^000000";
-	mes "^3355FFripe, delicious apples.^000000";
+kh_vila,30,184,0	script	Apple Box#khp1	111,{
+	mes "^3355FFYou find a box filled with";
+	mes "ripe, delicious apples.^000000";
 	next;
-
-	switch(select("Take the box","Leave it")) {
-
+	switch(select("Take the box:Leave it")) {
 	case 1:
-		mes "^3355FFNo...! Wait!^000000";
-		mes "^3355FFSomething's wrong!^000000";
-		mes "^3355FFWhatever you do,^000000";
-		mes "^3355FFdon't take this box!^000000";
-		next;
-		mes "^3355FFAnd so, your inner^000000";
-		mes "^3355FFvoice, your Jungian^000000";
-		mes "^3355FFshadow if you will,^000000";
-		mes "^3355FFprevented you from^000000";
-		mes "^3355FFtaking the box.^000000";
+		mes "^3355FFNo...! Wait!";
+		mes "Something's wrong!";
+		mes "Whatever you do,";
+		mes "don't take this box!^000000";
+		next;
+		mes "^3355FFAnd so, your inner";
+		mes "voice, your Jungian";
+		mes "shadow if you will,";
+		mes "prevented you from";
+		mes "taking the box.^000000";
 		close;
-
 	case 2: 
-		mes "^3355FFSomething is wrong^000000";
-		mes "^3355FFwith this box of apples.^000000";
+		mes "^3355FFSomething is wrong";
+		mes "with this box of apples.^000000";
 		close;
-
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Cottage interior, dining room; Map
 //----------------------------------------------------------------------------
-kh_vila,44,126,0	script	Map	111,{
+kh_vila,44,126,0	script	Map#khp1	111,{
 	if ((KHCottagePoem1 < 2) && (KielHyreQuest < 30)) {
-		mes "^3355FFA magnificent world map,^000000";
-		mes "^3355FFdetailing the Rune-Midgarts^000000";
-		mes "^3355FFKingdom, Schwaltzvalt Republic,^000000";
-		mes "^3355FFas well as another country to the^000000";
-		mes "^3355FFWest whose name is unfamiliar^000000";
-		mes "^3355FFto you, is pasted to this wall.^000000";
-		next;
-		mes "^3355FFAs you examine the^000000";
-		mes "^3355FFworld map more closely,^000000";
-		mes "^3355FFyou find that something has^000000";
-		mes "^3355FFbeen hidden underneath it.^000000";
-		next;
-
-		switch(select("Ignore","Examine")) {
-
+		mes "^3355FFA magnificent world map,";
+		mes "detailing the Rune-Midgarts";
+		mes "Kingdom, Schwaltzvalt Republic,";
+		mes "as well as another country to the";
+		mes "west whose name is unfamiliar";
+		mes "to you, is pasted to this wall.^000000";
+		next;
+		mes "^3355FFAs you examine the";
+		mes "world map more closely,";
+		mes "you find that something has";
+		mes "been hidden underneath it.^000000";
+		switch(select("Ignore:Examine")) {
 		case 1:
-			mes "^3355FFWhatever might be^000000";
-			mes "^3355FFhidden beneath this^000000";
-			mes "^3355FFmap probably isn't^000000";
-			mes "^3355FFimportant enough for^000000";
-			mes "^3355FFyou to investigate.^000000";
+			mes "^3355FFWhatever might be";
+			mes "hidden beneath this";
+			mes "map probably isn't";
+			mes "important enough for";
+			mes "you to investigate.^000000";
 			close;
-
 		case 2:
-			mes "^3355FFUnfortunately, you can't^000000";
-			mes "^3355FFsee what's under the map^000000";
-			mes "^3355FFsince it's pasted to the wall.^000000";
-			mes "^3355FFYou'll need to find some^000000";
-			mes "^3355FFway to loosen the blue^000000";
-			mes "^3355FFwithout damaging the map.^000000";
+			mes "^3355FFUnfortunately, you can't";
+			mes "see what's under the map";
+			mes "since it's pasted to the wall.";
+			mes "You'll need to find some";
+			mes "way to loosen the glue";
+			mes "without damaging the map...^000000";
 			set KHCottagePoem1,1;
 			close;
-
 		}
-
 	}
-
 	else  if ((KHCottagePoem1 == 2) && (KielHyreQuest < 30)) {
-		mes "^3355FFYou bring the pot of^000000";
-		mes "^3355FFsteaming hot liquid^000000";
-		mes "^3355FFclose to the world map.^000000";
-		mes "^3355FFAs the paste on the wall^000000";
-		mes "^3355FFmoistens, the map slowly^000000";
-		mes "^3355FFbegins to peel back.^000000";
-		next;
-		mes "^3355FFThe peelnig map revealed^000000";
-		mes "^3355FFa folded piece of paper^000000";
-		mes "^3355FFhidden beneath it. You^000000";
-		mes "^3355FFtake the paper, and smooth^000000";
-		mes "^3355FFthe map out to adhere it to^000000";
-		mes "^3355FFthe wall once again. A message is^000000";
-		mes "^3355FFwritten on the piece of paper.^000000";
-		next;
-		mes "^808080She will be in a place^000000";
-		mes "^808080as cold as the poles.^000000";
-		mes "^808080When the well is dried^000000";
-		mes "^808080and the earth is cracked,^000000";
-		mes "^808080the path to her heart, a^000000";
-		mes "^808080heart as transparent as^000000";
-		mes "^808080crystal, will be open.^000000";
-		next;
-		mes "^808080I'll have to fight four^000000";
-		mes "^808080snakes with four swords^000000";
-		mes "^808080to find her. The first sword^000000";
-		mes "^808080is love. The second sword^000000";
-		mes "^808080is despair. The third sword^000000";
-		mes "^808080is rage. The fourth sword is^000000";
-		mes "^808080hope. To find her, to rescue her.^000000";
-		next;
-		mes "^3355FF......................^000000";
-		mes "^3355FFThe deeper meaning^000000";
-		mes "^3355FFof this poem, if it even^000000";
-		mes "^3355FFexists, eludes you.^000000";
+		mes "^3355FFYou bring the pot of";
+		mes "steaming hot liquid";
+		mes "close to the world map.";
+		mes "As the paste on the wall";
+		mes "moistens, the map slowly";
+		mes "begins to peel back.^000000";
+		next;
+		mes "^3355FFThe peeling map reveals";
+		mes "a folded piece of paper";
+		mes "hidden beneath it. You";
+		mes "take the paper, and smooth";
+		mes "the map out to adhere it to the";
+		mes "wall once again. A message is";
+		mes "written on the piece of paper.^000000";
+		next;
+		mes "^0000FFShe will be in a place";
+		mes "as cold as the poles.";
+		mes "When the well is dried";
+		mes "and the earth is cracked,";
+		mes "the path to her heart, a";
+		mes "heart as transparent as";
+		mes "crystal, will be open.^000000";
+		next;
+		mes "^3355FFI'll have to fight four";
+		mes "snakes with four swords";
+		mes "to find her. The first sword";
+		mes "is love. The second sword";
+		mes "is despair. The third sword";
+		mes "is rage. The fourth sword is";
+		mes "hope. To find her, to rescue her.^000000";
+		next;
+		mes "^3355FF...............................";
+		mes "The deeper meaning";
+		mes "of this poem, if it even";
+		mes "exists, eludes you.^000000";
 		set KHCottagePoem1,3;
 		close;
 	}
-
 	else  if ((KHCottagePoem1 > 2) || (KielHyreQuest >= 30)) {
-		mes "^3355FFThis is where you found^000000";
-		mes "^3355FFthe paper on which the^000000";
-		mes "^3355FFpoem was written. Perhaps^000000";
-		mes "^3355FFit would be a good idea to^000000";
-		mes "^3355FFrefresh your memory and^000000";
-		mes "^3355FFread that that poem again.^000000";
-		next;
-
-		switch(select("Read","Cancel")) {
-
+		mes "^3355FFThis is were you found";
+		mes "the paper on which the";
+		mes "poem was written. Perhaps";
+		mes "it would be a good idea to";
+		mes "refresh your memory and";
+		mes "read that poem again.^000000";
+		next;
+		switch(select("Read:Cancel")) {
 		case 1:
-			mes "^808080She will be in a place^000000";
-			mes "^808080as cold as the poles.^000000";
-			mes "^808080When the well is dried^000000";
-			mes "^808080and the earth is cracked,^000000";
-			mes "^808080the path to her heart, a^000000";
-			mes "^808080heart as transparant as^000000";
-			mes "^808080crystal, will be open.^000000";
+			mes "^0000FFShe will be in a place";
+			mes "as cold as the poles.";
+			mes "When the well is dried";
+			mes "and the earth is cracked,";
+			mes "the path to her heart, a";
+			mes "heart as transparent as";
+			mes "crystal, will be open.^000000";
 			next;
-			mes "^808080I'll have to fight four^000000";
-			mes "^808080snakes with four swords^000000";
-			mes "^808080to find her. The first sword^000000";
-			mes "^808080is love. The second sword^000000";
-			mes "^808080is despair. The third sword^000000";
-			mes "^808080is rage. The fourth sword is^000000";
-			mes "^808080hope. To find her, to rescue her.^000000";
+			mes "^3355FFI'll have to fight four";
+			mes "snakes with four swords";
+			mes "to find her. The first sword";
+			mes "is love. The second sword";
+			mes "is despair. The third sword";
+			mes "is rage. The fourth sword is";
+			mes "hope. To find her, to rescue her.^000000";
 			next;
-			mes "^3355FF......................^000000";
-			mes "^3355FFThe deeper meaning^000000";
-			mes "^3355FFof this poem, if it even^000000";
-			mes "^3355FFexists, eludes you.^000000";
+			mes "^3355FF...............................";
+			mes "The deeper meaning";
+			mes "of this poem, if it even";
+			mes "exists, eludes you.^000000";
 			close;
-
 		case 2:
-			mes "^3355FFThere's no need for^000000";
-			mes "^3355FFyou to reread this poem.^000000";
-			mes "^3355FFYou're a freakin' genius!^000000";
+			mes "^3355FFThere's no need for";
+			mes "you to reread this poem.";
+			mes "You're a freakin' genius!^000000";
 			close;
-
 		}
-
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Cottage interior, kitchen; Pot
 //----------------------------------------------------------------------------
-kh_vila,33,184,0	script	Pot	111,{
+kh_vila,33,184,0	script	Pot#khp1	111,{
 	if (KHCottagePoem1 < 1) {
-		mes "^3355FFYou've found a pot^000000";
-		mes "^3355FFfilled with boiling^000000";
-		mes "^3355FFsteaming liquid.^000000";
+		mes "^3355FFYou've found a pot";
+		mes "filled with boiling,";
+		mes "steaming liquid.^000000";
 		close;
 	}
-
 	else if (KHCottagePoem1 == 1) {
-		mes "^3355FFYou've found a pot^000000";
-		mes "^3355FFfilled with boiling^000000";
-		mes "^3355FFsteaming liquid.^000000";
-		mes "^3355FFSteam... That you could^000000";
-		mes "^3355FFuse to loosen the glue on^000000";
-		mes "^3355FFthe map... You're a genius!^000000";
-		next;
-
-		switch(select("Try it.","That? That won't work!")) {
-
+		mes "^3355FFYou've found a pot";
+		mes "filled with boiling,";
+		mes "steaming liquid.";
+		mes "Steam... That you could";
+		mes "use to loosen the glue on";
+		mes "the map... You're a genius!^000000";
+		next;
+		switch(select("Try it.:That? That won't work!")) {
 		case 1:
-			mes "^3355FFYou picked up the^000000";
-			mes "^3355FFboiling pot, but^000000";
-			mes "^3355FFslightly burned your^000000";
-			mes "^3355FFhands on accident.^000000";
+			mes "^3355FFYou picked up the";
+			mes "boiling pot, but";
+			mes "slightly burned your";
+			mes "hands by accident.";
 			set KHCottagePoem1,2;
 			close;
 
 		case 2:
-			mes "^3355FFNo, no...^000000";
-			mes "^3355FFWe'd better try^000000";
-			mes "^3355FFsomething else.^000000";
+			mes "^3355FFNo, no...";
+			mes "We'd better try";
+			mes "something else.^000000";
 			close;
-
 		}
-
 	}
-
 	else if ((KHCottagePoem1 > 1) || (KielHyreQuest >= 30)){
-		mes "^3355FFThis is where you^000000";
-		mes "^3355FFpicked up the pot filled^000000";
-		mes "^3355FFwith steaming liquid.^000000";
+		mes "^3355FFThis is where you";
+		mes "picked up the pot filled";
+		mes "with steaming hot liquid.^000000";
 		close;
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Cottage interior, fire place; Calabash
 //----------------------------------------------------------------------------
-kh_vila,14,55,0	script	Calabash	111,{
+kh_vila,14,55,0	script	Calabash#khp1	111,{
 	if ((countitem(7329) < 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 38)) {
 		if (checkweight(7329,1) == 0) {
 			mes "^3355FFThat's a nice looking";
@@ -2566,51 +2508,41 @@ kh_vila,14,55,0	script	Calabash	111,{
 			mes "And by weight, I mean items.^000000";
 			close;
 		}
-
-		mes "^3355FFIt's an expensive^000000";
-		mes "^3355FFlooking calabash--^000000";
-		mes "^3355FFor in less fancy^000000";
-		mes "^3355FFwords, a 'gourd.'^000000";
-		mes "^3355FFWhat do you do?^000000";
+		mes "^3355FFIt's an expensive";
+		mes "looking calabash--";
+		mes "or in less fancy";
+		mes "words, a ''gourd.''";
+		mes "Would do you do?^000000";
 		next;
-
-		switch(select("Break Open Calabash","Look Inside Calabash","Ignore")) {
-
+		switch(select("Break Open Calabash:Look Inside Calabash:Ignore")) {
 		case 1:
-			mes "^3355FFYou can't break^000000";
-			mes "^3355FFopen that calabash...^000000";
-			mes "^3355FFYou're a hero, not a vandal.^000000";
-			mes "^3355FFNow, if this act of vandalisim^000000";
-			mes "^3355FFcan be considered an act of^000000";
-			mes "^3355FFheroisim, then it'd be okay.^000000";
+			mes "^3355FFYou can't break";
+			mes "open that calabash...";
+			mes "You're a hero, not a vandal.";
+			mes "Now, if this act of vandalism";
+			mes "can be considered an act of";
+			mes "heroism, then it'd be okay.^000000";
 			close;
-
 		case 2:
-			mes "^3355FFYou tenderly place^000000";
-
-			mes "^3355FFyour hand into the^000000";
-			mes "^3355FFcalabash, and gently^000000";
-			mes "^3355FFfeel around with your^000000";
-			mes "^3355FFfingers until you retrieve^000000";
-			mes "^3355FFan Old Bronze Key.^000000";
-			getitem 7329,1; //Old_Bronze_Key
+			mes "^3355FFYou tenderly place";
+			mes "your hand into the";
+			mes "calabash, and gently";
+			mes "feel around with your";
+			mes "fingers until you retrieve";
+			mes "an Old Bronze Key.^000000";
 			close;
-
 		case 3:
-			mes "^3355FFThere's probably^000000";
-			mes "^3355FFnothing inside anyway^000000";
+			mes "^3355FFThere's probably";
+			mes "nothing inside anyway.^000000";
 			close;
-
 		}
-
 	}
-
 	else {
-		mes "^3355FFThis is the expensive^000000";
-		mes "^3355FFlooking calabash from^000000";
-		mes "^3355FFwhich you obtained^000000";
-		mes "^3355FFthe Old Bronze Key.^000000";
-		mes "^3355FFIt's useless to you now.^000000";
+		mes "^3355FFThis is the expensive";
+		mes "looking calabash from";
+		mes "which you've obtained";
+		mes "the Old Bronze Key.";
+		mes "It's useless to you now.^000000";
 		close;
 	}
 }
@@ -2618,100 +2550,81 @@ kh_vila,14,55,0	script	Calabash	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, garden; Pool
 //----------------------------------------------------------------------------
-kh_vila,39,41,0	script	Pool	111,{
+kh_vila,39,41,0	script	Pool#khp1	111,{
 	if ((KHCottagePoem1 < 3) && (KielHyreQuest < 30)) {
-		mes "^3355FFYou find a fancy pool^000000";
-		mes "^3355FFfilled with fresh water.^000000";
+		mes "^3355FFYou find a fancy pool";
+		mes "filled with fresh water.^000000";
 		close;
 	}
-
 	else if ((KHCottagePoem1 == 3) && (KielHyreQuest < 30)) {
-		mes "^3355FFYou find a fancy pool^000000";
-		mes "^3355FFfilled with fresh water.^000000";
-		mes "^3355FFalong with a conspicuous^000000";
-		mes "^3355FFlion statue with two handles.^000000";
+		mes "^3355FFYou find a fancy pool";
+		mes "filled with fresh water,";
+		mes "along with a conscpicuous";
+		mes "lion statue with two handles.^000000";
 		next;
-
-		switch(select("Pull Handles","Cancel")) {
-
+		switch(select("Pull Handles:Cancel")) {
 		case 1:
-			mes "Which handle would^000000";
-			mes "you like to pull first?^000000";
+			mes "Which handle would";
+			mes "you like to pull first?";
 			next;
-
-			switch(select("Right Handle","Left Handle")) {
-
+			switch(select("Right Handle:Left Handle")) {
 			case 1:
-				mes "^3355FFYou pull the right^000000";
-				mes "^3355FFhandle, causing water^000000";
-				mes "^3355FFto gush from the lion's^000000";
-				mes "^3355FFmouth. It looks pretty cool~^000000";
+				mes "^3355FFYou pull the right";
+				mes "handle, causing water";
+				mes "to gush out of the lion's";
+				mes "mouth. It looks pretty cool~^000000";
 				close;
-				
 			case 2:
-				mes "^3355FFAs soon as you pull the^000000";
-				mes "^3355FFleft handle, the water in^000000";
-				mes "^3355FFthe pool drains away. The^000000";
-				mes "^3355FFpool empties, and you can^000000";
-				mes "^3355FFsee a later of green moss^000000";
-				mes "^3355FFcovering the pool's bottom.^000000";
+				mes "^3355FFAs soon as you pull the";
+				mes "left handle, the water in";
+				mes "the pool drains away. The";
+				mes "pool empties, and you can";
+				mes "see a layer of green moss";
+				mes "covering the pool's bottom.^000000";
 				next;
-
-				switch(select("Ignore","Investigate")) {
-
+				switch(select("Ignore:Investigate")) {
 				case 1:
-					mes "^3355FFyou decide that^000000";
-					mes "^3355FFa pool is little more^000000";
-					mes "^3355FFthan a hole without^000000";
-					mes "^3355FFany water to fill it.^000000";
+					mes "^3355FFYou decide that";
+					mes "a pool is little more";
+					mes "than a hole without";
+					mes "any water to fill it.^000000";
 					close;
-
 				case 2:
-					mes "^3355FFAs you look through^000000";
-					mes "^3355FFthe wet moss at the^000000";
-					mes "^3355FFbottom of the pool,^000000";
-					mes "^3355FFyou stumble upon a^000000";
-					mes "^3355FFsmall, peculliar button.^000000";
+					mes "^3355FFAs you look through";
+					mes "the wet moss at the";
+					mes "bottom of the pool,";
+					mes "you stumble upon a";
+					mes "small, peculiar button.^000000";
 					next;
-
-					switch(select("Press button","Don't Press Button")) {
-
+					switch(select("Press button:Don't Press Button")) {
 					case 1:
-						mes "^3355FFYou press the button^000000";
-						mes "^3355FFwhich seems to trigger^000000";
-						mes "^3355FFa strange sound coming^000000";
-						mes "^3355FFfrom the stairs at the hallway.^000000";
+						mes "^3355FFYou press the button,";
+						mes "which seems to trigger";
+						mes "a strange sound coming";
+						mes "from the stairs at the hallway.^000000";
 						set KHCottagePoem1,4;
 						close;
-
 					case 2:
-						mes "^3355FFYou'd better not push^000000";
-						mes "^3355FFthis button. Your enemies^000000";
-						mes "^3355FFmust have hidden it carefully^000000";
-						mes "^3355FFfor you to find. It must be^000000";
-						mes "^3355FFsome sort of nefarious trap.^000000";
+						mes "^3355FFYou'd better not push";
+						mes "this button. Your enemies";
+						mes "must have hidden it carefully";
+						mes "for you to find: it must be";
+						mes "some sort of nefarious trap.^000000";
 						close;
-
 					}
-
 				}
-
 			}
-
 		case 2:
-			mes "^3355FFYou decided not^000000";
-			mes "^3355FFto pull and handles.^000000";
+			mes "^3355FFYou decided not";
+			mes "to pull any handles.^000000";
 			close;
-
 		}
-
 	}
-
 	else if ((KHCottagePoem1 > 3) || (KielHyreQuest >= 30)) {
-		mes "^3355FFThis is where you pressed^000000";
-		mes "^3355FFthe small button that caused^000000";
-		mes "^3355FFsome strange noise to come^000000";
-		mes "^3355FFfrom the stairs near the wallway.^000000";
+		mes "^3355FFThis is where you pressed";
+		mes "the small button that caused";
+		mes "some strange sound to come";
+		mes "from the stairs near the hallway.";
 		close;
 	}
 }
@@ -2719,84 +2632,72 @@ kh_vila,39,41,0	script	Pool	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Vicious Dog
 //----------------------------------------------------------------------------
-kh_vila,181,178,4	script	Vicious Dog	81,7,3,{
+kh_vila,181,178,4	script	Vicious Dog#khp1	81,7,3,{
+//OnTouch2:
 OnTouch:
 	mes "*Grrr~*";
 	next;
-	mes "^3355FFAn extremely vicious^000000";
-	mes "^3355FFlooking dog is glaring^000000";
-	mes "^3355FFat you. Can you really^000000";
-	mes "^3355FFpass by this creature^000000";
-	mes "^3355FFwithout getting hurt?^000000";
+	mes "^3355FFAn extremely vicious";
+	mes "looking dog is glaring";
+	mes "at you. Can you really";
+	mes "pass by this creature";
+	mes "without getting hurt?^000000";
 	next;
-
-	switch(select("March forward","Run away")) {
-
+	switch(select("March forward:Run away")) {
 	case 1:
 		if (countitem(537) >= 1) {
-			mes "^3355FFWait! Perhaps you can^000000";
-			mes "^3355FFuse food to soothe the^000000";
-			mes "^3355FFsavage beast! Why don't^000000";
-			mes "^3355FFyou feed it some of your Pet^000000";
-			mes "^3355FFFood and see what happens?^000000";
+			mes "^3355FFWait! Perhaps you can";
+			mes "use food to soothe the";
+			mes "savage beast. Why don't";
+			mes "you feed it some of your Pet";
+			mes "Food and see what happens?^000000";
 			next;
-
-			switch(select("Give Pet Food","It won't work!")) {
-
+			switch(select("Give Pet Food:It won't work!")) {
 			case 1:
-				mes "^3355FFYou gingerly throw the^000000";
-				mes "^3355FFPet Food towards the dog.^000000";
-				mes "^3355FFIts tail shakes violently as^000000";
-				mes "^3355FFit devours the food. You'd^000000";
-				mes "^3355FFbetter pass this dog now^000000";
-				mes "^3355FFwhile you have the chance!^000000";
+				mes "^3355FFYou gingerly throw the";
+				mes "Pet Food towards the dog.";
+				mes "Its tail shakes violently as";
+				mes "it devours the food. You'd";
+				mes "better pass this dog now";
+				mes "while you have the chance!^000000";
 				delitem 537,1; //Pet_Food
 				close2;
 				warp "kh_vila",173,182;
 				end;
-
 			case 2:
-				NoPetFood:
-				mes "^3355FFYou slowly approach^000000";
-				mes "^3355FFthe dog, but it won't^000000";
-				mes "^3355FFstop snarling at you.^000000";
-				mes "^3355FFYou try to run past the^000000";
-				mes "^3355FFdog, but it blocks all of^000000";
-				mes "^3355FFyour moves. What to do?^000000";
-				next;
-				mes "[Vicious Dog]";
-				mes "BOW WOW!";
-				mes "BOW WOW!";
-				mes "BOW WOW WOW!";
-				next;
-				mes "^3355FFThe dog chases you^000000";
-				mes "^3355FFdownstairs like the^000000";
-				mes "^3355FFsuckah chump you are.^000000";
-				close2;
-				warp "kh_vila",126,70;
-				end;
-
+				break;
 			}
 		}
-
-		else {
-			goto NoPetFood;
-		}
-
+		mes "^3355FFYou slowly approach";
+		mes "the dog, but it won't";
+		mes "stop snarling at you.";
+		mes "You try to run past the";
+		mes "dog, but it blocks all of";
+		mes "your moves. What to do?^000000";
+		next;
+		mes "[Vicious Dog]";
+		mes "BOW WOW!";
+		mes "BOW WOW!";
+		mes "BOW WOW WOW!";
+		next;
+		mes "^3355FFThe dog chased you";
+		mes "downstairs like the";
+		mes "suckah chump you are.^000000";
+		close2;
+		warp "kh_vila",126,70;
+		end;
 	case 2:
 		mes "^3355FFLet's get out of here!^000000";
 		close2;
 		warp "kh_vila",126,70;
 		end;
-
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Drawer, first room nightstand
 //----------------------------------------------------------------------------
-kh_vila,115,186,0	script	Drawer::DrawerKHQ1	111,{
+kh_vila,115,186,0	script	Drawer#khp1	111,{
 	if (checkweight(7492,1) == 0) {
 		mes "^3355FFThere's something inside";
 		mes "this drawer, but you can't";
@@ -2807,36 +2708,32 @@ kh_vila,115,186,0	script	Drawer::DrawerKHQ1	111,{
 		close;
 	}
 	if ((countitem(7492) < 1) && (KielHyreQuest <= 36)) {
-		mes "^3355FFYou find an old drawer^000000";
-		mes "^3355FFthat has been closed.^000000";
-		mes "^3355FFIf you open it, then you^000000";
-		mes "^3355FFmight find something^000000";
-		mes "^3355FFinside. Or could it be^000000";
-		mes "^3355FFempty. Who knows?^000000";
-		next;
-
-		switch(select("Open Drawer","Ignore")) {
-
+		mes "^3355FFYou find an old drawer";
+		mes "^that has been closed.";
+		mes "^If you open it, then you";
+		mes "^might find something";
+		mes "^inside. Or could it be";
+		mes "^empty. Who knows?^000000";
+		next;
+		switch(select("Open Drawer:Ignore")) {
 		case 1:
-			mes "^3355FFYou obtain a Yellow^000000";
-			mes "^3355FFKeycard from inside the^000000";
-			mes "^3355FFdrawer. Opening that drawer^000000";
-			mes "^3355FFturned out to be worthwhile.^000000";
-			getitem 7492,1; //Yellow_Keycard
+			mes "^3355FFYou obtain a Yellow";
+			mes "Keycard from inside the";
+			mes "drawer. Opening that drawer";
+			mes "Fturned out to be worthwhile.^000000";
+			getitem 7492,1; //Yellow_Key_Card
 			close;
-
 		case 2:
-			mes "^3355FFForget opening that^000000";
-			mes "^3355FFdrawer. I mean, come on,^000000";
-			mes "^3355FFwhat would be the point?^000000";
+			mes "^3355FFForget opening that";
+			mes "drawer. I mean, come on,";
+			mes "what would be the point?^000000";
 			close;
 		}
 	}
-
 	else {
-		mes "^3355FFThis is where you^000000";
-		mes "^3355FFfound the Yellow Keycard.^000000";
-		mes "^3355FFThis drawer is now empty.^000000";
+		mes "^3355FFThis is where you";
+		mes "found the Yellow Keycard.";
+		mes "This drawer is now empty.^000000";
 		close;
 	}
 }
@@ -2844,256 +2741,191 @@ kh_vila,115,186,0	script	Drawer::DrawerKHQ1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Box
 //----------------------------------------------------------------------------
-kh_vila,107,126,0	script	Box::BoxKHQ2	111,{
+kh_vila,107,126,0	script	Box#khp2	111,{
 	if ((countitem(7329) < 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 38)) {
-		mes "^3355FFA solid box is laid^000000";
-		mes "^3355FFon the floor in which^000000";
-		mes "^3355FFa smaller, locked box^000000";
-		mes "^3355FFhas been placed inside.^000000";
+		mes "^3355FFA solid box is laid";
+		mes "on the floor in which";
+		mes "a smaller, locked box";
+		mes "has been placed inside.^000000";
 		close;
 	}
-
 	else if ((countitem(7329) >= 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 38)) {
-		mes "^3355FFA solid box is laid^000000";
-		mes "^3355FFon the floor in which^000000";
-		mes "^3355FFa smaller, locked box^000000";
-		mes "^3355FFhas been placed inside.^000000";
-		mes "^3355FFPerhaps you can use your^000000";
-		mes "^3355FFOld Bronze Key to unlock it.^000000";
-		next;
-
-		switch(select("Use Old Bronze Key","No, it'll never work.")) {
-
+		mes "^3355FFA solid box is laid";
+		mes "on the floor in which";
+		mes "a smaller, locked box";
+		mes "has been placed inside.";
+		mes "Perhaps you can use your";
+		mes "Old Bronze Key to unlock it.^000000";
+		next;
+		switch(select("Use Old Bronze Key:No, it'll never work.")) {
 		case 1:
-			mes "^3355FFYour hunch paid off!^000000";
-			mes "^3355FFThe Old Bronze Key really^000000";
-			mes "^3355FFdid unlock that box! You^000000";
-			mes "^3355FFopen the inner box and^000000";
-			mes "^3355FFobtain the Green Keycard^000000";
-			mes "^3355FFthat was locked inside.^000000";
-			getitem 7516,1;	//Green_Keycard
-			delitem 7329,1;	//Old_Bronze_Key
+			mes "^3355FFYour hunch paid off!";
+			mes "The Old Bronze Key really";
+			mes "did unlock that box! You";
+			mes "open the inner box and";
+			mes "obtain the Green Keycard";
+			mes "that was locked inside.";
+			getitem 7516,1; //Green_Key_Card
+			delitem 7329,1; //Old_Bronze_Key
 			close;
-
-
 		case 2:
-			mes "^3355FFWhat...?^000000";
-			mes "^3355FFWhat? Using a key^000000";
-			mes "^3355FFto unlock a lock?^000000";
-			mes "^3355FFCome on, that's^000000";
-			mes "^3355FFfreakin' crazy talk.^000000";
+			mes "^3355FFWhat...?";
+			mes "What? Using a key";
+			mes "to unlock a lock?";
+			mes "Come on, that's";
+			mes "freakin' crazy talk!^000000";
 			close;
-
 		}
-
 	}
-
 	else {
-		mes "^3355FFThis is the box from^000000";
-		mes "^3355FFwhich you obtained^000000";
-		mes "^3355FFthe green keycard.^000000";
+		mes "^3355FFThis is the box from";
+		mes "which you've obtained";
+		mes "the Green Keycard.^000000";
 		close;
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Bookshelf.
 //----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-// Cottage interior, upstairs; Bookshelf.
-//----------------------------------------------------------------------------
-kh_vila,181,138,0	script	Bookshelf::BookshelfKHQ1	111,{
-	if (checkweight(7492,1) == 0) {
-		mes "^3355FFYou've found a";
-		mes "bookshelf that's";
-		mes "crammed with books.^000000";
-		close;
-	}
-
+kh_vila,181,138,0	script	Bookshelf#khp1	111,{
 	if ((countitem(7491) < 1) && (countitem(7329) >= 1) || (countitem(7516) >= 1)) {
-		mes "^3355FFOne of the books on^000000";
-		mes "^3355FFthis crammed bookshell^000000";
-		mes "^3355FFis labeled with the note,^000000";
-		mes "^3355FF'To Elly.' It must have been^000000";
-		mes "^3355FFleft behind by her grandfather^000000";
+		mes "^3355FFOne of the books on";
+		mes "this crammed bookshelf";
+		mes "is labeled with the note,";
+		mes "''To Elly.'' It must have been";
+		mes "left behind by her grandfather.^000000";
 		next;
-		switch(select("Examine Book","Ignore")) {
-
+		switch(select("Examine Book:Ignore")) {
 		case 1:
-			mes "^3355FFYou skim through the^000000";
-			mes "^3355FFbook's pages, and don't^000000";
-			mes "^3355FFfind anything particularly^000000";
-			mes "^3355FFinteresting. However, you^000000";
-			mes "^3355FFnotice a steel surface behind the^000000";
-			mes "^3355FFshelf as you place the book back.^000000";
+			mes "^3355FFYou skim through the";
+			mes "book's pages, and don't";
+			mes "find anything particularly";
+			mes "interesting. However, you";
+			mes "notice a steel surface behind the";
+			mes "shelf as you place the book back.^000000";
 			next;
-
-			switch(select("Examine the steel surface","Ignore")) {
-
+			switch(select("Examine the steel surface:Ignore")) {
 			case 1:
-				mes "^3355FFYou remove more of the^000000";
-				mes "^3355FFself's books to reveal^000000";
-				mes "^3355FFthat the steel surface is^000000";
-				mes "^3355FFpart of a safe hidden behind^000000";
-				mes "^3355FFthe bookshelf. There are two^000000";
-				mes "^3355FFkeyholes on the steel safe.^000000";
+				mes "^3355FFYou remove more of the";
+				mes "shelf's books to reveal";
+				mes "that the steel surface is";
+				mes "part of a safe hidden behind";
+				mes "the bookshelf. There are two";
+				mes "keyholes on the steel safe.^000000";
 				next;
-
-				switch(select("Try all your keys","Cancel")) {
-
+				switch(select("Try all your keys:Cancel")) {
 				case 1:
-					mes "^3355FFWhich key will^000000";
-					mes "^3355FFyou insert into^000000";
-					mes "^3355FFthe first keyhole?^000000";
+					mes "^3355FFWhich key will";
+					mes "you insert into";
+					mes "the first keyhole?^000000";
 					next;
-
 					if (countitem(7329) >= 1) {
-						switch(select("Old Bronze Key","Cottage Key")) {
-
-						case 1:
-							break;
-
-						case 2:
-							break;
-
-						}
-
-						mes "^3355FFWhich key will^000000";
-						mes "^3355FFyou insert into^000000";
-						mes "^3355FFthe second keyhole?^000000";
+						select("Old Bronze Key:Cottage Key");
+						mes "^3355FFWhich key will";
+						mes "you insert into";
+						mes "the second keyhole?^000000";
 						next;
-
-						switch(select("Old Bronze Key","Cottage Key")) {
-
-						case 1:
-							break;
-
-						case 2:
-							break;
-
-						}
-
+						select("Old Bronze Key:Cottage Key");
 					}
-
-
 					else if (countitem(7516) >= 1) {
-
-						switch(select("Green Keycard","Cottage Key")) {
-
+						switch(select("Green Keycard:Cottage Key")) {
 						case 1:
-							set @KHFirstKeyhole,1;
+							set .@KHFirstKeyhole,1;
 							break;
-
 						case 2:
-							set @KHFirstKeyhole,2;
+							set .@KHFirstKeyhole,2;
 							break;
-
 						}
-
-						mes "^3355FFWhich key will^000000";
-						mes "^3355FFyou insert into^000000";
-						mes "^3355FFthe second keyhole?^000000";
+						mes "^3355FFWhich key will";
+						mes "you insert into";
+						mes "the second keyhole?^000000";
 						next;
-
-						switch(select("Green Keycard","Cottage Key")) {
-
+						switch(select("Green Keycard:Cottage Key")) {
 						case 1:
-							set @KHSecondKeyhole,1;
+							set .@KHSecondKeyhole,1;
 							break;
 
 						case 2:
-							set @KHSecondKeyhole,2;
+							set .@KHSecondKeyhole,2;
 							break;
 
 						}
-
-						if (@KHFirstKeyhole == 2) && (@KHSecondKeyhole == 1) {
-							mes "^3355FFThe safe opens with^000000";
-							mes "^3355FFa click and you see^000000";
-							mes "^3355FFa Steel Box inside.^000000";
-							mes "^3355FFYou take the Steel Box^000000";
-							mes "^3355FFwith you, hoping that^000000";
-							mes "^3355FFwill come in handy later.^000000";
-							delitem 7489,1; //Cottage Key
-							delitem 7516,1; //Green_Keycard
-							getitem 7491,1; //Steel_box
+						if (.@KHFirstKeyhole == 2) && (.@KHSecondKeyhole == 1) {
+							mes "^3355FFThe safe opens with";
+							mes "a click, and you see";
+							mes "a Grey Box inside.";
+							mes "You take the Grey Box";
+							mes "with you, hoping that it";
+							mes "will come in handy later.^000000";
+							delitem 7489,1; //Villa_Spare_Key
+							delitem 7516,1; //Green_Key_Card
+							getitem 7491,1; //Iron_Box
 							close;
 						}
 
 					}
-
 					mes "^3355FFThe safe won't open.^000000";
 					close;
-
-
 				case 2:
-					mes "^3355FFIt's probably a better^000000";
-					mes "^3355FFidea to investigate the^000000";
-					mes "^3355FFcottage for the keys that^000000";
-					mes "^3355FFwill open up this safe...^000000";
+					mes "^3355FFIt's probably a better";
+					mes "idea to investigate the";
+					mes "cottage for the keys that";
+					mes "will open up this safe...^000000";
 					close;
-
 				}
-
 			case 2:
-				mes "^3355FFYou place the books^000000";
-				mes "^3355FFback on the bookchelf.^000000";
+				mes "^3355FFYou place the books";
+				mes "back on the bookshelf.^000000";
 				close;
-
 			}
-	
 		case 2:
-			mes "^3355FFYou can probably^000000";
-			mes "^3355FFfind better clues^000000";
-			mes "^3355FFsomewhere else^000000";
-			mes "^3355FFaround here.^000000";
+			mes "^3355FFYou can probably";
+			mes "find better clues";
+			mes "somewhere else";
+			mes "around here.^000000";
 			close;
-
 		}
 	}
-
 	else {
 		mes "^3355FFYou've found a";
 		mes "bookshelf that's";
 		mes "crammed with books.^000000";
 		close;
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Desk
 //----------------------------------------------------------------------------
-kh_vila,118,143,0	script	Desk::DeskKHQ1	111,{
+kh_vila,118,144,0	script	Desk#khp1	111,{
 	if (KHCottagePoem2 < 1) {
-		mes "^3355FFThere are piles of papers^000000";
-		mes "^3355FFand books stacked on top^000000";
-		mes "^3355FFof the desk covering topics^000000";
-		mes "^3355FFlike artificial power, Sage^000000";
-		mes "^3355FFVarmundt's research, factory^000000";
-		mes "^3355FFrobotization, and magic scrolls...^000000";
-		next;
-		mes "^3355FFWhile rummaging around through^000000";
-		mes "^3355FFthe books and paper, you^000000";
-		mes "^3355FFfind a piece of paper with^000000";
-		mes "^3355FFthe Kiel Hyre Foundation's^000000";
-		mes "^3355FFofficial seal. You decide that^000000";
-		mes "^3355FFit might come in handy someday.^000000";
-		next;
-		mes "^3355FFYou've obtained^000000";
-		mes "^3355FFa blank piece of^000000";
-		mes "^3355FFpaper with the Kiel^000000";
-		mes "^3355FFHyre Foundation seal.^000000";
+		mes "^3355FFThere are piles of papers";
+		mes "and books stacked on top";
+		mes "of the desk covering topics";
+		mes "like artificial power, Sage";
+		mes "Varmundt's research, factory";
+		mes "robotization, and magic scrolls...^000000";
+		next;
+		mes "^3355FFWhile rummaging through";
+		mes "the books and papers, you";
+		mes "find a piece of paper with";
+		mes "the Kiel Hyre Foundation's";
+		mes "official seal. You decide that";
+		mes "it might come in handy someday.^000000";
+		next;
+		mes "^3355FFYou've obtained";
+		mes "a blank piece of";
+		mes "paper with the Kiel";
+		mes "Hyre Foundation seal.^000000";
 		set KHCottagePoem2,1;
 		close;
 	}
-
 	else if (KHCottagePoem2 >= 1) {
-		mes "^3355FFThere are piles of papers^000000";
-		mes "^3355FFand books, covering various^000000";
-		mes "^3355FFscientific and magic tomics,^000000";
-		mes "^3355FFstacked on top of this desk.^000000";
+		mes "^3355FFThere are piles of papers";
+		mes "and books, covering various";
+		mes "scientific and magic topics,";
+		mes "stacked on top of this desk.^000000";
 		close;
 	}
 }
@@ -3101,58 +2933,52 @@ kh_vila,118,143,0	script	Desk::DeskKHQ1	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, upstairs; Medicine Chest
 //----------------------------------------------------------------------------
-kh_vila,123,170,0	script	Medicine Chest	111,{
+kh_vila,123,170,0	script	Medicine Chest#khp1	111,{
 	if ((KHCottagePoem2 < 1) && (KielHyreQuest < 30)) {
-		mes "^3355FFThis medicine cabinet^000000";
-		mes "^3355FFis filled with bottles of^000000";
-		mes "^3355FFvarious colors. What kind^000000";
-		mes "^3355FFof medicine can be found here?^000000";
+		mes "^3355FFThis medicine cabinet";
+		mes "is filled with bottles of";
+		mes "various colors. What kind";
+		mes "of medicine can be found here?^000000";
 		close;
 	}
-
 	else if ((KHCottagePoem2 == 1) && (KielHyreQuest < 30)) {
-		mes "^3355FFThis medicine cabinet^000000";
-		mes "^3355FFis filled with bottles of^000000";
-		mes "^3355FFvarious colors. What kind^000000";
-		mes "^3355FFof medicine can be found here?^000000";
-		next;
-		mes "^3355FFWait, you have a blank piece^000000";
-		mes "^3355FFof paper with the Kiel Hyre^000000";
-		mes "^3355FFFoundation seal! It's strange^000000";
-		mes "^3355FFthat the seal was put on a blank^000000";
-		mes "^3355FFpiece of paper. Maybe something^000000";
-		mes "^3355FFis written on it with special ink?^000000";
-		next;
-		mes "^3355FFIt's a crazy hunch, but^000000";
-		mes "^3355FFmaybe, just maybe, you can^000000";
-		mes "^3355FFuse something inside this^000000";
-		mes "^3355FFmedicine cabinet that will^000000";
-		mes "^3355FFreveal any invisible ink^000000";
-		mes "^3355FFwritten on this document!^000000";
-		next;
-
-		switch(select("What? That's crazy!","Of course! Let's try it!")) {
-
+		mes "^3355FFThis medicine cabinet";
+		mes "is filled with bottles of";
+		mes "various colors. What kind";
+		mes "of medicine can be found here?^000000";
+		next;
+		mes "^3355FFWait, you have a blank piece";
+		mes "of paper with the Kiel Hyre";
+		mes "Foundation seal! It's strange";
+		mes "that the seal was put on a blank";
+		mes "piece of paper. Maybe something";
+		mes "is written on it with special ink?^000000";
+		next;
+		mes "^3355FFIt's a crazy hunch, but";
+		mes "maybe, just maybe, you can";
+		mes "use something inside this";
+		mes "medicine cabinet that will";
+		mes "reveal any invisible ink";
+		mes "written on this document!^000000";
+		next;
+		switch(select("What? That's crazy!:Of course! Let's try it!")) {
 		case 1:
-			mes "^3355FFSorry.^000000";
-			mes "^3355FFI thought it^000000";
-			mes "^3355FFwas a good idea...^000000";
+			mes "^3355FFSorry.";
+			mes "I thought it";
+			mes "was a good idea...^000000";
 			close;
-
 		case 2:
-			switch(select("Try Red Liquid","Try Blue Liquid","Try Yellow Liquid","Try Green Liquid","Cancel")) {
-
+			switch(select("Try Red Liquid:Try Blue Liquid:Try Yellow Liquid:Try Green Liquid:Cancel")) {
 			case 1:
-				set @KHPotionColor$,"red";
+				set .@KHPotionColor$,"red";
 				break;
-
 			case 2:
-				mes "^3355FFIt works!^000000";
-				mes "^3355FFThe blue liquid is^000000";
-				mes "^3355FFrevealing small^000000";
-				mes "^3355FFtext written on the paper.^000000";
-				mes "^3355FFIt looks like some^000000";
-				mes "^3355FFkind of long poem...^000000";
+				mes "^3355FFIt works!";
+				mes "The blue liquid is";
+				mes "revealing small text";
+				mes "written on the paper.";
+				mes "It looks like some";
+				mes "kind of long poem...^000000";
 				next;
 				mes "[Poem]";
 				mes "The first snake is made of";
@@ -3167,69 +2993,59 @@ kh_vila,123,170,0	script	Medicine Chest	111,{
 				mes "defeated it in the end.";
 				mes "However, the fourth and";
 				mes "final snake is formless, and";
-				mes "no one knows it's appearance.";
+				mes "no one knows its appearance.";
 				next;
 				mes "[Poem]";
 				mes "I cast my despair to the air,";
 				mes "but nobody knows if it killed";
-				mes "the snake. I am merely a ^3355FFlittle";
+				mes "the snake. I am merely ^0000FFa little";
 				mes "lost devil^000000 with four swords and";
 				mes "four snakes, searching for that";
 				mes "girl in the darkness.";
 				next;
-				mes "^3355FFThis is a very^000000";
-				mes "^3355FFstrange poem. What^000000";
-				mes "^3355FFcould it possibly mean?^000000";
+				mes "^3355FFThis is a very";
+				mes "strange poem. What";
+				mes "could it possibly mean?^000000";
 				set KHCottagePoem2,2;
 				close;
-
 			case 3:
-				set @KHPotionColor$,"yellow";
+				set .@KHPotionColor$,"yellow";
 				break;
-
 			case 4:
-				set @KHPotionColor$,"green";
+				set .@KHPotionColor$,"green";
 				break;
-
 			case 5:
-				mes "^3355FFNever mind.^000000";
-				mes "^3355FFThis idea sounds^000000";
-				mes "^3355FFtoo crazy to work...^000000";
-				mes "^3355FFlike putting a man^000000";
-				mes "^3355FFpn the moon. Can you^000000";
-				mes "^3355FFbelieve that hogwash?^000000";
+				mes "^3355FFNever mind.";
+				mes "This idea sounds";
+				mes "too crazy to work...";
+				mes "like puttting a man";
+				mes "on the moon. Can you";
+				mes "believe that hogwash?^000000";
 				close;
 			}
-
-			mes "^3355FFYou tried sprinking^000000";
-			mes "^3355FFthe "+@KHPotionColor$+" liquid from the^000000";
-			mes "^3355FFmedicine cabinet onto^000000";
-			mes "^3355FFthe blank paper with the^000000";
-			mes "^3355FFKiel Hyre Foundation seal.^000000";
-			mes "^3355FFHowever, nothing happened...^000000";
+			mes "^3355FFYou tried sprinkling";
+			mes "the "+.@KHPotionColor$+" liquid from the";
+			mes "medicine cabinet onto";
+			mes "the blank paper with the";
+			mes "Kiel Hyre Foundation seal.";
+			mes "However, nothing happened...^000000";
 			close;
-
 		}
 	}
-
 	else if ((KHCottagePoem2 >= 2) || (KielHyreQuest >= 30)) {
-		mes "^3355FFThis is where you poured^000000";
-		mes "^3355FFsome blue liquid to read^000000";
-		mes "^3355FFa poem written in invisible^000000";
-		mes "^3355FFink on a blank poece of paper^000000";
-		mes "^3355FFwith the Kiel Hyre Foundation^000000";
-		mes "^3355FFseal. Would you like to read it?^000000";
-		next;
-
-		switch(select("No time!","Read")) {
-
+		mes "^3355FFThis is where you poured";
+		mes "some blue liquid to read";
+		mes "a poem written in invisible";
+		mes "ink on the blank piece of paper";
+		mes "with the Kiel Hyre Foundation";
+		mes "seal. Would you like read it?^000000";
+		switch(select("No time!:Read")) {
 		case 1:
-			mes "^3355FFYou're running out of^000000";
-			mes "^3355FFtime! For now, it would^000000";
-			mes "^3355FFbe best for you to seach^000000";
-			mes "^3355FFevery inch of the cottage.^000000";
+			mes "^3355FFYou're running out of";
+			mes "time! For now, it would";
+			mes "be best for you to search";
+			mes "every inch of this cottage.^000000";
 			close;
-
 		case 2:
 			mes "[Poem]";
 			mes "The first snake is made of";
@@ -3262,174 +3078,109 @@ kh_vila,123,170,0	script	Medicine Chest	111,{
 //----------------------------------------------------------------------------
 // Cottage interior, stair case; Sword hilt
 //----------------------------------------------------------------------------
-kh_vila,136,68,0	script	Sword Hilt	111,{
+kh_vila,136,68,0	script	Sword Hilt#kh	111,{
 	if ((KHCottagePoem1 < 3) || (KHCottagePoem2 < 2) && (KielHyreQuest < 30)) {
-		mes "^3355FFThere are four elaborately^000000";
-		mes "^3355FFdesigned swords positioned^000000";
-		mes "^3355FFnext to four creepy looking^000000";
-		mes "^3355FFsnake sculptures.^000000";
+		mes "^3355FFThere are four elaborately";
+		mes "designed swords positioned";
+		mes "next to four creepy looking";
+		mes "snake sculptures.^000000";
 		close;
 	}
-
 	else if ((KHCottagePoem1 <= 4) || (KHCottagePoem2 <= 2) && (KielHyreQuest < 30)) {
-		mes "^3355FFThere are four elaborately^000000";
-		mes "^3355FFdesigned swords positioned^000000";
-		mes "^3355FFnext to four creepy looking^000000";
-		mes "^3355FFsnake sculptures. Wait!^000000";
-		mes "^3355FFperhaps they're related to^000000";
-		mes "^3355FFthat poem you read earlier...^000000";
-		next;
-
-		switch(select("No way!","Of course!")) {
-
+		mes "^3355FFThere are four elaborately";
+		mes "designed swords positioned";
+		mes "next to four creepy looking";
+		mes "snake sculptures. Wait!";
+		mes "Perhaps they're related to";
+		mes "that poem you read earlier...";
+		next;
+		switch(select("No way!:Of course!")) {
 		case 1:
-			mes "^3355FFImpossible...^000000";
-			mes "^3355FFIt must be some^000000";
-			mes "^3355FFkind of coincidence...^000000";
+			mes "^3355FFImpossible...";
+			mes "It must be some";
+			mes "kind of coincidence...^000000";
 			close;
-
 		case 2:
-			mes "^3355FFOf course! And look!^000000";
-			mes "^3355FFThere's a hole on top^000000";
-			mes "^3355FFof the head of each snake^000000";
-			mes "^3355FFsculpture. There holes seem^000000";
-			mes "^3355FFbig enough to insert each of^000000";
-			mes "^3355FFthe ornamental swords nearby...^000000";
+			mes "^3355FFOf course! And look!";
+			mes "There's a hole on top";
+			mes "of the head of each snake";
+			mes "sculpture. These holes seem";
+			mes "big enough to insert each of";
+			mes "the ornamental swords nearby...^000000";
 			next;
-
-			switch(select("Ignore","Insert Ornamental Swords")) {
-
+			switch(select("Ignore:Insert Ornamental Swords")) {
 			case 1:
 				mes "^3355FFImposible...^000000";
 				mes "^3355FFIt must be some^000000";
 				mes "^3355FFkind of coincidence...^000000";
 				close;
-
 			case 2:
 				if (KHCottagePoem1 != 4) {
-					mes "^3355FFCan't... Pull out...^000000";
-					mes "^3355FFSword! It must be^000000";
-					mes "^3355FFlocked into place^000000";
-					mes "^3355FFsomehow, or sealed^000000";
-					mes "^3355FFby some strange force!^000000";
+					mes "^3355FFCan't... Pull out...";
+					mes "Sword! It must be";
+					mes "locked into place";
+					mes "somehow, or sealed";
+					mes "by some strange force!^000000";
 					close;
 				}
-
 				else {
-					mes "^3355FFYou should probably^000000";
-					mes "^3355FFtry to insert each sword^000000";
-					mes "^3355FFinto the correct snake.^000000";
-					mes "^3355FFFirst please select the^000000";
-					mes "^3355FFsnake in which you will^000000";
-					mes "^3355FFinsert the first sword.^000000";
+					mes "^3355FFYou should probably";
+					mes "try to insert each sword";
+					mes "into the correct snake.";
+					mes "First, please select the";
+					mes "snake in which you will";
+					mes "insert the first sword.^000000";
 					next;
-
-					switch(select("First Snake","Second Snake","Third Snake","Fourth Snake")) {
-
-					case 1:
-						set @KHfirstSword,1;
+					switch(select("First Snake:Second Snake:Third Snake:Fourth Snake")) {
+					default:
 						break;
-
 					case 2:
-						set @KHfirstSword,2;
-						break;
-
-					case 3:
-						set @KHfirstSword,3;
-						break;
-
-					case 4:
-						set @KHfirstSword,4;
+						set .@KHSwords,.@KHSwords+1;
 						break;
-
 					}
-
 					next;
-					mes "^3355FFNow, please choose^000000";
-					mes "^3355FFthe snake in which you^000000";
-					mes "^3355FFwill insert the second sword.^000000";
+					mes "^3355FFNow, please choose";
+					mes "the snake in which you";
+					mes "will insert the second sword.^000000";
 					next;
-
-					switch(select("First Snake","Second Snake","Third Snake","Fourth Snake")) {
-
-					case 1:
-						set @KHSecondSword,1;
-						break;
-
-					case 2:
-						set @KHSecondSword,2;
-						break;
-
-					case 3:
-						set @KHSecondSword,3;
+					switch(select("First Snake:Second Snake:Third Snake:Fourth Snake")) {
+					default:
 						break;
-
 					case 4:
-						set @KHSecondSword,4;
+						set .@KHSwords,.@KHSwords+1;
 						break;
-
 					}
-
 					next;
-
-					mes "^3355FFNext, please select^000000";
-					mes "^3355FFthe snake in which you^000000";
-					mes "^3355FFwill insert the third sword.^000000";
+					mes "^3355FFNext, please select";
+					mes "the snake in which you";
+					mes "will insert the third sword.^000000";
 					next;
-
-					switch(select("First Snake","Second Snake","Third Snake","Fourth Snake")) {
-
+					switch(select("First Snake:Second Snake:Third Snake:Fourth Snake")) {
 					case 1:
-						set @KHThirdSword,1;
+						set .@KHSwords,.@KHSwords+1;
 						break;
-
-
-					case 2:
-						set @KHThirdSword,2;
-						break;
-
-					case 3:
-						set @KHThirdSword,3;
+					default:
 						break;
-
-					case 4:
-						set @KHThirdSword,4;
-						break;
-
 					}
-
 					next;
-					mes "^3355FFLastly, please select^000000";
-					mes "^3355FFthe snake in which you^000000";
-					mes "^3355FFwill insert the fourth sword.^000000";
+					mes "^3355FFLastly, please select";
+					mes "Fthe snake in which you";
+					mes "will insert the fourth sword.^000000";
 					next;
-
-					switch(select("First Snake","Second Snake","Third Snake","Fourth Snake")) {
-
-					case 1:
-						set @KHFouthSword,1;
-						break;
-
-					case 2:
-						set @KHFouthSword,2;
+					switch(select("First Snake:Second Snake:Third Snake:Fourth Snake")) {
+					default:
 						break;
-
 					case 3:
-						set @KHFouthSword,3;
+						set .@KHSwords,.@KHSwords+1;
 						break;
-
-					case 4:
-						set @KHFouthSword,4;
-						break;
-
 					}
 
-					if ((@KHFirstSword == 2) && (@KHSecondSword == 4) && (@KHThirdSword == 1) && (@KHFouthSword == 3)) {
-						mes "^3355FFYour ears are suddenly^000000";
-						mes "^3355FFfilled with a low buzzing^000000";
-						mes "^3355FFnoise, and your mind^000000";
-						mes "^3355FFand body feel as if they^000000";
-						mes "^3355FFare being swept away^000000";
+					if (.@KHSwords == 4) {
+						mes "^3355FFYour ears are suddenly";
+						mes "filled with a low buzzing";
+						mes "noise, and your mind";
+						mes "and body feel as if they";
+						mes "are being swept away...^000000";
 						set KHCottagePoem1,5;
 						set KHCottagePoem2,3;
 						close2;
@@ -3438,49 +3189,43 @@ kh_vila,136,68,0	script	Sword Hilt	111,{
 					}
 
 					else {
-						mes "^3355FFNothing happened...^000000";
-						mes "^3355FFYou probably didn't^000000";
-						mes "^3355FFinsert the swords into^000000";
-						mes "^3355FFthe correct snakes. For now,^000000";
-						mes "^3355FFyou should return the swords,^000000";
-						mes "^3355FFand then try this again later.^000000";
+						mes "^3355FFNothing happened...";
+						mes "You probably didn't";
+						mes "insert the swords into";
+						mes "the correct snakes. For now,";
+						mes "you should return the swords,";
+						mes "and then try this again later.^000000";
 						close;
 					}
 				}
 			}
 		}
 	}
-
 	else if ((KHCottagePoem1 == 5) && (KHCottagePoem2 == 3) || (KielHyreQuest >= 30)) {
-		mes "^3355FFHere is a hidden^000000";
-		mes "^3355FFpath that leads to^000000";
-		mes "^3355FFthe secret laboratory.^000000";
+		mes "^3355FFHere is a hidden";
+		mes "path that leads to";
+		mes "the secret laboratory.^000000";
 		next;
-
-		switch(select("Enter","Cancel")) {
-
+		switch(select("Enter:Cancel")) {
 		case 1:
 			warp "kh_vila",178,72;
 			end;
-
 		case 2:
 			close;
-
 		}
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Cottage interior, Secret Room; left test tube
 //----------------------------------------------------------------------------
-kh_vila,179,68,0	script	Test Tube::TestTubeKHQ1	111,{
-	mes "^3355FFThis test tube contains^000000";
-	mes "^3355FFa young man dressed in^000000";
-	mes "^3355FFa Kiel Hyre Academy^000000";
-	mes "^3355FFuniform. Somehow, you^000000";
-	mes "^3355FFget the feeling that you've^000000";
-	mes "^3355FFseen him somewhere before.^000000";
+kh_vila,179,68,0	script	Test Tube#khp2	111,{
+	mes "^3355FFThis test tube contains";
+	mes "a young man dressed in";
+	mes "a Kiel Hyre Academy";
+	mes "uniform. Somehow, you";
+	mes "get the feeling that you've";
+	mes "seen him somewhere before.^000000";
 	close;
 }
 
@@ -3489,18 +3234,20 @@ kh_vila,179,68,0	script	Test Tube::TestTubeKHQ1	111,{
 // Cottage interior, Secret Room; Right test tube
 //----------------------------------------------------------------------------
 kh_vila,185,68,0	script	Test Tube::TestTubeKHQ2	111,{
-	if (KielHyreQuest == 28) {
-		mes "^3355FFA strange looking,^000000";
-		mes "^3355FFwizend old man is^000000";
-		mes "^3355FFheld within this test tube.^000000";
-		mes "^3355FFThere is a small red button^000000";
-		mes "^3355FFright underneath the test tube.^000000";
-		next;
-
-		switch(select("Press Button","Investigate Further")) {
-
+	if (KielHyreQuest > 28) {
+		mes "^3355FFA strange looking,";
+		mes "wizened old man is";
+		mes "held within this test tube.^000000";
+	}
+	else if (KielHyreQuest == 28) {
+		mes "^3355FFA strange looking,";
+		mes "wizened old man is";
+		mes "held within this test tube.";
+		mes "There is a small red button";
+		mes "right underneath the test tube.^000000";
+		next;
+		switch(select("Press Button:Investigate Further")) {
 		case 1:
-
 			mes "[???]";
 			mes "H-hello...? C-can you";
 			mes "hear me? I don't recognize";
@@ -3509,10 +3256,8 @@ kh_vila,185,68,0	script	Test Tube::TestTubeKHQ2	111,{
 			mes "then you know what to call me,";
 			mes "right? Do you know what I am?";
 			next;
-
-			input @KHInput$;
-
-			if (@KHInput$ == "little lost devil") {
+			input .@KHInput$;
+			if (.@KHInput$ == "little lost devil") {
 				mes "[???]";
 				mes "Heh... Heh heh...";
 				mes "He knows... Hey, you";
@@ -3531,7 +3276,6 @@ kh_vila,185,68,0	script	Test Tube::TestTubeKHQ2	111,{
 				set KielHyreQuest,30;
 				close;
 			}
-
 			else {
 				mes "[???]";
 				mes "No... No...";
@@ -3540,25 +3284,31 @@ kh_vila,185,68,0	script	Test Tube::TestTubeKHQ2	111,{
 				mes "were friends. No...";
 				close;
 			}
-
 		case 2:
-			mes "^3355FFLet's investigate^000000";
-			mes "^3355FFthis area a little^000000";
-			mes "^3355FFmore first.^000000";
+			mes "^3355FFLet's investigate";
+			mes "this area a little";
+			mes "more first.^000000";
 			close;
-
 		}
-
 	}
-
 	else if (KielHyreQuest >= 30) {
-		mes "^3355FFWhat could the^000000";
-		mes "^3355FFnumber 4772961^000000";
-		mes "^3355FFmean? For now, you've^000000";
-		mes "^3355FFfound everything that^000000";
-		mes "^3355FFyou need from this place,^000000";
-		mes "^3355FFso you should return to Elly.^000000";
-		close;
+		if ((countitem(7491) > 0) && (countitem(7492) > 0)){
+			mes "^3355FFWhat could the";
+			mes "number 4772961";
+			mes "mean? For now, you've";
+			mes "found everything that";
+			mes "you need from this place,";
+			mes "so you should return to Elly.^000000";
+			close;
+		}
+		else {
+			mes "^3355FFWhat could the";
+			mes "number 4772961";
+			mes "mean? For now, you'd";
+			mes "better search this cottage";
+			mes "for any clues you can find...^000000";
+			close;
+		}
 	}
 	end;
 }
@@ -3572,46 +3322,61 @@ kh_vila,185,68,0	script	Test Tube::TestTubeKHQ2	111,{
 //----------------------------------------------------------------------------
 // Robotic's Factory; Heavy Door
 //----------------------------------------------------------------------------
-kh_dun01,235,48,0	script	Heavy Door::HeavyDoorKHQ1	111,{
-	if ((KielHyreQuest >= 38) && (KielHyreQuest < 46)) {
-		mes "^3355FFThere is a large, heavy^000000";
-		mes "^3355FFdoor infront of you.^000000";
+kh_dun01,235,48,0	script	Heavy Door#kh1::HeavyDoorKHQ1	111,{
+	if (KielHyreQuest > 38) {
+		mes "^3355FFThere is a large, heavy";
+		mes "door infront of you.^000000";
 		next;
-
-		switch(select("Open Door","Cancel")) {
-
+		switch(select("Open Door:Cancel")) {
+		case 1:
+			input .@KHInput$;
+			mes "^3355FFYou try to push the";
+			mes "door open with all";
+			mes "your might, but fail";
+			mes "to make it budge.^000000";
+			close;
+		case 2:
+			mes "^3355FFyou decided to leave";
+			mes "this door alone until";
+			mes "you can figure out";
+			mes "how to open it^000000";
+			close;
+		}
+	}
+	else if ((KielHyreQuest >= 38) && (KielHyreQuest < 46)) {
+		mes "^3355FFThere is a large, heavy";
+		mes "door in front of you.^000000";
+		next;
+		switch(select("Open Door:Cancel")) {
 		case 1:
-			input @KHInput$;
-			if (@KHInput$ == "Blue Keycard") {
-				mes "^3355FFYou've successfully^000000";
-				mes "^3355FFopened the door.^000000";
+			input .@KHInput$;
+			if (.@KHInput$ == "Blue Keycard") {
+				mes "^3355FFYou've successfully";
+				mes "opened the door.";
 				close2;
 				warp "kh_school",119,144;
 				end;
 			}
-
 			else {
-				mes "^3355FFYou try to push the^000000";
-				mes "^3355FFdoor open with all^000000";
-				mes "^3355FFyour might, but fail^000000";
-				mes "^3355FFto make it budge.^000000";
+				mes "^3355FFYou try to push the";
+				mes "door open with all";
+				mes "your might, but fail";
+				mes "to make it budge.^000000";
 				close;
 			}
-
 		case 2:
-			mes "^3355FFyou decided to leave^000000";
-			mes "^3355FFthis door alone until^000000";
-			mes "^3355FFyou can figure out^000000";
-			mes "^3355FFhow to open it^000000";
+			mes "^3355FFYou decided to leave";
+			mes "this door alone until";
+			mes "you can figure out";
+			mes "how you can open it.^000000";
 			close;
-
 		}
-
 	}
-
 	else {
-		mes "^3355FFThere is a large, heavy^000000";
-		mes "^3355FFdoor infront of you^000000";
+		mes "^3355FFThis is an incredibly";
+		mes "heavy door that is tightly";
+		mes "closed. You won't be able to";
+		mes "open it through brute force.^000000";
 		close;
 	}
 }
@@ -3621,53 +3386,46 @@ kh_dun01,235,48,0	script	Heavy Door::HeavyDoorKHQ1	111,{
 //----------------------------------------------------------------------------
 kh_dun01,76,233,0	script	Heavy Door::HeavyDoorKHQ2	111,{
 	if ((KielHyreQuest >= 38) && (KielHyreQuest < 46)) {
-		mes "^3355FFThere is a large, heavy^000000";
-		mes "^3355FFdoor infront of you.^000000";
+		mes "^3355FFThere is a large, heavy";
+		mes "door infront of you.^000000";
 		next;
-
-		switch(select("Open Door","Cancel")) {
-
+		switch(select("Open Door:Cancel")) {
 		case 1:
-			input @KHInput$;
-			mes "^3355FFYou try to push the^000000";
-			mes "^3355FFdoor open with all^000000";
-			mes "^3355FFyour might, but fail^000000";
-			mes "^3355FFto make it budge.^000000";
+			input .@KHInput$;
+			mes "^3355FFYou try to push the";
+			mes "door open with all";
+			mes "your might, but fail";
+			mes "to make it budge.^000000";
 			close;
-
 		case 2:
-			mes "^3355FFyou decided to leave^000000";
-			mes "^3355FFthis door alone until^000000";
-			mes "^3355FFyou can figure out^000000";
-			mes "^3355FFhow to open it^000000";
+			mes "^3355FFyou decided to leave";
+			mes "this door alone until";
+			mes "you can figure out";
+			mes "how to open it^000000";
 			close;
-
 		}
-
 	}
-
 	else {
-		mes "^3355FFThere is a large, heavy^000000";
-		mes "^3355FFdoor infront of you^000000";
+		mes "^3355FFThere is a large, heavy";
+		mes "door infront of you^000000";
 		close;
 	}
-
 }
 
-kh_dun01,106,233,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ3	111
-kh_dun01,6,164,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ4	111
-kh_dun01,6,133,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ5	111
-kh_dun01,6,60,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ6	111
-kh_dun01,6,30,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ7	111
-kh_dun01,6,18,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ8	111
-kh_dun01,235,70,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ9	111
-kh_dun01,235,92,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ10	111
-kh_dun01,235,114,0	duplicate(HeavyDoorKHQ2)	Heavy Door::HeavyDoorKHQ11	111
+kh_dun01,106,233,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh3	111
+kh_dun01,6,164,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh4	111
+kh_dun01,6,133,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh5	111
+kh_dun01,6,60,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh6	111
+kh_dun01,6,30,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh7	111
+kh_dun01,6,18,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh8	111
+kh_dun01,235,70,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh9	111
+kh_dun01,235,92,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh10	111
+kh_dun01,235,114,0	duplicate(HeavyDoorKHQ2)	Heavy Door#kh11	111
 
 //----------------------------------------------------------------------------
 // Beautiful Lady and Beautiful Lady copies.
 //----------------------------------------------------------------------------
-kh_school,119,149,4	script	Beautiful lady::BeatifulLadyKHQ1	894,{
+kh_school,119,149,4	script	Beautiful Lady#kh1::BeatifulLadyKHQ1	894,{
 	cutin "kh_ellisia",2;
 	if (KielHyreQuest < 40) {
 		mes "[Allysia]";
@@ -3691,15 +3449,9 @@ kh_school,119,149,4	script	Beautiful lady::BeatifulLadyKHQ1	894,{
 		mes "Is there anything that you";
 		mes "can present to me as proof?";
 		next;
-
-		switch(select("Yellow Keycard","Blue Keycard","Golden Key","Carved Button","...?")) {
-
-		case 1:
+		switch(select("Yellow Keycard:Blue Keycard:Golden Key:Carved Button:...?")) {
+		default:
 			break;
-
-		case 2:
-			break;
-
 		case 3:
 			mes "[Allysia]";
 			mes "Ah, isn't this the";
@@ -3712,21 +3464,19 @@ kh_school,119,149,4	script	Beautiful lady::BeatifulLadyKHQ1	894,{
 			cutin "",255;
 			warp "kh_school",120,180;
 			end;
-
 		case 4:
 			mes "[Allysia]";
 			mes "Th-that's Kiehl's";
-			mes "heal! Did he send you";
+			mes "seal! Did he send you";
 			mes "here to get me?! I'm";
-			mes "not taking any changes!";
+			mes "not taking any chances!";
 			close2;
 			cutin "",255;
-			monster "kh_school",117,144,"Constant",1745,1;
-			monster "kh_school",117,144,"Constant",1745,1;
-			monster "kh_school",117,144,"Constant",1745,1;
-			monster "kh_school",117,144,"Constant",1745,1;
+			monster "kh_school",117,144,"Bomb",1745,1;
+			monster "kh_school",117,144,"Bomb",1745,1;
+			monster "kh_school",117,144,"Bomb",1745,1;
+			monster "kh_school",117,144,"Bomb",1745,1;
 			end;
-
 		case 5:
 			mes "[Allysia]";
 			mes "......";
@@ -3735,9 +3485,7 @@ kh_school,119,149,4	script	Beautiful lady::BeatifulLadyKHQ1	894,{
 			close2;
 			cutin "",255;
 			end;
-
 		}
-
 		mes "[Allysia]";
 		mes "Hm? This doesn't prove";
 		mes "that Elly really trusts you...";
@@ -3745,7 +3493,6 @@ kh_school,119,149,4	script	Beautiful lady::BeatifulLadyKHQ1	894,{
 		cutin "",255;
 		end;
 	}
-
 	else if (KielHyreQuest >= 40) {
 		mes "[Allysia]";
 		mes "Please follow me.";
@@ -3757,31 +3504,37 @@ kh_school,119,149,4	script	Beautiful lady::BeatifulLadyKHQ1	894,{
 }
 
 
-kh_school,117,149,4	script	Beautiful lady::BeatifulLadyKHQ2	894,{
+kh_school,117,149,4	script	Beautiful lady#kh2::BeatifulLadyKHQ2	894,{
 	end;
 }
-
-kh_school,118,149,4	duplicate(BeatifulLadyKHQ2)	Beautiful lady::BeatifulLadyKHQ3	894
-
-kh_school,120,149,4	duplicate(BeatifulLadyKHQ2)	Beautiful lady::BeatifulLadyKHQ4	894
-
-kh_school,121,149,4	duplicate(BeatifulLadyKHQ1)	Beautiful lady::BeatifulLadyKHQ5	894
+kh_school,118,149,4	duplicate(BeatifulLadyKHQ2)	Beautiful lady#kh3	894
+kh_school,120,149,4	duplicate(BeatifulLadyKHQ2)	Beautiful lady#kh4	894
+kh_school,121,149,4	duplicate(BeatifulLadyKHQ1)	Beautiful lady#kh5	894
 
 //----------------------------------------------------------------------------
 // Beautiful Lady "Allysia"
 //----------------------------------------------------------------------------
-kh_school,122,186,4	script	Beautiful lady	894,{
+kh_school,122,186,4	script	Beautiful Lady#kh6	894,{
 	if (checkweight(7496,1) == 0) {
-		mes "^3355FF- Wait!! -";
-		mes "- You are carrying too many items";
-		mes "- and are unable to accept any more. -";
-		mes "- Please make some space avaliable";
-		mes "- in your inventory before returning. -^000000";
+		mes "^3355FFJust a second...";
+		mes "You're carrying too";
+		mes "many items with you";
+		mes "right now, so you'll";
+		mes "need to free up more";
+		mes "Inventory space first...^000000";
 		close;
 	}
-
 	cutin "kh_ellisia",2;
-	if (KielHyreQuest <= 38) {
+	if (KielHyreQuest > 38) {
+		mes "[??????]";
+		mes "This is private property.";
+		mes "Please leave immediately!";
+		close2;
+		cutin "kh_ellisia",255;
+		warp "yuno_fild08",73,172;
+		end;
+	}
+	else if (KielHyreQuest <= 38) {
 		mes "[Allysia]";
 		mes "Friend of prototype Elly,";
 		mes "I welcome you. As you may";
@@ -3795,9 +3548,7 @@ kh_school,122,186,4	script	Beautiful lady	894,{
 		mes "and rescue him as soon";
 		mes "as you possibly can!";
 		next;
-
-		switch(select("What is this factory?","What happened to ^FF0000Kiel Hyre^000000?")) {
-
+		switch(select("What is this factory?:What happened to ^FF0000Kiel Hyre^000000?")) {
 		case 1:
 			mes "[Allysia]";
 			mes "This factory is part of";
@@ -3815,7 +3566,6 @@ kh_school,122,186,4	script	Beautiful lady	894,{
 			mes "can handle tasks that are too";
 			mes "dangerous or difficult for humans.";
 			break;
-
 		case 2:
 			mes "[Allysia]";
 			mes "^3355FFKiehl^000000 has proceeded to";
@@ -3840,18 +3590,14 @@ kh_school,122,186,4	script	Beautiful lady	894,{
 			mes "inside this factory. If you";
 			mes "locate Kiel Hyre, please";
 			mes "let me know right away.";
-			getitem 7496,1; //Red_Keycard
+			getitem 7496,1; //Red_Key_Card
 			set KielHyreQuest,40;
 			break;
-
 		}
-
 		close2;
 		cutin "",255;
 		end;
-
 	}
-
 	else if (KielHyreQuest == 40) {
 		mes "[Allysia]";
 		mes "I can still detect";
@@ -3865,7 +3611,6 @@ kh_school,122,186,4	script	Beautiful lady	894,{
 		warp "kh_dun01",22,216;
 		end;
 	}
-
 	else if (KielHyreQuest == 42) {
 		mes "[Allysia]";
 		mes "Have you already";
@@ -3890,12 +3635,11 @@ kh_school,122,186,4	script	Beautiful lady	894,{
 		mes "Kiel Hyre's orders, and";
 		mes "must carry them out...";
 		set KielHyreQuest,44;
-		delitem 7497,1; //Metal_Fragment
+		delitem 7497,1; //Steel_Piece
 		close2;
 		cutin "",255;
 		end;
 	}
-
 	else if (KielHyreQuest == 44) {
 		mes "[Allysia]";
 		mes "Alright, I have a mission";
@@ -3911,9 +3655,9 @@ kh_school,122,186,4	script	Beautiful lady	894,{
 		mes "Hyre Mansion in Lighthalzen.";
 		mes "Present the Golden Key to";
 		mes "be admitted to the premises.";
-		delitem 7492,1; //Yellow_Keycard
-		delitem 7495,1; //Blue_Keycard
-		delitem 7496,1; //Red_Keycard
+		delitem 7492,1; //Yellow_Key_Card
+		delitem 7495,1; //Blue_Key_Card
+		delitem 7496,1; //Red_Key_Card
 		set KielHyreQuest,46;
 		next;
 		mes "[Allysia]";
@@ -3928,7 +3672,6 @@ kh_school,122,186,4	script	Beautiful lady	894,{
 		cutin "",255;
 		end;
 	}
-	
 	else if (KielHyreQuest >= 44) {
 		mes "[Allysia]";
 		mes "I understand that this";
@@ -3942,13 +3685,12 @@ kh_school,122,186,4	script	Beautiful lady	894,{
 		cutin "",255;
 		end;
 	}
-	
 }
 
 //----------------------------------------------------------------------------
 // Signboard (another useless NPC?)
 //----------------------------------------------------------------------------
-kh_dun01,163,223,4	script	Signboard	857,{
+kh_dun01,163,223,4	script	Signboard#kh	857,{
 	mes "[Notice]";
 	mes "Cute Pets are prohibited";
 	mes "in this area. (Cute Pets that";
@@ -3961,29 +3703,26 @@ kh_dun01,163,223,4	script	Signboard	857,{
 //----------------------------------------------------------------------------
 // Mechanical Devices for accessing restricted area
 //----------------------------------------------------------------------------
-kh_dun01,166,223,0	script	Mechanical Device::KHKeyardReader	111,{
+kh_dun01,166,223,0	script	Mechanical Device#kh::KHKeyardReader	111,{
 	if ((KielHyreQuest <= 38) || (KielHyreQuest >= 44)) {
-		mes "^3355FFYou encounter^000000";
-		mes "^3355FFa mechanical device.^000000";
-		mes "^3355FFIt looks like it can be^000000";
-		mes "^3355FFoperated by inserting the^000000";
-		mes "^3355FFcorrect keycard into the slot.^000000";
+		mes "^3355FFYou encounter";
+		mes "a mechanical device.";
+		mes "It looks like it can be";
+		mes "operated by inserting the";
+		mes "correct keycard into the slot.^000000";
 		close;
 	}
-
 	else if ((KielHyreQuest == 40) && (countitem(7496) >= 1)) {
-		mes "^3355FFYou encounter^000000";
-		mes "^3355FFa mechanical device.^000000";
-		mes "^3355FFIt looks like it can be^000000";
-		mes "^3355FFoperated by inserting the^000000";
-		mes "^3355FFcorrect keycard into the slot.^000000";
+		mes "^3355FFYou encounter";
+		mes "a mechanical device.";
+		mes "It looks like it can be";
+		mes "operated by inserting the";
+		mes "correct keycard into the slot.^000000";
 		next;
-
-
-		input @KHInput$;
-		if (@KHInput$ == "Red Keycard") {
-			mes "^3355FFThe door opens once^000000";
-			mes "^3355FFyou insert the Red Keycard..^000000";
+		input .@KHInput$;
+		if (.@KHInput$ == "Red Keycard") {
+			mes "^3355FFThe door opens once";
+			mes "you insert the Red Keycard.^000000";
 			close2;
 			warp "kh_dun01",170,227;
 			end;
@@ -3992,9 +3731,7 @@ kh_dun01,166,223,0	script	Mechanical Device::KHKeyardReader	111,{
 			mes "^3355FFNothing happened.^000000";
 			close;
 		}
-
 	}
-
 }
 
 kh_dun01,162,206,0	duplicate(KHKeyardReader)	Mechanical Device	111
@@ -4017,27 +3754,28 @@ kh_dun01,162,206,0	duplicate(KHKeyardReader)	Mechanical Device	111
 //----------------------------------------------------------------------------
 // Kiel Hyre - OnTouch
 //----------------------------------------------------------------------------
-kh_dun01,224,233,0	script	Kiel_Hyre_Door	-1,5,5,{
+kh_dun01,224,233,0	script	Factory B Area Door	-1,5,5,{
+//OnTouch2:
 OnTouch:
 	if (KielHyreQuest == 40) {
 		if (checkweight(7497,1) == 0) {
-			mes "^3355FF- Wait!! -";
-			mes "- You are carrying too many items";
-			mes "- and are unable to accept any more. -";
-			mes "- Please make some space avaliable";
-			mes "- in your inventory before returning. -^000000";
+			mes "^3355FFJust a second...";
+			mes "You're carrying too";
+			mes "many items with you";
+			mes "right now, so you'll";
+			mes "need to free up more";
+			mes "Inventory space first...^000000";
 			close;
 		}
-
-		mes "^3355FFYou can faintly hear^000000";
-		mes "^3355FFa voice from the other^000000";
-		mes "^3355FFside of this door.^000000";
+		mes "^3355FFYou can faintly hear";
+		mes "a voice from the other";
+		mes "side of this door.^000000";
 		next;
 		mes "[????]";
-		mes "...Kiehl...";
-		mes "...How dare you...!";
+		mes "^333333...Kiehl...";
+		mes "...How dare you...!^000000";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+name_kh+"]";
 		mes "Mister Kiel Hyre?";
 		mes "Is that you in there?";
 		next;
@@ -4045,52 +3783,50 @@ OnTouch:
 		mes "Wh-who's there?";
 		mes "Identify yourself!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+name_kh+"]";
 		mes "I'm... I'm...";
 		next;
-		mes "You explain your story^000000";
-		mes "to the voice behind the^000000";
-		mes "door, and tell him what^000000";
+		mes "^3355FFYou explain your story";
+		mes "to the voice behind the";
+		mes "door, and tell him what";
 		mes "happened to Elly and Allysia.^000000";
 		next;
 		mes "[Kiel Hyre]";
-		mes "...Yes... It's me.";
+		mes "^333333...Yes... It's me.";
 		mes "I'm Kiel Hyre, trapped";
 		mes "in here. He went so far";
 		mes "as to modify Elly, eh?";
-		mes "..................";
+		mes "...............................^000000";
 		next;
 		mes "[Kiel Hyre]";
-		mes "Hurry, take this";
+		mes "^333333Hurry, take this";
 		mes "module to Allysia!";
 		mes "She'll know what to do";
 		mes "with it. If you're really";
 		mes "helping us, then she'll have";
-		mes "some instructions for you too.";
-		next;
-		mes "^3355FFKiel Hyre slides^000000";
-		mes "^3355FFa strange metal^000000";
-		mes "^3355FFfragment through^000000";
-		mes "^3355FFthe gap between the^000000";
-		mes "^3355FFdoor and the floor.^000000";
-		getitem 7497,1; //Metal_Fragment
+		mes "some instructions for you too.^000000 ";
+		next;
+		mes "^3355FFKiel Hyre slid";
+		mes "a strange metal";
+		mes "fragment through";
+		mes "the gap between the";
+		mes "door and the floor.^000000";
+		getitem 7497,1; //Steel_Piece
 		set KielHyreQuest,42;
 		close;
 	}
 
-
 	else if (KielHyreQuest >= 42) {
 		mes "[Kiel Hyre]";
 		mes "......";
 		close;
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Robot Factory Second Floor Entrances
 //----------------------------------------------------------------------------
-kh_dun01,44,203,0	script	Entrance Device#KHEntry1::KHAccess	111,{
+kh_dun01,44,203,0	script	Entrance Device#khd2::KHAccess	111,{
 	if (countitem(7509) < 1) {
 		mes "^3355FFYou encounter";
 		mes "a mechanical device.";
@@ -4099,7 +3835,6 @@ kh_dun01,44,203,0	script	Entrance Device#KHEntry1::KHAccess	111,{
 		mes "correct keycard into the slot.^000000";
 		close;
 	}
-
 	else {
 		mes "^3355FFYou encounter";
 		mes "a mechanical device.";
@@ -4107,9 +3842,8 @@ kh_dun01,44,203,0	script	Entrance Device#KHEntry1::KHAccess	111,{
 		mes "operated by inserting the";
 		mes "correct keycard into the slot.^000000";
 		next;
-
-		input @KHInput$;
-		if (@KHInput$ == "Luxurious Keycard") {
+		input .@KHInput$;
+		if (.@KHInput$ == "Luxurious Keycard") {
 			mes "^3355FFAs you insert the";
 			mes "Luxurious Keycard";
 			mes "into the keycard slot,";
@@ -4117,24 +3851,18 @@ kh_dun01,44,203,0	script	Entrance Device#KHEntry1::KHAccess	111,{
 			mes "to reveal a long flight";
 			mes "of descending stairs.^000000";
 			next;
-
-			switch(select("Descend Stairs","Cancel")) {
-
+			switch(select("Descend Stairs:Cancel")) {
 			case 1:
 				warp "kh_dun02",41,198;
 				end;
-
 			case 2:
 				mes "^3355FFIt looks like this door";
 				mes "has automatically closed";
 				mes "after the preprogrammed";
 				mes "time limit has elapsed.^000000";
 				close;
-
 			}
-
 		}
-
 		else {
 			mes "^3355FFYou try to push the";
 			mes "door open with all";
@@ -4142,12 +3870,10 @@ kh_dun01,44,203,0	script	Entrance Device#KHEntry1::KHAccess	111,{
 			mes "to make it budge.^000000";
 			close;
 		}
-
 	}
-
 }
 
-kh_dun01,36,195,0	duplicate(KHAccess)	Entrance Device#KHEntry2	111
+kh_dun01,36,195,0	duplicate(KHAccess)	Entrance Device#khd1	111
 
 //============================================================================
 
@@ -4158,7 +3884,7 @@ kh_dun01,36,195,0	duplicate(KHAccess)	Entrance Device#KHEntry2	111
 //----------------------------------------------------------------------------
 // Kiel's Steward
 //----------------------------------------------------------------------------
-kh_mansion,78,55,5	script	Steward::StewardKHQ1	109,{
+kh_mansion,78,55,5	script	Steward#kh	109,{
 	if (KielHyreQuest < 46) {
 		mes "[Steward]";
 		mes "This is a private residence,";
@@ -4167,7 +3893,6 @@ kh_mansion,78,55,5	script	Steward::StewardKHQ1	109,{
 		warp "lighthalzen",188,201;
 		end;
 	}
-
 	if ((KielHyreQuest >= 46) && (KielHyreQuest < 50)) {
 		mes "[Steward]";
 		mes "Greetings.";
@@ -4175,9 +3900,7 @@ kh_mansion,78,55,5	script	Steward::StewardKHQ1	109,{
 		mes "by the master of";
 		mes "this mansion?";
 		next;
-
-		switch(select("Present Golden Key","????")) {
-
+		switch(select("Present Golden Key:????")) {
 		case 1:
 			mes "[Steward]";
 			mes "Ah, Master "+strcharinfo(0)+".";
@@ -4186,7 +3909,6 @@ kh_mansion,78,55,5	script	Steward::StewardKHQ1	109,{
 			close2;
 			warp "kh_mansion",21,14;
 			end;
-
 		case 2:
 			mes "[Steward]";
 			mes "If you have not been";
@@ -4197,13 +3919,9 @@ kh_mansion,78,55,5	script	Steward::StewardKHQ1	109,{
 			close2;
 			warp "lightalzen",188,201;
 			end;
-
 		}
-
 	}
-
-	if ((KielHyreQuest >= 50) && (KielHyreQuest < 64)) {
-		L_SeeKielHyre:
+	if ((KielHyreQuest >= 50) && (KielHyreQuest < 64) || (KielHyreQuest >= 70)) {
 		mes "[Steward]";
 		mes "Ah, Master "+strcharinfo(0)+".";
 		mes "It is a pleasure to";
@@ -4211,9 +3929,7 @@ kh_mansion,78,55,5	script	Steward::StewardKHQ1	109,{
 		mes "once again. Would you";
 		mes "like to see my master?";
 		next;
-
-		switch(select("Yes","No")) {
-
+		switch(select("Yes:No")) {
 		case 1:
 			mes "[Steward]";
 			mes "Very well.";
@@ -4221,18 +3937,14 @@ kh_mansion,78,55,5	script	Steward::StewardKHQ1	109,{
 			close2;
 			warp "kh_mansion",21,14;
 			end;
-
 		case 2:
 			mes "[Steward]";
 			mes "Very well.";
 			mes "Please make";
 			mes "yourself at home.";
 			close;
-
 		}
-
 	}
-
 	if ((KielHyreQuest == 52) || (KielHyreQuest == 54) || (KielHyreQuest >= 64) && (KielHyreQuest <= 70)) {
 		mes "[Steward]";
 		mes "Ah, Master "+strcharinfo(0)+".";
@@ -4241,9 +3953,7 @@ kh_mansion,78,55,5	script	Steward::StewardKHQ1	109,{
 		mes "once again. Would you";
 		mes "like to see my master, or...?";
 		next;
-
-		switch(select("^FF0000Kiel Hyre^000000","^3355FFMitchell^000000")) {
-
+		switch(select("^FF0000Kiel Hyre^000000:^3355FFMitchell^000000")) {
 		case 1:
 			mes "[Steward]";
 			mes "Very well.";
@@ -4251,7 +3961,6 @@ kh_mansion,78,55,5	script	Steward::StewardKHQ1	109,{
 			close2;
 			warp "kh_mansion",21,14;
 			end;
-
 		case 2:
 			mes "[Steward]";
 			mes "Oh...? You must.";
@@ -4270,23 +3979,15 @@ kh_mansion,78,55,5	script	Steward::StewardKHQ1	109,{
 			close2;
 			warp "kh_mansion",20,87;
 			end;
-
 		}
-
-	}
-
-	if (KielHyreQuest >= 70) {
-		goto L_SeeKielHyre;
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Kiel Hyre
 //----------------------------------------------------------------------------
-kh_mansion,22,28,4	script	Kiel Hyre	903,{
-	set @now_weight,MaxWeight-Weight;
-	if (@now_weight < 2000) {
+kh_mansion,22,28,4	script	Kiel Hyre#kh	903,{
+	if (checkweight(908,200) == 0) {
 		mes "^3355FFJust a second...";
 		mes "You're carrying too";
 		mes "many items with you";
@@ -4296,10 +3997,12 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		close;
 	}
 
-	cutin "kh_kyel02",2;
+	cutin "kh_kyel01",2;
 	if (KielHyreQuest < 46) {
 		mes "[Kiel Hyre]";
 		mes ".........";
+		mes ".........";
+		mes "............";
 		close2;
 		cutin "",255;
 		end;
@@ -4314,106 +4017,94 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		mes "questions to ask me, so I'll";
 		mes "do my best to give you answers.";
 		next;
-
-		L_Menu:
-
-		switch(select("Robots?","^3355FFKiehl^000000?","^FF0000Elly^000000's button?")) {
-
-		case 1:
-			mes "[Kiel Hyre]";
-			mes "I've been researching";
-			mes "robotics for thirty-two";
-			mes "years now. I'm proud to";
-			mes "say that I've succeeded";
-			mes "where the great Sage";
-			mes "Varmundt did not.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "It's been my dream to";
-			mes "develop humanoid robots";
-			mes "from humans. Those Guardians";
-			mes "might be robots too, but they";
-			mes "don't operate using free will.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "If you'd like to know more";
-			mes "of the specifics concerning";
-			mes "robotics, why don't you speak";
-			mes "with ^3355FFAllysia^000000? She can explain";
-			mes "everything much more succinctly";
-			mes "than I can. I tend to ramble...";
-			if (@KHQ1Read < 1) { set @KHQ1Read,1; }
-			break;
-
-		case 2:
-			mes "[Kiel Hyre]";
-			mes "^3355FFKiehl^000000 is my only son,";
-			mes "but the love of my life";
-			mes "died after giving birth to";
-			mes "him. I'll admit that he's";
-			mes "a genius in mechanical";
-			mes "design and development.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "He's largely responsible";
-			mes "for the creation of Third";
-			mes "Generation robots like Elly.";
-			mes "Unfortunately, he's trying to";
-			mes "modify his creations for";
-			mes "some sinister purpose.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "I tried to stop him,";
-			mes "but I ended up getting";
-			mes "locked inside the factory.";
-			mes "I don't know why he wants";
-			mes "to do this. I still have";
-			mes "absolutely no clue...";
-			if (@KHQ2Read < 1) { set @KHQ2Read,1; }
-			break;
-
-		case 3:
-			mes "[Kiel Hyre]";
-			mes "That button Elly was";
-			mes "holding has ^3355FFKiehl's emblem^000000";
-			mes "engraved on it. Ah, and that";
-			mes "man in black menacing the";
-			mes "students? That was probably";
-			mes "^3355FFKaiser^000000, Kiehl's bodyguard.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "Kaiser...";
-			mes "I don't know";
-			mes "anything about him.";
-			mes "I've never even seen";
-			mes "his face! Kiehl just hired";
-			mes "him without letting me know...";
-			if (@KHQ3Read < 1) { set @KHQ3Read,1; }
-			break;
-
-		}
-
-		if ((@KHQ1Read == 1) && (@KHQ2Read == 1) && (@KHQ3Read == 1)) {
-			next;
-			mes "[Kiel Hyre]";
-			mes "If you don't have";
-			mes "anymore questions for me,";
-			mes "then would you please";
-			mes "let me rest?? I'm still not";
-			mes "feeling well from the time";
-			mes "I was locked up in the factory.";
-			delitem 7493,1; //Golden_Key
-			delitem 7494,1; //Exquisite_Button
-			set KielHyreQuest,48;
-		}
-
-		else { 
-			next;
-			goto L_Menu; 
+		while(0) {
+			switch(select("Robots?:^3355FFKiehl^000000?:^FF0000Elly^000000's button?")) {
+			case 1:
+				mes "[Kiel Hyre]";
+				mes "I've been researching";
+				mes "robotics for thirty-two";
+				mes "years now. I'm proud to";
+				mes "say that I've succeeded";
+				mes "where the great Sage";
+				mes "Varmundt did not.";
+				next;
+				mes "[Kiel Hyre]";
+				mes "It's been my dream to";
+				mes "develop humanoid robots";
+				mes "from humans. Those Guardians";
+				mes "might be robots too, but they";
+				mes "don't operate using free will.";
+				next;
+				mes "[Kiel Hyre]";
+				mes "If you'd like to know more";
+				mes "of the specifics concerning";
+				mes "robotics, why don't you speak";
+				mes "with ^3355FFAllysia^000000? She can explain";
+				mes "everything much more succinctly";
+				mes "than I can. I tend to ramble...";
+				set .@KHQRead,.@KHQRead+1;
+				break;
+			case 2:
+				mes "[Kiel Hyre]";
+				mes "^3355FFKiehl^000000 is my only son,";
+				mes "but the love of my life";
+				mes "died after giving birth to";
+				mes "him. I'll admit that he's";
+				mes "a genius in mechanical";
+				mes "design and development.";
+				next;
+				mes "[Kiel Hyre]";
+				mes "He's largely responsible";
+				mes "for the creation of Third";
+				mes "Generation robots like Elly.";
+				mes "Unfortunately, he's trying to";
+				mes "modify his creations for";
+				mes "some sinister purpose.";
+				next;
+				mes "[Kiel Hyre]";
+				mes "I tried to stop him,";
+				mes "but I ended up getting";
+				mes "locked inside the factory.";
+				mes "I don't know why he wants";
+				mes "to do this. I still have";
+				mes "absolutely no clue...";
+				set .@KHQRead,.@KHQRead+1;
+				break;
+			case 3:
+				mes "[Kiel Hyre]";
+				mes "That button Elly was";
+				mes "holding has ^3355FFKiehl's emblem^000000";
+				mes "engraved on it. Ah, and that";
+				mes "man in black menacing the";
+				mes "students? That was probably";
+				mes "^3355FFKaiser^000000, Kiehl's bodyguard.";
+				next;
+				mes "[Kiel Hyre]";
+				mes "Kaiser...";
+				mes "I don't know";
+				mes "anything about him.";
+				mes "I've never even seen";
+				mes "his face! Kiehl just hired";
+				mes "him without letting me know...";
+				set .@KHQRead,.@KHQRead+1;
+				break;
+			}
+			if (.@KHQRead == 3) {
+				next;
+				mes "[Kiel Hyre]";
+				mes "If you don't have";
+				mes "anymore questions for me,";
+				mes "then would you please";
+				mes "let me rest?? I'm still not";
+				mes "feeling well from the time";
+				mes "I was locked up in the factory.";
+				delitem 7493,1; //Golden_Key
+				delitem 7494,1; //Kiel_Button
+				set KielHyreQuest,48;
+				break;
+			}
 		}
-
 	}
-
 	else if (KielHyreQuest == 48) {
 		mes "[Kiel Hyre]";
 		mes "Ah, I almost forgot.";
@@ -4424,7 +4115,6 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		getitem 12105,1; //Taming_Gift_Set
 		getexp 700000,0;
 	}
-
 	else if ((KielHyreQuest >= 50) && (KielHyreQuest < 64)) {
 		mes "[Kiel Hyre]";
 		mes "If you don't have";
@@ -4434,7 +4124,6 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		mes "feeling well from the time";
 		mes "I was locked up in the factory.";
 	}
-
 	else if (KielHyreQuest == 64) {
 		cutin "kh_kyel01",2;
 		mes "[Kiel Hyre]";
@@ -4449,7 +4138,6 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		mes "but I might have some";
 		mes "questions soon enough.";
 	}
-
 	else if (KielHyreQuest == 68) {
 		cutin "kh_kyel02",2;
 		mes "[Kiel Hyre]";
@@ -4457,356 +4145,324 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		mes "It's you. So how can";
 		mes "I help you today?";
 		next;
-
-		switch(select("About ^3355FFAllysia^000000...")) {
-
-		case 1:
-			mes "["+strcharinfo(0)+"]";
-			mes "You know, I was looking";
-			mes "through this deserted house";
-			mes "in Juno, and discovered";
-			mes "an old portrait of a woman";
-			mes "that looks just like Allysia.";
-			next;
-			cutin "kh_kyel02",2;
-			mes "[Kiel Hyre]";
-			mes "Oh...";
-			mes "Is that all?";
-			mes "I thought you had";
-			mes "a robotics question.";
-			next;
-			cutin "kh_Kyel03",2;
-			mes "[Kiel Hyre]";
-			mes "Anyway, that's a";
-			mes "strange coincidence.";
-			mes "Well, I suppose it's";
-			mes "not so strange to find";
-			mes "look-a-likes for other people...";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "I don't think it's just";
-			mes "a coincidence. The woman";
-			mes "in that thirty year old portrait";
-			mes "was also named Allysia, and she";
-			mes "worked at Orsimier street";
-			mes "in Juno. Does that ring a bell?";
-			next;
-			cutin "kh_kyel02",2;
-			mes "[Kiel Hyre]";
-			mes "......";
-			mes ".........";
-			mes "............";
-			next;
-			cutin "kh_kyel01",2;
-			mes "["+strcharinfo(0)+"]";
-			mes "Then I thought that this";
-			mes "Allysia must have been the";
-			mes "woman that you loved, and";
-			mes "that you based your robot's";
-			mes "apperance on her.";
-			next;
-			cutin "kh_kyel02",2;
-			mes "[Kiel Hyre]";
-			mes "............";
-			next;
-			cutin "kh_kyel01",2;
-			mes "["+strcharinfo(0)+"]";
-			mes "I think this is what happened:";
-			mes "when you were a young, poor";
-			mes "man, you fell in love with";
-			mes "Allysia. However, she was";
-			mes "in love with Rosimier, who";
-			mes "was rich and powerful.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "However, Rosimier was";
-			mes "betrothed to some other";
-			mes "woman, and he ended up";
-			mes "marrying his fiancee, thus";
-			mes "breaking Allysia's heart.";
-			next;
-			mes "["+strcharinfo(0)+"]";
-			mes "Feeling betrayed, her";
-			mes "heart broken, Allysia jumped";
-			mes "into a river. Then, you decided";
-			mes "to get revenge on Rosimier, so";
-			mes "you ended up joining";
-			mes "Rekenber Corporation!";
-			next;
-			cutin "kh_Kyel03",2;
-			mes "[Kiel Hyre]";
-			mes "Hahahahahahaha!";
-			mes "Oh, what an imagination~";
-			mes "That's very ridiculous...";
-			mes "Though, I admit, maybe";
-			mes "I did design Allysia after";
-			mes "seeing that woman long ago.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "I'd almost forgotten";
-			mes "about her! I think we";
-			mes "were friends... Though,";
-			mes "where did you get the idea";
-			mes "that I might have";
-			mes "been in love with her?";
-			next;
-
-			switch(select("Reveal Kiel's Portrait from Hut")) {
-
-			case 1:
-				cutin "kh_kyel02",2;
-				mes "[Kiel Hyre]";
-				mes "Wh-what...";
-				mes "How did...";
-				mes "Where did you...?";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "Kiel Hyre, I found this";
-				mes "portrait of you as a young";
-
-				mes "man from the house of the";
-				mes "man that bought Allysia's ring.";
-				mes "I even spoke to the fisherman";
-				mes "that discovered Allysia's body.";
-				next;
-				mes "["+strcharinfo(0)+"]";
-				mes "You paid an awful lot";
-				mes "of money to buy Allysia's";
-				mes "ring. How can you not tell";
-				mes "me that you didn't love her?";
-				next;
-				cutin "kh_Kyel03",2;
-				mes "[Kiel Hyre]";
-				mes "*Sigh...*";
-				mes "You got me, you got me.";
-				mes "I didn't want you to learn";
-				mes "the truth. You are correct.";
-				mes "I loved Allysia, and designed";
-				mes "my robot to look just like her.";
-				next;
-				mes "[Kiel Hyre]";
-				mes "I could never forget her.";
-				mes "Ever. But I would never";
-				mes "do anything to harm the";
-				mes "Rosimiers! I'm a scientist!";
-				mes "I hated him when I was young,";
-				mes "but things are different now!";
-				next;
-				mes "[Kiel Hyre]";
-				mes "I shed no tears when the";
-				mes "Rosimiers fell, but I wasn't";
-				mes "responsible. Besides, I didn't";
-				mes "have the resources or the";
-				mes "capability to cause it...";
-				next;
-				cutin "kh_kyel02",2;
-				mes "["+strcharinfo(0)+"]";
-				mes "I'm afraid that the";
-				mes "evidence shows otherwise.";
-				next;
-
-				switch(select("Reveal Portrait of Rosimiers")) {
-
-				case 1:
-					mes "["+strcharinfo(0)+"]";
-					mes "Take a good look";
-					mes "at this portrait that";
-					mes "I found at the Rosimiers'";
-					mes "old house. Do you see";
-					mes "anything... incriminating?";
-					next;
-					cutin "kh_Kyel03",2;
-					mes "[Kiel Hyre]";
-					mes "Aside from that";
-					mes "James Rosimier, you";
-					mes "mean? No! I don't see";
-					mes "anything wrong with";
-					mes "this picture at all.";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "Take a good look";
-					mes "at the pocketwatch";
-					mes "in the portrait. That's";
-					mes "the pocketwatch you";
-					mes "wear today, isn't it?";
-					next;
-					cutin "kh_kyel02",2;
-					mes "[Kiel Hyre]";
-					mes "...!!!";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "You might not have caused";
-					mes "the downfall of the Rosimiers";
-					mes "yourself, but with the aid of";
-					mes "the Rekenber Corporation, I'd";
-					mes "say it was entirely possible!";
-					next;
-					cutin "kh_Kyel03",2; 
-					mes "[Kiel Hyre]";
-					mes "Well played, adventurer.";
-					mes "Well played. I don't regret";
-					mes "what I did: they killed my";
-					mes "Allysia! If James didn't betray";
-					mes "her, if only he didn't drive";
-					mes "her to commit suicide...";
-					next;
-					mes "["+strcharinfo(0)+"]";
-					mes "That's where you're wrong!";
-					mes "Allysia was killed, she didn't";
-					mes "commit suicide. Take a good";
-					mes "look at this note right here!";
-					next;
-					mes "[Kiel Hyre]";
-					mes "What?!";
-					next;
-
-					switch(select("Show James's Note")) {
-
-					case 1:
-						mes "[Kiel Hyre]";
-						mes "What does this prove?";
-						mes "This doesn't show that";
-						mes "James didn't betray Allysia.";
-						mes "How does this change anything?";
-						mes "She's dead, nothing I can do";
-						mes "will bring her back to me!";
-						next;
-						mes "["+strcharinfo(0)+"]";
-						mes "I never said James didn't";
-						mes "betray her. Look at the date";
-						mes "on the note. James made plans";
-						mes "to run away with her on August";
-						mes "20th. However, her body was";
-						mes "found on the same day.";
-						next;
-						mes "["+strcharinfo(0)+"]";
-						mes "Ergo, Allysia must have";
-						mes "died on August 19th. If she";
-						mes "was planning to run away with";
-						mes "her love on the next day, then";
-						mes "she had no reason to kill herself!";
-						next;
-						mes "[Kiel Hyre]";
-						mes "No, that's not right!";
-						mes "She probably couldn't";
-						mes "trust me! She must have";
-						mes "realized she was nothing";
-						mes "but another toy to him!";
-						next;
-						mes "["+strcharinfo(0)+"]";
-						mes "Oh yeah? I say she jumped";
-						mes "into the river because you";
-						mes "met her on that day. Now,";
-						mes "take a good look at this!";
-						next;
-
-						switch(select("Show K.H.'s note")) {
-
-						case 1:
-							mes "["+strcharinfo(0)+"]";
-							mes "This note was  written by";
-							mes "a man with your initials,";
-							mes "K.H. These initials were also";
-							mes "signed on her portrait. You";
-							mes "must have written this note:";
-							mes "there's too many coincidences!";
-							next;
-							mes "["+strcharinfo(0)+"]";
-							mes "According to this note,";
-							mes "you told Allysia that you";
-							mes "wanted to see her again";
-							mes "at the place you first met.";
-							mes "I think you did see her again...";
-							mes "on August 19th, the day she died!";
-							next;
-							mes "["+strcharinfo(0)+"]";
-							mes "I'm assuming the place you";
-							mes "two first met was near the";
-							mes "river. No more of your lies:";
-							mes "well me what really happened!";
-							next;
-							cutin "kh_kyel02",2;
-							mes "[Kiel Hyre]";
-							mes "............";
-							mes ".........";
-							mes "......";
-							next;
-							cutin "kh_Kyel03",2;
-							mes "[Kiel Hyre]";
-							mes "Hah... Ha ha ha...";
-							mes "Yes... That's right...";
-							mes "That horrible night.";
-							mes "I remember it well...";
-							mes ".....................";
-							next;
-							cutin "kh_kyel02",2;
-							mes "[Kiel Hyre]";
-							mes "That night, when she came";
-							mes "to the river to meet me as";
-							mes "I had asked, I begged her to";
-							mes "run away with me, instead";
-							mes "of waiting for that James.";
-							next;
-							mes "[Kiel Hyre]";
-							mes "She insisted that James";
-							mes "never betrayed her, and he";
-							mes "promised to take her away";
-							mes "with him the next day. Can";
-							mes "you imagine how that made";
-							mes "me feel? I was nothing to her.";
-							next;
-							mes "[Kiel Hyre]";
-							mes "My feelings didn't matter to";
-							mes "her at all! She kept fidgeting";
-							mes "with that ring...I lost control";
-							mes "and tried to take that damned";
-							mes "thing away from her, and";
-							mes "throw it into the river...";
-							next;
-							mes "[Kiel Hyre]";
-							mes "But you know what?";
-							mes "She struggled, she actually";
-							mes "fought me! It was just a small";
-							mes "fight, but then, before I knew";
-							mes "it, the ground underneath us";
-							mes "collapsed and... the rains...";
-							next;
-
-							switch(select(".........")) {
-
-							case 1:
-								mes "[Kiel Hyre]";
-								mes "I'm not sure what it";
-								mes "was. The rain weakened";
-								mes "the ground, something went";
-								mes "wrong... and she just... just...";
-								mes "The river swallowed her...";
-								mes "I felt empty. She was gone. ";
-								set KielHyreQuest,70;
-								delitem 7498,1; //Losimier's_House_Key
-								delitem 7499,1; //Portrait_of_a_Family
-								delitem 7500,1; //Portrait_of_a_Lady
-								delitem 7501,1; //K.H's_Letter
-								delitem 7502,1; //James's_Memo
-								delitem 7503,1; //Portrait_of_a_Guy
-								close2;
-								cutin "",255;
-								end;
-							}
-
-						}
-
-					}
-
-				}
-
-			}
-
-		}
-
+		select("About ^3355FFAllysia^000000...");
+		mes "["+strcharinfo(0)+"]";
+		mes "You know, I was looking";
+		mes "through this deserted house";
+		mes "in Juno, and discovered";
+		mes "an old portrait of a woman";
+		mes "that looks just like Allysia.";
+		next;
+		cutin "kh_kyel02",2;
+		mes "[Kiel Hyre]";
+		mes "Oh...";
+		mes "Is that all?";
+		mes "I thought you had";
+		mes "a robotics question.";
+		next;
+		cutin "kh_Kyel03",2;
+		mes "[Kiel Hyre]";
+		mes "Anyway, that's a";
+		mes "strange coincidence.";
+		mes "Well, I suppose it's";
+		mes "not so strange to find";
+		mes "look-a-likes for other people...";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I don't think it's just";
+		mes "a coincidence. The woman";
+		mes "in that thirty year old portrait";
+		mes "was also named Allysia, and she";
+		mes "worked at Orsimier street";
+		mes "in Juno. Does that ring a bell?";
+		next;
+		cutin "kh_kyel02",2;
+		mes "[Kiel Hyre]";
+		mes "......";
+		mes ".........";
+		mes "............";
+		next;
+		cutin "kh_kyel01",2;
+		mes "["+strcharinfo(0)+"]";
+		mes "Then I thought that this";
+		mes "Allysia must have been the";
+		mes "woman that you loved, and";
+		mes "that you based your robot's";
+		mes "apperance on her.";
+		next;
+		cutin "kh_kyel02",2;
+		mes "[Kiel Hyre]";
+		mes "............";
+		next;
+		cutin "kh_kyel01",2;
+		mes "["+strcharinfo(0)+"]";
+		mes "I think this is what happened:";
+		mes "when you were a young, poor";
+		mes "man, you fell in love with";
+		mes "Allysia. However, she was";
+		mes "in love with Rosimier, who";
+		mes "was rich and powerful.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "However, Rosimier was";
+		mes "betrothed to some other";
+		mes "woman, and he ended up";
+		mes "marrying his fiancee, thus";
+		mes "breaking Allysia's heart.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Feeling betrayed, her";
+		mes "heart broken, Allysia jumped";
+		mes "into a river. Then, you decided";
+		mes "to get revenge on Rosimier, so";
+		mes "you ended up joining";
+		mes "Rekenber Corporation!";
+		next;
+		cutin "kh_Kyel03",2;
+		mes "[Kiel Hyre]";
+		mes "Hahahahahahaha!";
+		mes "Oh, what an imagination~";
+		mes "That's very ridiculous...";
+		mes "Though, I admit, maybe";
+		mes "I did design Allysia after";
+		mes "seeing that woman long ago.";
+		next;
+		mes "[Kiel Hyre]";
+		mes "I'd almost forgotten";
+		mes "about her! I think we";
+		mes "were friends... Though,";
+		mes "where did you get the idea";
+		mes "that I might have";
+		mes "been in love with her?";
+		next;
+		select("Reveal Kiel's Portrait from Hut");
+		cutin "kh_kyel02",2;
+		mes "[Kiel Hyre]";
+		mes "Wh-what...";
+		mes "How did...";
+		mes "Where did you...?";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Kiel Hyre, I found this";
+		mes "portrait of you as a young";
+		mes "man from the house of the";
+		mes "man that bought Allysia's ring.";
+		mes "I even spoke to the fisherman";
+		mes "that discovered Allysia's body.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "You paid an awful lot";
+		mes "of money to buy Allysia's";
+		mes "ring. How can you not tell";
+		mes "me that you didn't love her?";
+		next;
+		cutin "kh_Kyel03",2;
+		mes "[Kiel Hyre]";
+		mes "*Sigh...*";
+		mes "You got me, you got me.";
+		mes "I didn't want you to learn";
+		mes "the truth. You are correct.";
+		mes "I loved Allysia, and designed";
+		mes "my robot to look just like her.";
+		next;
+		mes "[Kiel Hyre]";
+		mes "I could never forget her.";
+		mes "Ever. But I would never";
+		mes "do anything to harm the";
+		mes "Rosimiers! I'm a scientist!";
+		mes "I hated him when I was young,";
+		mes "but things are different now!";
+		next;
+		mes "[Kiel Hyre]";
+		mes "I shed no tears when the";
+		mes "Rosimiers fell, but I wasn't";
+		mes "responsible. Besides, I didn't";
+		mes "have the resources or the";
+		mes "capability to cause it...";
+		next;
+		cutin "kh_kyel02",2;
+		mes "["+strcharinfo(0)+"]";
+		mes "I'm afraid that the";
+		mes "evidence shows otherwise.";
+		next;
+		select("Reveal Portrait of Rosimiers");
+		mes "["+strcharinfo(0)+"]";
+		mes "Take a good look";
+		mes "at this portrait that";
+		mes "I found at the Rosimiers'";
+		mes "old house. Do you see";
+		mes "anything... incriminating?";
+		next;
+		cutin "kh_Kyel03",2;
+		mes "[Kiel Hyre]";
+		mes "Aside from that";
+		mes "James Rosimier, you";
+		mes "mean? No! I don't see";
+		mes "anything wrong with";
+		mes "this picture at all.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Take a good look";
+		mes "at the pocketwatch";
+		mes "in the portrait. That's";
+		mes "the pocketwatch you";
+		mes "wear today, isn't it?";
+		next;
+		cutin "kh_kyel02",2;
+		mes "[Kiel Hyre]";
+		mes "...!!!";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "You might not have caused";
+		mes "the downfall of the Rosimiers";
+		mes "yourself, but with the aid of";
+		mes "the Rekenber Corporation, I'd";
+		mes "say it was entirely possible!";
+		next;
+		cutin "kh_Kyel03",2; 
+		mes "[Kiel Hyre]";
+		mes "Well played, adventurer.";
+		mes "Well played. I don't regret";
+		mes "what I did: they killed my";
+		mes "Allysia! If James didn't betray";
+		mes "her, if only he didn't drive";
+		mes "her to commit suicide...";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "That's where you're wrong!";
+		mes "Allysia was killed, she didn't";
+		mes "commit suicide. Take a good";
+		mes "look at this note right here!";
+		next;
+		mes "[Kiel Hyre]";
+		mes "What?!";
+		next;
+		select("Show James's Note");
+		mes "[Kiel Hyre]";
+		mes "What does this prove?";
+		mes "This doesn't show that";
+		mes "James didn't betray Allysia.";
+		mes "How does this change anything?";
+		mes "She's dead, nothing I can do";
+		mes "will bring her back to me!";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I never said James didn't";
+		mes "betray her. Look at the date";
+		mes "on the note. James made plans";
+		mes "to run away with her on August";
+		mes "20th. However, her body was";
+		mes "found on the same day.";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Ergo, Allysia must have";
+		mes "died on August 19th. If she";
+		mes "was planning to run away with";
+		mes "her love on the next day, then";
+		mes "she had no reason to kill herself!";
+		next;
+		mes "[Kiel Hyre]";
+		mes "No, that's not right!";
+		mes "She probably couldn't";
+		mes "trust me! She must have";
+		mes "realized she was nothing";
+		mes "but another toy to him!";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "Oh yeah? I say she jumped";
+		mes "into the river because you";
+		mes "met her on that day. Now,";
+		mes "take a good look at this!";
+		next;
+		select("Show K.H.'s note");
+		mes "["+strcharinfo(0)+"]";
+		mes "This note was  written by";
+		mes "a man with your initials,";
+		mes "K.H. These initials were also";
+		mes "signed on her portrait. You";
+		mes "must have written this note:";
+		mes "there's too many coincidences!";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "According to this note,";
+		mes "you told Allysia that you";
+		mes "wanted to see her again";
+		mes "at the place you first met.";
+		mes "I think you did see her again...";
+		mes "on August 19th, the day she died!";
+		next;
+		mes "["+strcharinfo(0)+"]";
+		mes "I'm assuming the place you";
+		mes "two first met was near the";
+		mes "river. No more of your lies:";
+		mes "well me what really happened!";
+		next;
+		cutin "kh_kyel02",2;
+		mes "[Kiel Hyre]";
+		mes "............";
+		mes ".........";
+		mes "......";
+		next;
+		cutin "kh_Kyel03",2;
+		mes "[Kiel Hyre]";
+		mes "Hah... Ha ha ha...";
+		mes "Yes... That's right...";
+		mes "That horrible night.";
+		mes "I remember it well...";
+		mes ".....................";
+		next;
+		cutin "kh_kyel02",2;
+		mes "[Kiel Hyre]";
+		mes "That night, when she came";
+		mes "to the river to meet me as";
+		mes "I had asked, I begged her to";
+		mes "run away with me, instead";
+		mes "of waiting for that James.";
+		next;
+		mes "[Kiel Hyre]";
+		mes "She insisted that James";
+		mes "never betrayed her, and he";
+		mes "promised to take her away";
+		mes "with him the next day. Can";
+		mes "you imagine how that made";
+		mes "me feel? I was nothing to her.";
+		next;
+		mes "[Kiel Hyre]";
+		mes "My feelings didn't matter to";
+		mes "her at all! She kept fidgeting";
+		mes "with that ring...I lost control";
+		mes "and tried to take that damned";
+		mes "thing away from her, and";
+		mes "throw it into the river...";
+		next;
+		mes "[Kiel Hyre]";
+		mes "But you know what?";
+		mes "She struggled, she actually";
+		mes "fought me! It was just a small";
+		mes "fight, but then, before I knew";
+		mes "it, the ground underneath us";
+		mes "collapsed and... the rains...";
+		next;
+		select(".........");
+		mes "[Kiel Hyre]";
+		mes "I'm not sure what it";
+		mes "was. The rain weakened";
+		mes "the ground, something went";
+		mes "wrong... and she just... just...";
+		mes "The river swallowed her...";
+		mes "I felt empty. She was gone. ";
+		set KielHyreQuest,70;
+		delitem 7498,1; //Rosimier_Key
+		delitem 7499,1; //Family_Portrait
+		delitem 7500,1; //Elysia_Portrait
+		delitem 7501,1; //Kyll_Hyre_Letter2
+		delitem 7502,1; //Piece_Memo_Of_James
+		delitem 7503,1; //Man_Portrait
+		close2;
+		cutin "",255;
+		end;
 	}
-
-	else if (KielHyreQuest == 70) {
+	else if (KielHyreQuest <= 70) {
 		cutin "kh_kyel01",2;
 		mes "[Kiel Hyre]";
 		mes "You already know that";
@@ -4897,73 +4553,59 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		mes "properly raise him with";
 		mes "human morals and ethics.";
 		next;
-
-		switch(select("......")) {
-
-		case 1:
-			mes "[Kiel Hyre]";
-			mes "He's been transforming";
-			mes "the Third Generation robots";
-			mes "into killing machines. That's";
-			mes "why I tried to put them all";
-			mes "into the academy, so they";
-			mes "could learn human behavior.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "Although the academy";
-			mes "has delayed Kiehl's plans,";
-			mes "he has succeeded into";
-			mes "converting all of the robots";
-			mes "into uncontrollable engines";
-			mes "of mass destruction.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "Yes, he's been working";
-			mes "closely with Rekenber.";
-			mes "Their true objective is to";
-			mes "create killing machines";
-			mes "for Rekenber's use.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "You know all the secrets";
-			mes "of my past now. I'm not";
-			mes "upset with you or anything,";
-			mes "but I do have something";
-			mes "that I want to ask of you.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "Please! Stop Kiehl!";
-			mes "I don't want his madness";
-			mes "to destroy any more robots!";
-			mes "I see each and every one";
-			mes "of them as one of my children!";
-			next;
-			mes "[Kiel Hyre]";
-			mes "I know that I must take";
-			mes "full responsibility for all";
-			mes "that has happened. I promise";
-			mes "to take any punishment for";
-			mes "my actions once everything";
-			mes "has been resolved.";
-
-			next;
-
-			select("Accept","Okay","Nod");
-
-			mes "[Kiel Hyre]";
-			mes "Thank you so much!";
-			mes "You can find Kiehl";
-			mes "in the underground";
-			mes "level in this mansion.";
-			set KielHyreQuest,72;
-
-		}
-
-	}
-
-	else if (KielHyreQuest == 72) {
-		cutin "kh_kyel01",2;
-		//I believe this text goes here o_o
+		select("......");
+		mes "[Kiel Hyre]";
+		mes "He's been transforming";
+		mes "the Third Generation robots";
+		mes "into killing machines. That's";
+		mes "why I tried to put them all";
+		mes "into the academy, so they";
+		mes "could learn human behavior.";
+		next;
+		mes "[Kiel Hyre]";
+		mes "Although the academy";
+		mes "has delayed Kiehl's plans,";
+		mes "he has succeeded into";
+		mes "converting all of the robots";
+		mes "into uncontrollable engines";
+		mes "of mass destruction.";
+		next;
+		mes "[Kiel Hyre]";
+		mes "Yes, he's been working";
+		mes "closely with Rekenber.";
+		mes "Their true objective is to";
+		mes "create killing machines";
+		mes "for Rekenber's use.";
+		next;
+		mes "[Kiel Hyre]";
+		mes "You know all the secrets";
+		mes "of my past now. I'm not";
+		mes "upset with you or anything,";
+		mes "but I do have something";
+		mes "that I want to ask of you.";
+		next;
+		mes "[Kiel Hyre]";
+		mes "Please! Stop Kiehl!";
+		mes "I don't want his madness";
+		mes "to destroy any more robots!";
+		mes "I see each and every one";
+		mes "of them as one of my children!";
+		next;
+		mes "[Kiel Hyre]";
+		mes "I know that I must take";
+		mes "full responsibility for all";
+		mes "that has happened. I promise";
+		mes "to take any punishment for";
+		mes "my actions once everything";
+		mes "has been resolved.";
+		next;
+		select("Accept:Okay:Nod");
+		mes "[Kiel Hyre]";
+		mes "Thank you so much!";
+		mes "You can find Kiehl";
+		mes "in the underground";
+		mes "level in this mansion.";
+		next;
 		mes "[Kiel Hyre]";
 		mes "He stays in the old room";
 		mes "where he was created, but";
@@ -4979,55 +4621,45 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		mes "remove it, that should stop";
 		mes "him from going berserk.";
 		next;
-
-		switch(select("Allysia's Ring?")) {
-
-		case 1:
-			mes "[Kiel Hyre]";
-			mes "Yes... Her ring is the";
-			mes "beginning of everything";
-			mes "I put that in his heart so";
-			mes "that I'd never forget what";
-			mes "the Rosimiers did to me.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "I think Kiehl's grown";
-			mes "so powerful that normal";
-			mes "weapons might not work";
-			mes "on him anymore. Use this";
-			mes "device that will cause his";
-			mes "power supply to fluctuate.";
-			getitem 7504,1; //Power_Source
-			next;
-			cutin "kh_kyel03",2;
-			mes "[Kiel Hyre]";
-			mes "If you successfully attach";
-			mes "this to Kiehl's body, then";
-			mes "he won't be able to use his";
-			mes "body's full power. While he's";
-			mes "weakened, open up his chest";
-			mes "and get the ring from his heart.";
-			next;
-			mes "[Kiel Hyre]";
-			mes "Let me know once";
-			mes "you're ready. Then, I'll";
-			mes "guide you Kiehl's room.";
-			set KielHyreQuest,74;
-			break;
-
-		}
-
+		select("Allysia's Ring?");
+		mes "[Kiel Hyre]";
+		mes "Yes... Her ring is the";
+		mes "beginning of everything";
+		mes "I put that in his heart so";
+		mes "that I'd never forget what";
+		mes "the Rosimiers did to me.";
+		next;
+		mes "[Kiel Hyre]";
+		mes "I think Kiehl's grown";
+		mes "so powerful that normal";
+		mes "weapons might not work";
+		mes "on him anymore. Use this";
+		mes "device that will cause his";
+		mes "power supply to fluctuate.";
+		getitem 7504,1; //Toy_Motor
+		next;
+		cutin "kh_kyel03",2;
+		mes "[Kiel Hyre]";
+		mes "If you successfully attach";
+		mes "this to Kiehl's body, then";
+		mes "he won't be able to use his";
+		mes "body's full power. While he's";
+		mes "weakened, open up his chest";
+		mes "and get the ring from his heart.";
+		next;
+		mes "[Kiel Hyre]";
+		mes "Let me know once";
+		mes "you're ready. Then, I'll";
+		mes "guide you Kiehl's room.";
+		set KielHyreQuest,74;
 	}
-
 	else if ((KielHyreQuest >= 74) && (KielHyreQuest <= 104)) {
 		mes "[Kiel Hyre]";
 		mes "Are you ready";
 		mes "to confront";
 		mes "Kiehl now?";
 		next;
-
-		switch(select("Yes","No")) {
-
+		switch(select("Yes:No")) {
 		case 1:
 			mes "[Kiel Hyre]";
 			mes "There... the secret";
@@ -5035,21 +4667,18 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 			mes "Just go to the right of";
 			mes "me, but be careful. Kiehl";
 			mes "is extremely dangerous.";
+			close2;
 			enablenpc "Kiehl_Room_Warp";
 			donpcevent "Kiehl_Room_Warp::OnEnable";
 			break;
-
 		case 2:
 			mes "[Kiel Hyre]";
 			mes "Please take your";
 			mes "time. I imagine that";
 			mes "it won't be easy.";
 			break;
-
 		}
-
 	}
-
 	else if ((KielHyreQuest >= 74) && (KielHyreQuest <= 106)) {
 		cutin "kh_kyel01",2;
 		mes "[Kiel Hyre]";
@@ -5058,7 +4687,6 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		mes "to retrieve Allysia's";
 		mes "Ring from Kiehl's heart?";
 		next;
-
 		if (countitem(7508) < 1) {
 			mes "[Kiel Hyre]";
 			mes "You mean... You don't have it?";
@@ -5071,7 +4699,6 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 			cutin "",255;
 			end;
 		}
-
 		mes "[Kiel Hyre]";
 		mes "Wh-what happened...?";
 		mes "Kiehl developed a new";
@@ -5095,56 +4722,52 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 		mes "deepest levels of the factory.";
 		mes "I'll investigate Kiehl's room.";
 		set KielHyreQuest,108;
-		getitem 7509,1; //Gorgeous_Keycard
+		getitem 7509,1; //Fancy_Key_Card
 		next;
-
 		if (sex == 0) {
-			if (getpartnerid() == 0) set @KHTitle$,"Miss";
-			else set @KHSTitle$,"Mrs";
+			if (getpartnerid() == 0) set .@KHTitle$,"Miss";
+			else set .@KHSTitle$,"Mrs";
 		}
-		else set @KHTitle$,"Mr";
-
+		else set .@KHTitle$,"Mr";
 		mes "[Kiel Hyre]";
 		mes "Kiehl is my responsibility...";
 		mes "No matter what the cost may";
 		mes "be, I've got to stop him! Oh,";
 		mes "and here, please take this";
 		mes "with my thanks for all of";
-		mes "your help, "+@KHTitle$+" "+strcharinfo(0)+".";
+		mes "your help, "+.@KHTitle$+" "+strcharinfo(0)+".";
 		getitem 616,1;  //Old card Album
-		delitem 7508,1; //Elisia's_Ring
+		delitem 7508,1; //Elysia_Ring
 		getexp 1000000,0;
 	}
-
 	else if (KielHyreQuest >= 108) {
 		mes "[Kiel Hyre]";
 		mes "......";
 		mes ".........";
 		mes "............";
-		delitem 7487,countitem(7487); //Culinary_Wine
+		delitem 7487,countitem(7487); //Tavern_Wine
 		delitem 7488,countitem(7488); //Delivery_Package
-		delitem 7489,countitem(7489); //Cottage Key
-		delitem 7490,countitem(7490); //Letter to Elly
-		delitem 7491,countitem(7491); //Steel_box
-		delitem 7492,countitem(7492); //Yellow_Keycard
+		delitem 7489,countitem(7489); //Villa_Spare_Key
+		delitem 7490,countitem(7490); //Kyll_Hire_Letter
+		delitem 7491,countitem(7491); //Iron_Box
+		delitem 7492,countitem(7492); //Yellow_Key_Card
 		delitem 7493,countitem(7493); //Golden_Key
-		delitem 7494,countitem(7494); //Exquisite_Button
-		delitem 7495,countitem(7495); //Blue_Keycard
-		delitem 7496,countitem(7496); //Red_Keycard
-		delitem 7497,countitem(7497); //Metal_Fragment
-		delitem 7498,countitem(7498); //Losimier's_House_Key
-		delitem 7499,countitem(7499); //Portrait_of_a_Family
-		delitem 7500,countitem(7500); //Portrait_of_a_Lady
-		delitem 7501,countitem(7501); //K.H's_Letter
-		delitem 7502,countitem(7502); //James's_Memo
-		delitem 7503,countitem(7503); //Portrait_of_a_Guy
-		delitem 7504,countitem(7504); //Power_Source
+		delitem 7494,countitem(7494); //Kiel_Button
+		delitem 7495,countitem(7495); //Blue_Key_Card
+		delitem 7496,countitem(7496); //Red_Key_Card
+		delitem 7497,countitem(7497); //Steel_Piece
+		delitem 7498,countitem(7498); //Rosimier_Key
+		delitem 7499,countitem(7499); //Family_Portrait
+		delitem 7500,countitem(7500); //Elysia_Portrait
+		delitem 7501,countitem(7501); //Kyll_Hyre_Letter2
+		delitem 7502,countitem(7502); //Piece_Memo_Of_James
+		delitem 7503,countitem(7503); //Man_Portrait
+		delitem 7504,countitem(7504); //Toy_Motor
 		delitem 7505,countitem(7505); //Toy_Key
-		delitem 7506,countitem(7506); //Black_Keycard
+		delitem 7506,countitem(7506); //Black_Key_Card
 		delitem 7508,countitem(7508); //Elysia_Ring
-		delitem 7516,countitem(7516); //Green_Keycard
+		delitem 7516,countitem(7516); //Green_Key_Card
 	}
-
 	close2;
 	cutin "",255;
 	end;
@@ -5155,7 +4778,6 @@ kh_mansion,22,28,4	script	Kiel Hyre	903,{
 // Allysia
 //----------------------------------------------------------------------------
 kh_mansion,18,30,4	script	Allysia	894,{
-	
 	if (KielHyreQuest < 46) {
 		mes "[Allysia]";
 		mes "Who are you?";
@@ -5163,9 +4785,7 @@ kh_mansion,18,30,4	script	Allysia	894,{
 		mes "Go away";
 		close;
 	}
-
 	cutin "kh_ellisia",2;
-
 	if (KielHyreQuest < 70) {
 		mes "[Allysia]";
 		mes "You must be surprised";
@@ -5174,9 +4794,7 @@ kh_mansion,18,30,4	script	Allysia	894,{
 		mes "would be easier to understand";
 		mes "if I explained about robots?";
 		next;
-
-		switch(select("Yes","No")) {
-
+		switch(select("Yes:No")) {
 		case 1:
 			mes "[Allysia]";
 			mes "The robots you've been";
@@ -5194,9 +4812,7 @@ kh_mansion,18,30,4	script	Allysia	894,{
 			mes "generations of robots, the first,";
 			mes "second, and third generations.";
 			next;
-
-			switch(select("First Generation","Second Generation","Third Generation")) {
-
+			switch(select("First Generation:Second Generation:Third Generation")) {
 			case 1:
 				mes "[Allysia]";
 				mes "I am a good example of one";
@@ -5223,7 +4839,6 @@ kh_mansion,18,30,4	script	Allysia	894,{
 				mes "emotion similarly to a human.";
 				next;
 				break;
-
 			case 2:
 				mes "[Allysia]";
 				mes "The First Generation robots";
@@ -5266,7 +4881,6 @@ kh_mansion,18,30,4	script	Allysia	894,{
 				mes "considered faulty.";
 				next;
 				break;
-
 			case 3:
 				mes "[Allysia]";
 				mes "Third Generation robots";
@@ -5307,7 +4921,6 @@ kh_mansion,18,30,4	script	Allysia	894,{
 				mes "success in robotics.";
 				next;
 				break;
-
 			}
 		case 2:
 			mes "[Allysia]";
@@ -5315,18 +4928,14 @@ kh_mansion,18,30,4	script	Allysia	894,{
 			mes "you'd like to learn more";
 			mes "about Kiel Hyre's robots.";
 			break;
-
 		}
-
 	}
-
 	else {
 		mes "[Allysia]";
 		mes "......";
 		mes ".........";
 		mes "............";
 	}
-
 	close2;
 	cutin "",255;
 	end;
@@ -5336,13 +4945,14 @@ kh_mansion,18,30,4	script	Allysia	894,{
 // Abduction triggering NPC
 //----------------------------------------------------------------------------
 lighthalzen,188,200,0	script	Abduction_trigger	-1,3,1,{
+//OnTouch2:
 OnTouch:
 	if (KielHyreQuest == 50) {
-		mes "^3355FFAs you walked out of^000000";
-		mes "^3355FFthe mansion, something^000000";
-		mes "^3355FFsmashed the top of your^000000";
-		mes "^3355FFhead, and you instantly^000000";
-		mes "^3355FFlose consciousness...^000000";
+		mes "^3355FFAs you walked out of";
+		mes "the mansion, something";
+		mes "smashed the top of your";
+		mes "head, and you instantly";
+		mes "lose consciousness...";
 		close2;
 		percentheal -99,0;
 		warp "kh_mansion",30,75;
@@ -5354,12 +4964,14 @@ OnTouch:
 // Mysterious Woman "Mitchell Layla"
 //----------------------------------------------------------------------------
 kh_mansion,25,79,4	script	Mysterious Woman#kh	727,3,3,{
-L_StartDialog:
+
+//OnTouch2:
+OnTouch:
 	if (KielHyreQuest == 50) {
-		mes "^3355FFYou awaken with your^000000";
-		mes "^3355FFhead painfully throbbing,^000000";
-		mes "^3355FFand a mysterious woman^000000";
-		mes "^3355FFstanding infront of you.^000000";
+		mes "^3355FFYou awaken with your";
+		mes "head painfully throbbing,";
+		mes "and a mysterious woman";
+		mes "standing in front of you.^000000";
 		next;
 		mes "[??????]";
 		mes "Hm? Oh, you're awake";
@@ -5385,9 +4997,7 @@ L_StartDialog:
 		mes "Now tell me the truth. How";
 		mes "do you know Kiel Hyre?";
 		next;
-
-		switch(select("I'll tell you everything!","I don't know nuthin'!")) {
-
+		switch(select("I'll tell you everything!:I don't know nuthin'!")) {
 		case 2:
 			mes "[??????]";
 			mes "Don't...know...nuthin'?";
@@ -5512,19 +5122,7 @@ L_StartDialog:
 			mes "case, I want your help";
 			mes "in our investigation.";
 			next;
-
-			switch(select("Okay","......")) {
-
-			case 1:
-				L_Help:
-				mes "[??????]";
-				mes "Great.";
-				mes "I'm Agent Mitchell Layla.";
-				mes "From here on, you're working";
-				mes "for the Schwaltzvalt Republic!";
-				set KielHyreQuest,52;
-				close;
-
+			switch(select("Okay:......")) {
 			case 2:
 				mes "[??????]";
 				mes "If you don't cooperate,";
@@ -5536,13 +5134,18 @@ L_StartDialog:
 				mes "What does that mean?";
 				mes "Are you threatening me?";
 				next;
-				menu "Just do what she says.",L_Help;
+				select("Just do what she says.");
+			case 1:
+				mes "[??????]";
+				mes "Great.";
+				mes "I'm Agent Mitchell Layla.";
+				mes "From here on, you're working";
+				mes "for the Schwaltzvalt Republic!";
+				set KielHyreQuest,52;
+				close;
 			}
-
 		}
-
 	}
-
 	else if (KielHyreQuest == 52) {
 		mes "[Mitchell]";
 		mes "I've got some new";
@@ -5577,7 +5180,6 @@ L_StartDialog:
 		set KielHyreQuest,54;
 		close;
 	}
-
 	else if (KielHyreQuest == 54) {
 		mes "[Mitchell]";
 		mes "Are you ready?";
@@ -5586,9 +5188,7 @@ L_StartDialog:
 		mes "you can get to Juno, and";
 		mes "finish your mission quickly.";
 		next;
-
-		switch(select("Yes","No")) {
-
+		switch(select("Yes:No")) {
 		case 1:
 			mes "[Mitchell]";
 			mes "Good luck. Once you";
@@ -5605,11 +5205,8 @@ L_StartDialog:
 			mes "But keep in mind that";
 			mes "I'm not a patient woman!";
 			close;
-
 		}
-
 	}
-
 	else if (KielHyreQuest == 64) {
 		mes "[Mitchell]";
 		mes "Ah, you're back.";
@@ -5637,8 +5234,6 @@ L_StartDialog:
 		warp "kh_mansion",83,50;
 		end;
 	}
-
-
 	else if (KielHyreQuest >= 68) {
 		mes "[Mitchell]";
 		mes "Shouldn't you be";
@@ -5647,12 +5242,6 @@ L_StartDialog:
 		warp "kh_mansion",83,50;
 		end;
 	}
-
-OnTouch:
-	if (KielHyreQuest <= 50) {
-		goto L_StartDialog;
-	}
-	end;
 }
 
 //----------------------------------------------------------------------------
@@ -5690,7 +5279,7 @@ OnInit:
 //----------------------------------------------------------------------------
 // Odd Grandma
 //----------------------------------------------------------------------------
-yuno,256,141,4	script	Odd Grandma	846,{
+yuno,257,140,4	script	Odd Grandma	846,{
 	if (KielHyreQuest < 54) {
 		mes "[Grandma]";
 		mes "Where did you go,";
@@ -5698,7 +5287,6 @@ yuno,256,141,4	script	Odd Grandma	846,{
 		mes "are you, my little dear?";
 		close;
 	}
-
 	else if (KielHyreQuest == 54) {
 		mes "[Grandma]";
 		mes "Lullabye...";
@@ -5706,9 +5294,7 @@ yuno,256,141,4	script	Odd Grandma	846,{
 		mes "Hush little baby...";
 		mes "Go to sleeeeep~";
 		next;
-
-		switch(select("What are you doing?","Um, I don't see a baby...")) {
-
+		switch(select("What are you doing?:Um, I don't see a baby...")) {
 		case 1:
 			mes "[Grandma]";
 			mes "Oh? My baby won't stop";
@@ -5719,35 +5305,27 @@ yuno,256,141,4	script	Odd Grandma	846,{
 			mes "and the boss is unhappy...";
 			set KielHyreQuest,56;
 			next;
-
-			switch(select("Um, I don't see a baby...")) {
-
-			case 1:
-				mes "[Grandma]";
-				//Missing text, needs another run through.
-				mes "Allysia...?!";
-				mes "Allysia, where did";
-				mes "you go? You were";
-				mes "supposed to come";
-				mes "home a while ago!";
-				close;
-
-			}
-
+			select("Um, I don't see a baby...");
+			mes "[Grandma]";
+			mes "What, she's right--";
+			mes "Well. Darling, what";
+			mes "are you doing? Don't";
+			mes "misbehave in front of";
+			mes "our friend! Shhh, be";
+			mes "good, my little girl.";
+			//GetHEALTHSTATE VAR_CURSE 30
+			close;
 		case 2:
-			//Missing text, needs another run through.
 			mes "[Grandma]";
-			mes "Allysia...?!";
-			mes "Allysia, where did";
-			mes "you go? You were";
-			mes "supposed to come";
-			mes "home a while ago!";
+			mes "What are you...?";
+			mes "Oh, look at that.";
+			mes "You made my little";
+			mes "darling cry! Shhh,";
+			mes "hush, little ^0000FFAllysia^000000.";
+			mes "Go to sleeeeeeep~";
 			close;
-
 		}
-
 	}
-
 	else if ((KielHyreQuest >= 56) && (KielHyreQuest < 60)) {
 		mes "[Grandma]";
 		mes "Allysia...?!";
@@ -5755,16 +5333,12 @@ yuno,256,141,4	script	Odd Grandma	846,{
 		mes "you go? You were";
 		mes "supposed to come";
 		mes "home a while ago!";
-
 		if (countitem(7500) < 1) { 
 			close;
 		}
-
 		else {
 			next;
-
 			switch(select("Allysia? Isn't she...")) {
-
 			case 1:
 				cutin "kh_ellisia_port",1;
 				mes "^3355FFYou show Allysia's";
@@ -5780,11 +5354,8 @@ yuno,256,141,4	script	Odd Grandma	846,{
 				mes "tell me where she is?!";
 				close;
 			}
-
 		}
-
 	}
-
 	else if (KielHyreQuest >= 60) {
 		mes "[Grandma]";
 		mes "Don't worry, Allysia...";
@@ -5793,13 +5364,12 @@ yuno,256,141,4	script	Odd Grandma	846,{
 		mes "need to be sad...";
 		close;
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Old Lady; gives you the key to the Rosimier Mansion
 //----------------------------------------------------------------------------
-yuno,250,132,2	script	Old Lady	711,{
+yuno,250,132,0	script	Old Lady#kh	711,{
 	if (KielHyreQuest < 56) {
 		mes "[Old Lady]";
 		mes "Oooh, my legs and back";
@@ -5807,26 +5377,23 @@ yuno,250,132,2	script	Old Lady	711,{
 		mes "bones ache all over...";
 		close;
 	}
-
 	else if (KielHyreQuest == 56) {
 		if (checkweight(7498,1) == 0) {
-			mes "^3355FF- Wait!! -";
-			mes "- You are carrying too many items";
-			mes "- and are unable to accept any more. -";
-			mes "- Please make some space avaliable";
-			mes "- in your inventory before returning. -^000000";
+			mes "^3355FFJust a second...";
+			mes "You're carrying too";
+			mes "many items with you";
+			mes "right now, so you'll";
+			mes "need to free up more";
+			mes "Inventory space first...^000000";
 			close;
 		}
-
 		mes "[Old Lady]";
 		mes "Goodness, I hate this";
 		mes "weather! Reminds me";
 		mes "of how old I've gotten!";
 		mes "It chills my bones, it does!";
 		next;
-
-		switch(select("......","Do you know that grandma?")) {
-
+		switch(select("......:Do you know that grandma?")) {
 		case 1:
 			mes "[Old Lady]";
 			mes "Damn it! If only I didn't";
@@ -5835,7 +5402,6 @@ yuno,250,132,2	script	Old Lady	711,{
 			mes "I wouldn't suffer so in";
 			mes "my advanced age!";
 			close;
-
 		case 2:
 			mes "[Old Lady]";
 			mes "Oh... Yes. She was";
@@ -5845,74 +5411,58 @@ yuno,250,132,2	script	Old Lady	711,{
 			mes "haven't been the same. Her";
 			mes "mother lost her sanity...";
 			next;
-
-			switch(select("Was ^3355FFAllysia^000000...?")) {
-
-			case 1:
-				mes "[Old Lady]";
-				mes "Oh, Allysia was such";
-				mes "a beautiful girl. So many";
-				mes "men wanted her, especially";
-				mes "that dashing James Rosimier.";
-				mes "I remember hearing that they";
-				mes "were going to get married...";
-				next;
-				mes "[Old Lady]";
-				mes "I was so happy for her!";
-				mes "But then, all of a sudden,";
-				mes "she killed herself. Well,";
-				mes "that's what they all say.";
-				mes "Even today, I'm still not";
-				mes "sure what happened.";
-				next;
-
-				switch(select("Wait, who's James Rosimier?")) {
-
-				case 1:
-					mes "[Old Lady]";
-					mes "Oh, James belonged to";
-					mes "one of the oldest and richest";
-					mes "families in Juno. Everything";
-					mes "was going great for them, but";
-					mes "some time after Allysia died,";
-					mes "the family went bankrupt.";
-					next;
-					mes "[Old Lady]";
-					mes "The city manages their";
-					mes "old residence now. For";
-					mes "some reason, they decided";
-					mes "to entrust me with the master";
-					mes "key to the Rosimier Mansion.";
-					next;
-
-					switch(select("May I borrow the Master Key?")) { 
-
-					case 1:
-						mes "[Old Lady]";
-						mes "Well, I'm really not";
-						mes "supposed to give it to just";
-						mes "anyone, but I can tell that";
-						mes "you're working with Allysia's";
-						mes "best interests at heart.";
-						next;
-						mes "[Old Lady]";
-						mes "However, you've got to";
-						mes "make sure that you return";
-						mes "it to me before the people";
-						mes "from City Hall ask me for it.";
-						mes "Alright then, I hope you find";
-						mes "what you're looking for.";
-						set KielHyreQuest,58;
-						getitem 7498,1; //Losimier's_House_Key
-						close;
-					}
-
-				}
-
-			}
-
+			select("Was ^3355FFAllysia^000000...?");
+			mes "[Old Lady]";
+			mes "Oh, Allysia was such";
+			mes "a beautiful girl. So many";
+			mes "men wanted her, especially";
+			mes "that dashing James Rosimier.";
+			mes "I remember hearing that they";
+			mes "were going to get married...";
+			next;
+			mes "[Old Lady]";
+			mes "I was so happy for her!";
+			mes "But then, all of a sudden,";
+			mes "she killed herself. Well,";
+			mes "that's what they all say.";
+			mes "Even today, I'm still not";
+			mes "sure what happened.";
+			next;
+			select("Wait, who's James Rosimier?");
+			mes "[Old Lady]";
+			mes "Oh, James belonged to";
+			mes "one of the oldest and richest";
+			mes "families in Juno. Everything";
+			mes "was going great for them, but";
+			mes "some time after Allysia died,";
+			mes "the family went bankrupt.";
+			next;
+			mes "[Old Lady]";
+			mes "The city manages their";
+			mes "old residence now. For";
+			mes "some reason, they decided";
+			mes "to entrust me with the master";
+			mes "key to the Rosimier Mansion.";
+			next;
+			select("May I borrow the Master Key?");
+			mes "[Old Lady]";
+			mes "Well, I'm really not";
+			mes "supposed to give it to just";
+			mes "anyone, but I can tell that";
+			mes "you're working with Allysia's";
+			mes "best interests at heart.";
+			next;
+			mes "[Old Lady]";
+			mes "However, you've got to";
+			mes "make sure that you return";
+			mes "it to me before the people";
+			mes "from City Hall ask me for it.";
+			mes "Alright then, I hope you find";
+			mes "what you're looking for.";
+			set KielHyreQuest,58;
+			getitem 7498,1; //Rosimier_Key
+			close;
 		}
-
 	}
 
 	else if ((KielHyreQuest == 58) &&
@@ -5943,52 +5493,44 @@ yuno,250,132,2	script	Old Lady	711,{
 		mes "ransacked everything";
 		mes "a very long time ago.";
 		next;
-
-		switch(select("Why did ^3355FFAllysia^000000...?")) {
-
-		case 1:
-			mes "[Old Lady]";
-			mes "Well, I know that James";
-			mes "and Allysia were in love,";
-			mes "and he promised to marry";
-			mes "her. Now, supposedly his";
-			mes "family already betrothed";
-			mes "him to another woman.";
-			next;
-			mes "[Old Lady]";
-			mes "Time went by, and he";
-			mes "was forced to marry his";
-			mes "fiancee. Allysia was pretty";
-			mes "devastated. I think maybe";
-			mes "that's what she... you know...";
-			next;
-			mes "[Old Lady]";
-			mes "Listen, if you want to learn";
-			mes "more about what happened,";
-			mes "then I think you should talk";
-			mes "to the ^3355FFfisherman that lives^000000";
-			mes "^3355FFsouth of the Kiel Hyre Academy.^000000";
-			next;
-			mes "[Old Lady]";
-			mes "He's the one that found";
-			mes "Allysia's body in the river,";
-			mes "so he might have a better";
-			mes "idea of what had happened.";
-			set KielHyreQuest,60;
-			delitem 7498,1; //Losimier's_House_Key 
-			close;
-
-		}
-
+		select("Why did ^3355FFAllysia^000000...?");
+		mes "[Old Lady]";
+		mes "Well, I know that James";
+		mes "and Allysia were in love,";
+		mes "and he promised to marry";
+		mes "her. Now, supposedly his";
+		mes "family already betrothed";
+		mes "him to another woman.";
+		next;
+		mes "[Old Lady]";
+		mes "Time went by, and he";
+		mes "was forced to marry his";
+		mes "fiancee. Allysia was pretty";
+		mes "devastated. I think maybe";
+		mes "that's what she... you know...";
+		next;
+		mes "[Old Lady]";
+		mes "Listen, if you want to learn";
+		mes "more about what happened,";
+		mes "then I think you should talk";
+		mes "to the ^3355FFfisherman that lives^000000";
+		mes "^3355FFsouth of the Kiel Hyre Academy.^000000";
+		next;
+		mes "[Old Lady]";
+		mes "He's the one that found";
+		mes "Allysia's body in the river,";
+		mes "so he might have a better";
+		mes "idea of what had happened.";
+		set KielHyreQuest,60;
+		delitem 7498,1; //Rosimier_Key 
+		close;
 	}
-
 	else if (KielHyreQuest >= 60) {
 		mes "[Old Lady]";
 		mes "Yep, Rain's coming.";
 		mes "Can feel it in my bones.";
 		close;
 	}
-
 }
 
 
@@ -5997,8 +5539,7 @@ yuno,250,132,2	script	Old Lady	711,{
 //----------------------------------------------------------------------------
 yuno,273,141,0	script	Rosimmir_Entrance	45,2,2,{
 OnTouch:
-	if (countitem(7498) < 1)
-	{
+	if (countitem(7498) < 1) {
 		mes "That mansion seems to have";
 		mes "been destroyed by the time.";
 		mes "However, the door looks like";
@@ -6006,37 +5547,50 @@ OnTouch:
 		mes "you had the right key.";
 		close;
 	}
-	else 
+	else {
 		warp "kh_rossi",20,92;
+	}
 	end;
 }
 
 //----------------------------------------------------------------------------
 // Rosimier Mansion, first floor; Table
 //----------------------------------------------------------------------------
-kh_rossi,23,23,0	script	Table	111,{
-	if (countitem(7499) < 1) {
-		if (checkweight(7499,1) == 0) {
-			mes "^3355FF- Wait!! -";
-			mes "- You are carrying too many items";
-			mes "- and are unable to accept any more. -";
-			mes "- Please make some space avaliable";
-			mes "- in your inventory before returning. -^000000";
-			close;
+kh_rossi,23,23,0	script	Table#khr2	111,{
+	if (checkweight(7499,1) == 0) {
+		mes "^3355FFJust a second...";
+		mes "You're carrying too";
+		mes "many items with you";
+		mes "right now, so you'll";
+		mes "need to free up more";
+		mes "Inventory space first...^000000";
+		close;
+	}
+	if (KielHyreQuest < 58) {
+		mes "^3355FFThere's nothing here";
+		mes "of importance to you.^000000";
+		close;
+	}
+	else if (KielHyreQuest < 60) {
+		if (countitem(7499) < 1) {
+			cutin "kh_family_port",1;
+			mes "^3355FFYou examine the table,";
+			mes "and find a framed portrait";
+			mes "inside the open drawer.^000000";
+			getitem 7499,1; //Family_Portrait
+		}
+		else {
+			mes "^3355FFThe open drawer of";
+			mes "this desk is now empty.^000000";
 		}
-
-		cutin "kh_family_port",1;
-		mes "^3355FFYou examine the table,^000000";
-		mes "^3355FFand find a frames portait^000000";
-		mes "^3355FFinside the open drawer.^000000";
-		getitem 7499,1; //Portrait_of_a_Family
 	}
-
-	else {
-		mes "^3355FFThe open drawer of,^000000";
-		mes "^3355FFthis desk is empty now.^000000";
+	else{
+		mes "^3355FFThis was the desk in";
+		mes "which you obtained the";
+		mes "Rosimier family portrait.";
+		mes "Its drawers are empty now.^000000";
+		close;
 	}
-
 	close2;
 	cutin "",255;
 	end;
@@ -6045,162 +5599,222 @@ kh_rossi,23,23,0	script	Table	111,{
 //----------------------------------------------------------------------------
 // Rosimier Mansion, first floor; Shelf
 //----------------------------------------------------------------------------
-kh_rossi,92,40,0	script	Shelf::ShelfKHQ1	111,{
-	if (countitem(7500) < 1) {
-		if (checkweight(7500,1) == 0) {
-			mes "^3355FF- Wait!! -";
-			mes "- You are carrying too many items";
-			mes "- and are unable to accept any more. -";
-			mes "- Please make some space avaliable";
-			mes "- in your inventory before returning. -^000000";
-			close;
-		}
-
-		mes "^3355FFThere are locked^000000";
-		mes "^3355FFboxes on these bookshelves.^000000";
-		mes "^3355FFPerhaps if you used this^000000";
-		mes "^3355FFmansions's Master Key, you^000000";
-		mes "^3355FFmight be able to open them.^000000";
-		next;
-
-		switch(select("Use Key","Pass")) {
-
-		case 1:
-			mes "^3355FFWhich box do you^000000";
-			mes "^3355FFwant to try to open?^000000";
+kh_rossi,92,40,0	script	Shelf#khr	111,{
+	if (checkweight(7500,1) == 0) {
+		mes "^3355FFJust a second...";
+		mes "You're carrying too";
+		mes "many items with you";
+		mes "right now, so you'll";
+		mes "need to free up more";
+		mes "Inventory space first...^000000";
+		close;
+	}
+	if (KielHyreQuest < 58) {
+		mes "^3355FFThere's nothing here";
+		mes "of importance to you.^000000";
+		close;
+	}
+	else if (KielHyreQuest < 60) {
+		if (countitem(7500) < 1) {
+			mes "^3355FFThere are locked";
+			mes "boxes on these bookshelves.";
+			mes "Perhaps if you used this";
+			mes "mansions's Master Key, you";
+			mes "might be able to open them.^000000";
 			next;
-
-			switch(select("First Box","Second Box")) {
-
+			switch(select("Use Key:Pass")) {
 			case 1:
-				mes "^3355FFYou use the Master Key to^000000";
-				mes "^3355FFunlock the box, and obtain^000000";
-				mes "^3355FFa portait of a woman that^000000";
-				mes "^3355FFlooks just like Kiel Hyre's^000000";
-				mes "^3355FFassistant, Allysia.^000000";
+				mes "^3355FFWhich box do you";
+				mes "want to try to open?^000000";
 				next;
-				cutin "kh_ellisia_port",2;
-				mes "^3355FFThe message, ''To my love,^000000";
-				mes "^3355FFAllysia. From James.'' is^000000";
-				mes "^3355FFwritten on the back.^000000";
-				getitem 7500,1; //Portrait_of_a_Lady
-				close2;
-				cutin "",255;
-				end;
-
+				switch(select("First Box:Second Box")) {
+				case 1:
+					mes "^3355FFYou use the Master Key to";
+					mes "unlock the box, and obtain";
+					mes "a portait of a woman that";
+					mes "looks just like Kiel Hyre's";
+					mes "assistant, Allysia.^000000";
+					next;
+					cutin "kh_ellisia_port",2;
+					mes "^3355FFThe message, ''To my love,";
+					mes "FAllysia. From James.'' is";
+					mes "written on the back.^000000";
+					getitem 7500,1; //Elysia_Portrait
+					close2;
+					cutin "",255;
+					end;
+				case 2:
+					mes "^3355FFThis box is empty.^000000";
+					close;
+				}
 			case 2:
 				mes "^3355FFThis box is empty.^000000";
 				close;
-
 			}
-
-		case 2:
-			mes "^3355FFThis box is empty.^000000";
+		}
+		else {
+			mes "^3355FFYou've found a woman's";
+			mes "portrait in one of the";
+			mes "boxes on this shelf.^000000";
 			close;
-
 		}
-
 	}
-
 	else {
-		mes "^3355FFYou've found a woman's^000000";
-		mes "^3355FFportrait in one of the^000000";
-		mes "^3355FFboxes on this shelf.^000000";
+		mes "^3355FFYou've found a woman's";
+		mes "portrait in one of the";
+		mes "boxes on this shelf.";
+		mes "This box is now empty.^000000";
 		close;
 	}
-
 }
 
 
 //----------------------------------------------------------------------------
 // Rosimier Mansion, top floor; Desk
 //----------------------------------------------------------------------------
-kh_rossi,144,287,0	script	Desk::DeskKHQ2	111,{
+kh_rossi,144,286,0	script	Desk#khr3	111,{
 	if (checkweight(7501,1) == 0) {
-		mes "^3355FF- Wait!! -";
-		mes "- You are carrying too many items";
-		mes "- and are unable to accept any more. -";
-		mes "- Please make some space avaliable";
-		mes "- in your inventory before returning. -^000000";
+		mes "^3355FFJust a second...";
+		mes "You're carrying too";
+		mes "many items with you";
+		mes "right now, so you'll";
+		mes "need to free up more";
+		mes "Inventory space first...^000000";
 		close;
 	}
-
-	mes "^3355FFThe desk has^000000";
-	mes "^3355FFthree drawers.^000000";
-	next;
-
-	switch(select("First Drawer","Second Drawer","Third Drawer","Cancel")) {
-
-	case 1:
-		mes "^3355FFThe first drawer is locked.^000000";
+	if (KielHyreQuest < 58) {
+		mes "^3355FFIt's just a desk.^000000";
 		close;
-
-	case 2:
-		if (countitem(7501) < 1) {
-			mes "^3355FFThere is a letter inside^000000";
-			mes "^3355FFthis second drawer. it^000000";
-			mes "^3355FFwas sent by a person^000000";
-			mes "^3355FFwith the initials, K.H.,^000000";
-			mes "^3355FFand addressed to Allysia.^000000";
-			getitem 7501,1; //K.H's_Letter
+	}
+	else if (KielHyreQuest < 60) {
+		mes "^3355FFThe desk has";
+		mes "three drawers.^000000";
+		next;
+		switch(select("First Drawer:Second Drawer:Third Drawer:Cancel")) {
+		case 1:
+			mes "^3355FFThe first drawer is locked.^000000";
 			close;
-		}
-
-		else {
-			mes "^3355FFThis drawer is now empty.^000000";
+		case 2:
+			if (countitem(7501) < 1) {
+				mes "^3355FFThere is a letter inside";
+				mes "this second drawer. It";
+				mes "was sent by a person";
+				mes "with the initials, K.H.,";
+				mes "and addressed to Allysia.^000000";
+				getitem 7501,1; //Kyll_Hyre_Letter2
+				close;
+			}
+			else {
+				mes "^3355FFThis drawer is now empty.^000000";
+				close;
+			}
+		case 3:
+			mes "^3355FFThere is a small note";
+			mes "inside this third drawer.";
+			mes "It's written by James, and";
+			mes "mentions that he wants to";
+			mes "marry Allysia, and that she";
+			mes "received an engagement ring.^000000";
+			close;
+		case 4:
+			mes "......";
+			mes ".........";
+			mes "............";
 			close;
-
 		}
-
-	case 3:
-		mes "^3355FFThere is a small note^000000";
-		mes "^3355FFinside this third drawer.^000000";
-		mes "^3355FFIt's written by James, and^000000";
-		mes "^3355FFmentions that he wants to^000000";
-		mes "^3355FFmarry Allysia, and that she^000000";
-		mes "^3355FFrecieved an engagement ring.^000000";
-		close;
-
-	case 4:
-		mes "......";
-		mes ".........";
-		mes "............";
+	}
+	else{
+		mes "^3355FFThis is the desk where";
+		mes "you found a letter written";
+		mes "by K.H., and a note scribbled";
+		mes "by James Rosimier. Both of";
+		mes "these are addressed to";
+		mes "the same woman, Allysia.^000000";
 		close;
-
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Rosimier Mansion, top floor; Bookshelf
 //----------------------------------------------------------------------------
-kh_rossi,149,288,0	script	Bookshelf::BookshelfKHQ2	111,{
-	if (countitem(7502) < 1) {
-		if (checkweight(7502,1) == 0) {
-			mes "^3355FF- Wait!! -";
-			mes "- You are carrying too many items";
-			mes "- and are unable to accept any more. -";
-			mes "- Please make some space avaliable";
-			mes "- in your inventory before returning. -^000000";
+kh_rossi,148,288,0	script	Bookshelf#khr	111,{
+	if (checkweight(7502,1) == 0) {
+		mes "^3355FFJust a second...";
+		mes "You're carrying too";
+		mes "many items with you";
+		mes "right now, so you'll";
+		mes "need to free up more";
+		mes "Inventory space first...^000000";
+		close;
+	}
+	if (KielHyreQuest < 58) {
+		mes "^3355FFYou encounter a dusty";
+		mes "bookshelf filled with";
+		mes "numerous books.^000000";
+		close;
+	}
+	else if (KielHyreQuest < 60) {
+		if (countitem(7502) < 1) {
+			mes "^3355FFYou encounter a dusty";
+			mes "bookshelf filled with";
+			mes "numerous books. You";
+			mes "find a folded note between";
+			mes "the books as you examine them.^000000";
+			getitem 7502,1; //Piece_Memo_Of_James
 			close;
 		}
-
-		mes "^3355FFYou encounter a dusty ^000000";
-		mes "^3355FFbookshelf filled with^000000";
-		mes "^3355FFnumerous books. You^000000";
-		mes "^3355FFfind a folded note between^000000";
-		mes "^3355FFthe books as you examine them.^000000";
-		getitem 7502,1; //James's_Memo
+		else {
+			mes "^3355FFYou encounter a dusty";
+			mes "bookshelf filled with";
+			mes "numerous books.^000000";
+			close;
+		}
+	}
+	else{
+		mes "^3355FFYou encounter a dusty";
+		mes "bookshelf filled with";
+		mes "numerous books.^000000";
 		close;
 	}
+}
 
+//----------------------------------------------------------------------------
+// Rosimier Mansion, top floor; Bed
+//----------------------------------------------------------------------------
+kh_rossi,154,286,0	script	Bed#khr	111,{
+	if (KielHyreQuest < 58) {
+		mes "^3355FFYou found a well made";
+		mes "bed that has collected";
+		mes "a thick layer of dust";
+		mes "after years of disuse.^000000";
+		close;
+	}
+	else if (KielHyreQuest < 60) {
+		mes "^3355FFYou found a well made";
+		mes "bed that has collected";
+		mes "a thick layer of dust";
+		mes "after years of disuse.^000000";
+		next;
+		switch(select("Check Bedsheets:Check Under Bed")) {
+		case 1:
+			mes "^3355FFYou brush the bed's";
+			mes "surface with your hand,";
+			mes "causing a cloud of nasty";
+			mes "dust to irritate your nose";
+			mes "and throat. Eww, yucky!^000000";
+			percentheal -10,0;
+			close;
+		case 2:
+			mes "^3355FFYou search underneath";
+			mes "the bed, and find an empty";
+			mes "engagement ring box.^000000";
+			close;
+		}
+	}
 	else {
-		mes "^3355FFYou encounter a dusty ^000000";
-		mes "^3355FFbookshelf filled with^000000";
-		mes "^3355FFnumerous books.^000000";
+		mes "^3355FFThis is a dirty bed.^000000";
 		close;
 	}
-
 }
 
 //----------------------------------------------------------------------------
@@ -6217,7 +5831,6 @@ yuno_fild12,232,222,0	script	Old Fisherman	709,{
 		mes "and they look different too...";
 		close;
 	}
-
 	else if (KielHyreQuest == 60) {
 		mes "[Fisherman]";
 		mes "Eh? You want something?";
@@ -6226,7 +5839,6 @@ yuno_fild12,232,222,0	script	Old Fisherman	709,{
 		mes "but you're not getting any.";
 		mes "Now, if you bring me some";
 		mes "Raw Fish, I'd be more friendly~";
-
 		if (countitem(544) >= 10)  {
 			next;
 			mes "[Fisherman]";
@@ -6237,77 +5849,70 @@ yuno_fild12,232,222,0	script	Old Fisherman	709,{
 			mes "i suppose I have to repay";
 			mes "the favor. Ask me anything~";
 			next;
-
-			switch(select("30 years ago, a woman killed herself...")) {
-
-			case 1:
+			select("30 years ago, a woman killed herself...");
 			mes "[Fisherman]";
-				mes "Oh? Ohh. Oh yeah.";
-				mes "I remember that. Yeah.";
-				mes "it was August 20th, my";
-				mes "wife's birthday. That day,";
-				mes "instead of catching fish,";
-				mes "I caught a dead woman.";
-				next;
-				mes "[Fisherman]";
-				mes "Of course, I reported it";
-				mes "to the Juno Police!  They told";
-				mes "me she killed herself since";
-				mes "she was betrayed by her lover,";
-				mes "who also happened to be her";
-				mes "employer. Really tragic stuff.";
-				next;
-				mes "[Fisherman]";
-				mes "Anyway, when they were";
-				mes "moving her body out of the";
-				mes "river, her hand dropped";
-				mes "some ring. I picked it up,";
-				mes "hoping to sell it later for";
-				mes "some zeny. I know, I know...";
-				next;
-				mes "[Fisherman]";
-				mes "I was pretty lucky the";
-				mes "police didn't see me take";
-				mes "it. Later that day, some guy";
-				mes "came up to me and offered";
-				mes "me a lot of money for it.";
-				mes "I guess it was my lucky day!";
-				next;
-				mes "[Fisherman]";
-				mes "I found out later that he was";
-				mes "some mechanical repairman--";
-				mes "something. He sold everything";
-				mes "to buy that ring, so I guess";
-				mes "he wanted it desperately.";
-				mes "Then he just dissapeared.";
-				next;
-				mes "[Fisherman]";
-				mes "His name...?";
-				mes "It was something like...";
-				mes "Heil? Hyre? Anyway, it";
-				mes "was a long time ago. Oh,";
-				mes "his old house is still around.";
-				next;
-				mes "[Fisherman]";
-				mes "If you're going to be";
-				mes "that curious, you might";
-				mes "as well check it out.";
-				mes "Let's see, he lived in";
-				mes "a hut near the northeast";
-				mes "forest guard camp.";
-				delitem 544,10; //Fish_Slice
-				set KielHyreQuest,62;
-				close;
-			}
-
+			mes "Oh? Ohh. Oh yeah.";
+			mes "I remember that. Yeah.";
+			mes "it was August 20th, my";
+			mes "wife's birthday. That day,";
+			mes "instead of catching fish,";
+			mes "I caught a dead woman.";
+			next;
+			mes "[Fisherman]";
+			mes "Of course, I reported it";
+			mes "to the Juno Police!  They told";
+			mes "me she killed herself since";
+			mes "she was betrayed by her lover,";
+			mes "who also happened to be her";
+			mes "employer. Really tragic stuff.";
+			next;
+			mes "[Fisherman]";
+			mes "Anyway, when they were";
+			mes "moving her body out of the";
+			mes "river, her hand dropped";
+			mes "some ring. I picked it up,";
+			mes "hoping to sell it later for";
+			mes "some zeny. I know, I know...";
+			next;
+			mes "[Fisherman]";
+			mes "I was pretty lucky the";
+			mes "police didn't see me take";
+			mes "it. Later that day, some guy";
+			mes "came up to me and offered";
+			mes "me a lot of money for it.";
+			mes "I guess it was my lucky day!";
+			next;
+			mes "[Fisherman]";
+			mes "I found out later that he was";
+			mes "some mechanical repairman--";
+			mes "something. He sold everything";
+			mes "to buy that ring, so I guess";
+			mes "he wanted it desperately.";
+			mes "Then he just dissapeared.";
+			next;
+			select("Do you remember his name?");
+			mes "[Fisherman]";
+			mes "His name...?";
+			mes "It was something like...";
+			mes "Heil? Hyre? Anyway, it";
+			mes "was a long time ago. Oh,";
+			mes "his old house is still around.";
+			next;
+			mes "[Fisherman]";
+			mes "If you're going to be";
+			mes "that curious, you might";
+			mes "as well check it out.";
+			mes "Let's see, he lived in";
+			mes "a hut near the northeast";
+			mes "forest guard camp.";
+			delitem 544,10; //Fish_Slice
+			set KielHyreQuest,62;
+			close;
 		}
-
 		else {
 			close;
 		}
-
 	}
-
 	else if (KielHyreQuest >= 62) {
 		mes "[Fisherman]";
 		mes "Don't you remember";
@@ -6318,52 +5923,50 @@ yuno_fild12,232,222,0	script	Old Fisherman	709,{
 		mes "you check that place out?";
 		close;
 	}
-
 }
 
 //----------------------------------------------------------------------------
 // Kiel Hyre's hut; Wooden Board
 //----------------------------------------------------------------------------
-yuno_fild09,158,217,0	script	Wooden Board	111,{
+yuno_fild09,158,217,0	script	Wooden Board#kh	111,{
+	if (checkweight(7503,1) == 0) {
+		mes "^3355FFJust a second...";
+		mes "You're carrying too";
+		mes "many items with you";
+		mes "right now, so you'll";
+		mes "need to free up more";
+		mes "Inventory space first...^000000";
+		close;
+	}
 	if ((KielHyreQuest < 62) || (KielHyreQuest >= 64)) {
-		mes "^3355FFIt's a useless^000000";
-		mes "^3355FFwooden board^000000";
-		mes "^3355FFin the bushes.^000000";
+		mes "^3355FFIt's a useless";
+		mes "wooden board";
+		mes "in the bushes.^000000";
 		close;
 	}
-
 	else if (KielHyreQuest == 62) {
-		if (checkweight(7503,1) == 0) {
-			mes "^3355FF- Wait!! -";
-			mes "- You are carrying too many items";
-			mes "- and are unable to accept any more. -";
-			mes "- Please make some space avaliable";
-			mes "- in your inventory before returning. -^000000";
-			close;
-		}
-
-		mes "^000oFFYou found a long^000000";
-		mes "^3355FFwooden board carved^000000";
-		mes "^3355FFwith the initials, 'K.H.'^000000";
+		mes "^3355FFYou found a long";
+		mes "wooden board carved";
+		mes "with the initials, ''K.H.''^000000";
+		next;
 		next;
 		cutin "kh_kyel_port",2;
-		mes "^3355FFYou find a portrait of^000000";
-		mes "^3355FFa young man, that looks^000000";
-		mes "^3355FFlike a younger version^000000";
-		mes "^3355FFof Kiel Hyre, in a broken^000000";
-		mes "^3355FFpicture frame underneath^000000";
-		mes "^3355FFthe old wooden board.^000000";
+		mes "^3355FFYou find a portrait of";
+		mes "a young man, that looks";
+		mes "like a younger version";
+		mes "of Kiel Hyre, in a broken";
+		mes "picture frame underneath";
+		mes "the old wooden board.^000000";
 		set KielHyreQuest,64;
-		getitem 7503,1;	//Portrait_of_a_Guy
+		getitem 7503,1;	//Man_Portrait
 		next;
 		cutin "",255;
-		mes "^3355FFYou have enough^000000";
-		mes "^3355FFinformation by now,^000000";
-		mes "^3355FFso you should report^000000";
-		mes "^3355FFback to Mitchell.^000000";
+		mes "^3355FFYou have enough";
+		mes "information by now,";
+		mes "so you should report";
+		mes "back to Mitchell.^000000";
 		close;
 	}
-
 }
 
 //============================================================================
@@ -6373,7 +5976,7 @@ yuno_fild09,158,217,0	script	Wooden Board	111,{
 // Now, this area is not someplace you wanna slow down so
 // you can pick up dialog. I used packet logging to pull
 // what I could and for the sake of the two people with me,
-// did not bother doing all the proper proper NPC positioning
+// did not bother doing all the proper NPC positioning
 // or some of the 'error/wrong option' dialogs.
 // All the doors are kind of weird.
 //============================================================================
@@ -6381,7 +5984,7 @@ yuno_fild09,158,217,0	script	Wooden Board	111,{
 //----------------------------------------------------------------------------
 // Kiehl's Room; Receiver (Gives black keycards upon killing mobs)
 //----------------------------------------------------------------------------
-kh_kiehl01,17,39,0	script	Receiver	111,{
+kh_kiehl01,17,39,0	script	Receiver#kh	111,{
 	if (.KHKilled < 1) {
 		mes "^333333*BBBZZZ*^000000";
 		if (KielHyreQuest == 74) {
@@ -6418,24 +6021,20 @@ OnMyMobDead:
 //----------------------------------------------------------------------------
 // Kiehl's Room; Flower Vase (Gives...password...for Box)
 //----------------------------------------------------------------------------
-kh_kiehl01,13,40,0	script	Flower Vase	111,{
+kh_kiehl01,13,40,0	script	Flower Vase#kh1	111,{
 	if (KielHyreQuest < 74) {
 		mes "^3355FFYou found";
 		mes "a flower vase.^000000";
 		close;
 	}
-
 	if (KielHyreQuest >= 74) {
 		mes "^3355FFYou found";
 		mes "a flower vase.^000000";
 		next;
-
-		switch(select("Pick Up Vase","Break Vase","Turn Vase Upside-down")) {
-
+		switch(select("Pick Up Vase:Break Vase:Turn Vase Upside-down")) {
 		case 1:
 			mes "^3355FFThe vase is empty.^000000";
 			close;
-
 		case 2:
 			mes "^3355FFYou can't destroy";
 			mes "this vase, even by";
@@ -6444,7 +6043,6 @@ kh_kiehl01,13,40,0	script	Flower Vase	111,{
 			mes "specially manufactured by";
 			mes "the Rekenber Corporation.^000000";
 			close;
-
 		case 3:
 			mes "^3355FFThe following words";
 			mes "are written at the";
@@ -6456,56 +6054,78 @@ kh_kiehl01,13,40,0	script	Flower Vase	111,{
 			mes "The night eats the";
 			mes "pickled orange.''";
 			close;
-
 		}
-
 	}
-
+	else{
+		mes "^3355FFThe following words";
+		mes "are written at the";
+		mes "bottom of the vase.^000000";
+		next;
+		mes "[Vase Message]";
+		mes "''The rabbit often";
+		mes "observes the door.";
+		mes "The night eats the";
+		mes "pickled orange.''";
+		close;
+	}
 }
 
 
 //----------------------------------------------------------------------------
 // Kiehl's Room; Box
 //----------------------------------------------------------------------------
-kh_kiehl01,19,25,0	script	Box::BoxKHQ3	111,{
-	if (countitem(7505) < 1) {
-		if (checkweight(7505,1) == 0) {
-			mes "^3355FF- Wait!! -";
-			mes "- You are carrying too many items";
-			mes "- and are unable to accept any more. -";
-			mes "- Please make some space avaliable";
-			mes "- in your inventory before returning. -^000000";
-			close;
-		}
-
+kh_kiehl01,19,25,0	script	Box#kh1	111,{
+	if (checkweight(7505,1) == 0) {
+		mes "^3355FFJust a second...";
+		mes "You're carrying too";
+		mes "many items with you";
+		mes "right now, so you'll";
+		mes "need to free up more";
+		mes "Inventory space first...^000000";
+		close;
+	}
+	if (KielHyreQuest < 74) {
 		mes "^3355FFYou found a box with";
 		mes "a button for each letter";
 		mes "of the alphabet on top of it.^000000";
 		next;
-		input @KHInput$;
-		if (@KHInput$ == "open the door") {
-			mes "^3355FFAs soon as you enter the";
-			mes "password, the nearby door";
-			mes "emits a pleasant chiming";
-			mes "sound, and the box pops";
-			mes "open to reveal a small key.^000000";
-			getitem 7505,1; //Toy_Key
-			close;
+		input .@KHInput$;
+		mes "^3355FFNothing happened.^000000";
+		close;
+	}
+	if (KielHyreQuest >= 74) {
+		if (countitem(7505) < 1) {
+			mes "^3355FFYou found a box with";
+			mes "a button for each letter";
+			mes "of the alphabet on top of it.^000000";
+			next;
+			input .@KHInput$;
+			if (.@KHInput$ == "open the door") {
+				mes "^3355FFAs soon as you enter the";
+				mes "password, the nearby door";
+				mes "emits a pleasant chiming";
+				mes "sound, and the box pops";
+				mes "open to reveal a small key.^000000";
+				getitem 7505,1; //Toy_Key
+				close;
+			}
+			else {
+				mes "^3355FFNothing happened.^000000";
+				close;
+			}
 		}
-
 		else {
-			mes "^3355FFNothing happened.^000000";
+			mes "^3355FFThis is where you";
+			mes "found the Toy key^000000";
 			close;
 		}
-
 	}
-
-	else {
-		mes "^3355FFThis is where you";
-		mes "found the Toy key^000000";
+	else{
+		mes "^3355FFThe box is wide";
+		mes "open, and there";
+		mes "is nothing in it.^000000";
 		close;
 	}
-
 }
 
 //----------------------------------------------------------------------------
@@ -6520,14 +6140,14 @@ kh_kiehl01,44,33,0	script	Big Door#BigDoorKHQ1	111,{
 		mes "but there is a narrow";
 		mes "slot next to the doorknob.^000000";
 		next;
-		input @KHInput$;
-		if (@KHInput$ == "Black Keycard") {
+		input .@KHInput$;
+		if (.@KHInput$ == "Black Keycard") {
 			if (countitem(7506) >= 1) {
 				mes "^3355FFYou insert the";
 				mes "Black Keycard into the";
 				mes "slot, and successfully";
 				mes "unlock and open the door.^000000";
-				delitem 7506,1; //Black_Keycard
+				delitem 7506,1; //Black_Key_Card
 				donpcevent "Big_Door_1_Warp::OnEnable";
 				enablenpc "Big_Door_1_Warp";
 				set .KHDoor1Opened,1;
@@ -6535,7 +6155,6 @@ kh_kiehl01,44,33,0	script	Big Door#BigDoorKHQ1	111,{
 			}
 
 		}
-
 		mes "^3355FFYou try to push the";
 		mes "door open with all";
 		mes "your might, but fail";
@@ -6547,7 +6166,6 @@ kh_kiehl01,44,33,0	script	Big Door#BigDoorKHQ1	111,{
 		mes "^3355FFThe door is open.^000000";
 		close;
 	}
-
 }
 
 kh_kiehl01,43,33,0	script	Big_Door_1_Warp	45,1,1,{
@@ -6583,8 +6201,8 @@ kh_kiehl01,174,40,0	script	Big Door#BigDoorKHQ2	111,{
 		mes "but there is a small";
 		mes "keyhole next to the knob.^000000";
 		next;
-		input @KHInput$;
-		if (@KHInput$ == "Toy Key") {
+		input .@KHInput$;
+		if (.@KHInput$ == "Toy Key") {
 			if (countitem(7505) >= 1) {
 				mes "^3355FFYou insert the key into";
 				mes "the keyhole, and the door";
@@ -6598,20 +6216,16 @@ kh_kiehl01,174,40,0	script	Big Door#BigDoorKHQ2	111,{
 			}
 
 		}
-
 		mes "^3355FFYou try to push the";
 		mes "door open with all";
 		mes "your might, but fail";
 		mes "to make it budge.^000000";
 		close;
 	}
-
-
 	else {
 		mes "^3355FFThe door is open.^000000";
 		close;
 	}
-
 }
 
 kh_kiehl01,174,39,0	script	Big_Door_2_Warp	45,1,1,{
@@ -6647,14 +6261,14 @@ kh_kiehl01,77,108,0	script	Big Door#BigDoorKHQ3	111,{
 		mes "but there is a narrow";
 		mes "slot next to the doorknob.^000000";
 		next;
-		input @KHInput$;
-		if (@KHInput$ == "Black Keycard") {
+		input .@KHInput$;
+		if (.@KHInput$ == "Black Keycard") {
 			if (countitem(7506) >= 1) {
 				mes "^3355FFYou insert the";
 				mes "Black Keycard into the";
 				mes "slot, and successfully";
 				mes "unlock and open the door.^000000";
-				delitem 7506,1; //Black_Keycard
+				delitem 7506,1; //Black_Key_Card
 				donpcevent "Big_Door_3_Warp::OnEnable";
 				enablenpc "Big_Door_3_Warp";
 				set .KHDoor3Opened,1;
@@ -6662,19 +6276,16 @@ kh_kiehl01,77,108,0	script	Big Door#BigDoorKHQ3	111,{
 			}
 
 		}
-
 		mes "^3355FFYou try to push the";
 		mes "door open with all";
 		mes "your might, but fail";
 		mes "to make it budge.^000000";
 		close;
 	}
-
 	else {
 		mes "^3355FFThe door is open.^000000";
 		close;
 	}
-
 }
 
 kh_kiehl01,78,108,0	script	Big_Door_3_Warp	45,1,1,{
@@ -6710,21 +6321,20 @@ kh_kiehl01,42,177,0	script	Big Door#BigDoorKHQ4	111,{
 		mes "but there is a narrow";
 		mes "slot next to the doorknob.^000000";
 		next;
-		input @KHInput$;
-		if (@KHInput$ == "Black Keycard") {
+		input .@KHInput$;
+		if (.@KHInput$ == "Black Keycard") {
 			if (countitem(7506) >= 2) {
 				mes "^3355FFYou insert the";
 				mes "Black Keycard into the";
 				mes "slot, and successfully";
 				mes "unlock and open the door.^000000";
-				delitem 7506,2; //Black_Keycard
+				delitem 7506,2; //Black_Key_Card
 				donpcevent "Big_Door_4_Warp::OnEnable";
 				enablenpc "Big_Door_4_Warp";
 				set .KHDoor4Opened,1;
 				close;
 			}
 		}
-
 		mes "^3355FFYou try to push the";
 		mes "door open with all";
 		mes "your might, but fail";
@@ -6732,12 +6342,10 @@ kh_kiehl01,42,177,0	script	Big Door#BigDoorKHQ4	111,{
 		close;
 	}
 
-
 	else {
 		mes "^3355FFThe door is open.^000000";
 		close;
 	}
-
 }
 
 kh_kiehl01,41,177,0	script	Big_Door_4_Warp	45,1,1,{
@@ -6779,7 +6387,6 @@ kh_kiehl01,15,179,0	script	Robots#kh1	111,{
 		monster "kh_kiehl01",18,178,"Alicel",1739,1,"Robots#kh1::OnMyMobDead";
 		end;
 	}
-
 	else  {
 		end;
 	}
@@ -6820,7 +6427,7 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 			mes "you can hear the door";
 			mes "hinges slightly squeak.^000000";
 			next;
-			select("Push Door","Kick Door","Shake Door","Pull Door","Lift Door");
+			select("Push Door:Kick Door:Shake Door:Pull Door:Lift Door");
 			mes "^3355FFA group of monsters";
 			mes "suddenly appeared as";
 			mes "soon as you applied";
@@ -6828,17 +6435,16 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 			mes "This must be some";
 			mes "kind of security device.^000000";
 			close2;
-			set @KHDoorPushAttempt,@KHDoorPushAttempt+1;
+			set .@KHDoorPushAttempt,.@KHDoorPushAttempt+1;
 			monster "kh_kiehl01",163,183,"Alicel",1739,1;
 			monster "kh_kiehl01",163,179,"Aliot",1740,1;
 			monster "kh_kiehl01",169,183,"Alicel",1739,1;
 			monster "kh_kiehl01",169,179,"Aliot",1740,1;
-			if (@KHDoorPushAttempt >= 3) { 
+			if (.@KHDoorPushAttempt >= 3) { 
 				set KielHyreQuest,86; 
 			}
 			end;
 		}
-
 		else if ((KielHyreQuest > 84) && (KielHyreQuest < 94)) {
 			mes "^3355FFYou apply some";
 			mes "pressure to the door,";
@@ -6852,17 +6458,13 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 			mes "fully leveraged it, then you";
 			mes "should be able to open it.^000000";
 			next;
-
-			switch(select("Steel","Rusty Iron Piece","Solid Iron Piece","Iron Piece","Screw","Cancel")) {
-
+			switch(select("Steel:Rusty Iron Piece:Solid Iron Piece:Iron Piece:Screw:Cancel")) {
 			case 1:
-				set @KHPryingItem$,"Steel";
+				set .@KHPryingItem$,"Steel";
 				break;
-
 			case 2:
-				set @KHPryingItem$,"Rusty Iron Piece";
+				set .@KHPryingItem$,"Rusty Iron Piece";
 				break;
-
 			case 3:
 				if (countitem(7507) >= 1) {
 					if (KielHyreQuest < 92) {
@@ -6877,7 +6479,6 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 						delitem 7507,1; //Hard_Piece_of_Steel
 						close;
 					}
-
 					else if (KielHyreQuest == 92) {
 						mes "^3355FFWith a mighty heave,";
 						mes "you pry a Solid Iron";
@@ -6890,71 +6491,56 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 						delitem 7507,1; //Hard_Piece_of_Steel
 						close;
 					}
-
 				}
-
 				else {
 					mes "^3355FFIf only you had a Solid";
 					mes "Iron Piece you could use to";
 					mes "pry open this door.^000000";
 					close;
 				}
-
 			case 4:
-				set @KHPryingItem$,"Iron Piece";
+				set .@KHPryingItem$,"Iron Piece";
 				break;
-
 			case 5:
-				set @KHPryingItem$,"Screw";
+				set .@KHPryingItem$,"Screw";
 				break;
-
 			case 6:
 				mes "^3355FFLet's look for something";
 				mes "heavy we can use to pry";
 				mes "open this door.^000000";
 				close;
-
 			}
 
-			mes "^3355FFThis "+@KHPryingItem$+" is far";
+			mes "^3355FFThis "+.@KHPryingItem$+" is far";
 			mes "to weak for what you're using it for";
 			mes "and breaks.^000000";
 			close;
-
 		}
-
 		else if ((KielHyreQuest >= 94) && (KielHyreQuest <= 104)) {
 			if (.KHDoor5Opened == 0) {
 				mes "^3355FFThe large door";
 				mes "is wide open, and.";
 				mes "you may now enter.^000000";
 				next;
-
-				switch(select("Yes","No")) {
-
+				switch(select("Yes:No")) {
 				case 1:
 					close2;
 					donpcevent "Big_Door_5_Warp::OnEnable";
 					enablenpc "Big_Door_5_Warp";
 					set .KHDoor5Opened,1;
 					end;
-
 				case 2:
 					mes "^3355FFWho knows what is on the";
 					mes "other side of this door. Let's";
 					mes "think about it before barging in..^000000";
 					close;
-
 				}
 			}
-
 			else {
 				mes "^3355FFThe door is open.^000000";
 				close;
 			}
-
 		}
-
 		else {
 			mes "^3355FFThis large door..";
 			mes "is closed shut.";
@@ -6963,9 +6549,7 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 			mes "hinges slightly squeak.^000000";
 			close;
 		}
-
 	}
-
 	else {
 		mes "^3355FFThis large door..";
 		mes "is closed shut.";
@@ -6974,7 +6558,6 @@ kh_kiehl01,166,187,0	script	Big Door#BigDoorKHQ5	111,{
 		mes "hinges slightly squeak.^000000";
 		close;
 	}
-
 }
 
 kh_kiehl01,166,186,0	script	Big_Door_5_Warp	45,1,1,{
@@ -6997,7 +6580,6 @@ OnInit:
 	end;
 
 OnTouch:
-
 	if (KielHyreQuest >= 46)
 		warp "kh_kiehl02",50,7;
 	else
@@ -7017,7 +6599,7 @@ OnTouch:
 		set $@KHQuestBusy,1;
 		initnpctimer;
 		monster "kh_kiehl02",47,13,"Aliot",1740,1;
-		monster "kh_kiehl02",54,13,"Alicel",1739,1;
+		monster "kh_kiehl02",45,13,"Alicel",1739,1;
 		monster "kh_kiehl02",49,13,"Constant",1745,1;
 		monster "kh_kiehl02",51,13,"Aliot",1740,1;
 		monster "kh_kiehl02",53,13,"Alicel",1739,1;
@@ -7025,7 +6607,6 @@ OnTouch:
 	}
 	end;
 
-
 OnTimer300000:
 OnTimer600000:
 OnTimer900000:
@@ -7050,25 +6631,25 @@ OnGlobalTimerOff:
 // - Timer will drop to 3 minutes once Kiehl is defeated.
 //----------------------------------------------------------------------------
 kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
-	set @now_weight,MaxWeight-Weight;
-	if (@now_weight < 2000) {
-		mes "^3355FF- Wait!! -";
-		mes "- You are carrying too many items";
-		mes "- and are unable to accept any more. -";
-		mes "- Please make some space avaliable";
-		mes "- in your inventory before returning. -^000000";
+	if (checkweight(908,200) == 0) {
+		mes "^3355FFJust a second...";
+		mes "You're carrying too";
+		mes "many items with you";
+		mes "right now, so you'll";
+		mes "need to free up more";
+		mes "Inventory space first...^000000";
 		close;
 	}
-
 	cutin "kh_kiel01",2;
 	if ((KielHyreQuest < 94) || (KielHyreQuest >= 106)) {
 		mes "[Kiehl]";
+		mes "......";
 		mes ".........";
+		mes "............";
 		close2;
 		cutin "",255;
 		end;
 	}
-
 	if ((KielHyreQuest == 94) && (getvariableofnpc(.KHKilled,"KiehlRoom") < 5)) {
 		mes "[Kiehl]";
 		mes "I'm surprised you made";
@@ -7087,18 +6668,16 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		close2;
 		cutin "",255;
 		set getvariableofnpc(.KHKilled,"KiehlRoom"),0;
-		monster "kh_kiehl02",49,48,"Aliot",1740,1,"KiehlRoom::OnKiehlMobDead";
-		monster "kh_kiehl02",46,50,"Alicel",1739,1,"KiehlRoom::OnKiehlMobDead";
-		monster "kh_kiehl02",49,50,"Constant",1745,1,"KiehlRoom::OnKiehlMobDead";
-		monster "kh_kiehl02",53,53,"Aliot",1740,1,"KiehlRoom::OnKiehlMobDead";
-		monster "kh_kiehl02",49,55,"Alicel",1739,1,"KiehlRoom::OnKiehlMobDead";
-		monster "kh_kiehl02",49,53,"Constant",1745,1,"KiehlRoom::OnKiehlMobDead";
-		monster "kh_kiehl02",46,53,"Aliot",1740,1,"KiehlRoom::OnKiehlMobDead";
-		donpcevent "Kiehl#Original::OnChangeState";
-		disablenpc "Kiehl#Original";
+		monster "kh_kiehl02",50,52,"Aliot",1740,1,"KiehlRoom::OnKiehlMobDead";
+		monster "kh_kiehl02",50,52,"Alicel",1739,1,"KiehlRoom::OnKiehlMobDead";
+		monster "kh_kiehl02",50,52,"Constant",1745,1,"KiehlRoom::OnKiehlMobDead";
+		monster "kh_kiehl02",50,52,"Aliot",1740,1,"KiehlRoom::OnKiehlMobDead";
+		monster "kh_kiehl02",50,52,"Alicel",1739,1,"KiehlRoom::OnKiehlMobDead";
+		monster "kh_kiehl02",50,52,"Constant",1745,1,"KiehlRoom::OnKiehlMobDead";
+		monster "kh_kiehl02",50,52,"Aliot",1740,1,"KiehlRoom::OnKiehlMobDead";
+		hideonnpc "Kiehl#Original";
 		end;
 	}
-
 	else if ((KielHyreQuest == 94) && (getvariableofnpc(.KHKilled,"KiehlRoom") >= 5)) {
 		cutin "kh_kiel03",2;
 		mes "[Kiehl]";
@@ -7135,12 +6714,18 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		next;
 		mes "[Kiehl]";
 		mes "Robots don't naturally";
-		mes "feel pain or emotions.";
+		mes "feel pain or emotions...";
 		mes "Not unless they're specially";
 		mes "programmed. Sorry, but I don't";
 		mes "plans to stop what I'm doing.";
 		next;
 		cutin "kh_kiel04",2;
+		mes "[Kiehl]";
+		mes "I am sorry, but I don't have a plan to stop what I am doing.";
+		mes "Aside from that, my father showed me a great example of";
+		mes "how far a human could go for his own selfinishness by destroying a family.";
+		mes "And therefore I don't think that he could create better robots than mine.";
+		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Humankind may not be";
 		mes "perfect, but think about";
@@ -7172,11 +6757,11 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "survive. I returned to";
 		mes "Father and even got a";
 		mes "name. But yes, I know";
-		mes "how bad Rekenber really is.";
+		mes "how bad Rekenber really is...";
 		next;
 		mes "[Kiehl]";
 		mes "I don't... I don't want";
-		mes "to talk about this any more";
+		mes "to talk about this any more.";
 		mes "You've made me... Just leave.";
 		mes "I think I will let you live.";
 		next;
@@ -7187,18 +6772,14 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "under arrest for creating";
 		mes "and trading illegal weapons!";
 		set KielHyreQuest,100;
-		donpcevent "::OnKHAgent";
-		enablenpc "Mitchell#KiehlRoom";
-		enablenpc "Agent#KHAgent1";
-		enablenpc "Agent#KHAgent2";
-		enablenpc "Agent#KHAgent3";
-		enablenpc "Agent#KHAgent4";
+		hideoffnpc "Mitchell#KiehlRoom";
+		hideoffnpc "Agent#KHAgent1";
+		hideoffnpc "Agent#KHAgent2";
+		hideoffnpc "Agent#KHAgent3";
+		hideoffnpc "Agent#KHAgent4";
 		next;
-		goto L_Continue;
 	}
-
-	else if ((KielHyreQuest == 100) && (getvariableofnpc(.KHKilledBoss,"KiehlRoom") < 1)) {
-		L_Continue:
+	if ((KielHyreQuest == 100) && (getvariableofnpc(.KHKilledBoss,"KiehlRoom") < 1)) {
 		set getvariableofnpc(.KHKilledBoss,"KiehlRoom"),0;
 		cutin "kh_kiel01",2;
 		mes "[Kiehl]";
@@ -7207,7 +6788,7 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "this many guests before.";
 		mes "Well, I guess this means";
 		mes "we'll have to fight after";
-		mes "all, you and I. *Sigh* Pity...";
+		mes "all, you and I. *Sigh* Pity.";
 		next;
 		mes "[Kiehl]";
 		mes "First, in all fairness,";
@@ -7224,38 +6805,37 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		cutin "kh_kiel03",2;
 		mes "[Kiehl]";
 		mes "And now, you and I can";
-		mes "have a proper duel, human";
+		mes "have a proper duel, human.";
 		mes "I'm interested in seeing just";
 		mes "how strong you really are~";
 		close2;
 		cutin "",255;
 		monster "kh_kiehl02",50,52,"Kiehl",1733,1,"KiehlRoom::OnKiehlDead";
-		donpcevent "Kiehl#Original::OnChangeState";
-		disablenpc "Kiehl#Original";
+		hideonnpc "Kiehl#Original";
 		end;
 	}
-
 	else if ((KielHyreQuest == 100) && (getvariableofnpc(.KHKilledBoss,"KiehlRoom") == 1)) {
 		cutin "kh_kiel02",2;
 		mes "[Kiehl]";
 		mes "D-damn...!";
-		mes "Well played, adventurer";
+		mes "Well played, adventurer.";
 		mes "Well played. I should have";
 		mes "known that Father would send";
 		mes "the very best after me. Still,";
 		mes "you've failed to truly defeat me.";
 		next;
+		cutin "kh_kiel03",2;
 		mes "[Kiehl]";
 		mes "I still have a few";
 		mes "trump cards left";
 		mes "I think... I'll take you";
-		mes "to hell with me... Well";
+		mes "to hell with me... Well,";
 		mes "if robots can go there~";
-		announce "*Jeeeezzzgggg~ Geezzz~ Grrrr~ Clank~*",bc_map,0xFF0000;
 		next;
+		mapannounce "kh_kiehl02","*Jeeeezzzgggg~ Geezzz~ Grrrr~ Clank~*",bc_map,"0xFF0000";
 		mes "[Mitchell]";
 		mes "No...! We're locked";
-		mes "in the room! We're";
+		mes "in the room! We're...";
 		mes "We're trapped in here!";
 		next;
 		mes "[Kiehl]";
@@ -7270,9 +6850,7 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "Kiehl's power supply!";
 		mes "Hurry, use it right now!";
 		next;
-		delitem 7504,1; //Power_Source
-		announce "*Gzzzz~ Gzzzz~*",bc_map,0xFF0000;
-		next;
+		mapannounce "kh_kiehl02","*Gzzzz~ Gzzzz~*",bc_map,"0xFF0000";
 		mes "[Kiehl]";
 		mes "Wh-what? I c-can't";
 		mes "move! This day is just";
@@ -7288,14 +6866,12 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "[????]";
 		mes "I'm so disappointed...";
 		mes "I can't believe none";
-		mes "of you thought of this...";
+		mes "of you thought of this.";
 		next;
 		mes "[Mitchell]";
 		mes "Who are you...?";
 		mes "Show yourself!";
 		next;
-		donpcevent "Kiehl#Copy::OnChangeState";
-		enablenpc "Kiehl#Copy";
 		mes "[????]";
 		mes "Please.";
 		mes "Don't insult me.";
@@ -7304,10 +6880,12 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "you this entire time~";
 		next;
 		mes "[Mitchell]";
-		mes "Impossible!";
+		mes "Impossible...";
 		mes "How can there";
 		mes "be two of you...?!";
 		next;
+		hideoffnpc "Kiehl#Copy";
+		next;
 		cutin "kh_kiel01",0;
 		mes "[Kiehl]";
 		mes "Hahahahaha!";
@@ -7332,13 +6910,13 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "[Kiehl]";
 		mes "Well, I have a few";
 		mes "spies of my own...";
-		mes "I'll allow him to explain.";
+		mes "I'll allow him to explain...";
 		next;
 		mes "[Masked Man]";
 		mes "Mitchell...";
 		mes "I'm sorry that";
 		mes "you had to get";
-		mes "involved in all this.";
+		mes "involved in all this...";
 		next;
 		mes "[Mitchell]";
 		mes "Wolkeus? Wolkeus Kaiser?!";
@@ -7379,23 +6957,23 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		next;
 		mes "[Kiehl]";
 		mes "I'm curious as to what";
-		mes "the president's plans are";
+		mes "the president's plans are.";
 		mes "Mister Kaiser, if you'll";
-		mes "escort Ms. Layla, please.";
+		mes "escort Ms. Layla, please...";
 		next;
 		mes "[Wolkeus Kaiser]";
+		mes "...............................";
 		mes "Sorry, Mitchell.";
-		mes "I gotta do it...";
+		mes "I gotta do it.";
 		next;
 		mes "[Mitchell]";
 		mes "No, get away! Let me go!";
 		mes "Let go of me, Wolkeus!";
-		donpcevent "::OnKHAgent";
-		disablenpc "Mitchell#KiehlRoom";
-		disablenpc "Agent#KHAgent1";
-		disablenpc "Agent#KHAgent2";
-		disablenpc "Agent#KHAgent3";
-		disablenpc "Agent#KHAgent4";
+		hideonnpc "Mitchell#KiehlRoom";
+		hideonnpc "Agent#KHAgent1";
+		hideonnpc "Agent#KHAgent2";
+		hideonnpc "Agent#KHAgent3";
+		hideonnpc "Agent#KHAgent4";
 		next;
 		cutin "kh_kiel02",2;
 		mes "[Kiehl]";
@@ -7411,7 +6989,7 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "sent you here to get this.";
 		mes "Consider it my final gift";
 		mes "to him. I'm surprised he left";
-		mes "this ring inside me, though.";
+		mes "this ring inside me, though...";
 		next;
 		cutin "kh_kiel04",2;
 		mes "[Kiehl]";
@@ -7431,6 +7009,8 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "well for 23 years. I'll miss";
 		mes "it. Rest well, old Kiehl.";
 		next;
+		specialeffect EF_DEVIL;
+		next;
 		mes "[Kiehl]";
 		mes "Now, this was the body";
 		mes "that my father made.";
@@ -7462,37 +7042,38 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		mes "again, but who knows?";
 		mes "Anyway, I'll open up the";
 		mes "exit for you. Farewell~";
+		delitem 7504,1; //Toy_Motor
 		set KielHyreQuest,104;
+		hideonnpc "Kiehl#Copy";
 		donpcevent "Kiehl_Room_Exit::OnEnable";			
 		enablenpc "Kiehl_Room_Exit";
-		close2;
-		cutin "",255;
-		donpcevent "Kiehl#Copy::OnChangeState";
-		disablenpc "Kiehl#Copy";
 		initnpctimer;
-		end;
+		cutin "",255;
+		close;
 	}
-
 	if (KielHyreQuest == 104) {
 		cutin "kh_kiel02",2;
 		mes "^3355FFYou retrieve the";
 		mes "ring from the heart of";
 		mes "Kiehl's old robotic body.^000000";
-		getitem 7508,1; //Elisia's_Ring
 		set KielHyreQuest,106;
-		enablenpc "Kiehl_Room_Exit";
+		getitem 7508,1; //Elysia_Ring
 		close2;
 		cutin "",255;
 		end;
 	}
-
-	else {
-		mes "......";
+	else{
+		cutin "kh_kiel02",2;
+		mes "^3355FFKiehl's old";
+		mes "robotic body";
+		mes "stands alone,";
+		mes "lifeless and silent.^000000";
 		close2;
 		cutin "",255;
 		end;
 	}
 
+
 OnTimer180000:
 	stopnpctimer;
 	mapannounce "kh_kiehl02","Beeeeeeeeeeeeep~",bc_npc,0xFF0000;
@@ -7542,18 +7123,6 @@ OnTimer60000:
 OnTimer1000:
 	mapannounce "kh_kiehl02","3 minutes remaining until detonation.",bc_npc,0xFF0000;
 	end;
-
-OnChangeState:
-	misceffect 215;
-	end;
-
-OnInit:
-	disablenpc "Mitchell#KiehlRoom";
-	disablenpc "Agent#KHAgent1";
-	disablenpc "Agent#KHAgent2";
-	disablenpc "Agent#KHAgent3";
-	disablenpc "Agent#KHAgent4";
-	end;
 }
 
 //----------------------------------------------------------------------------
@@ -7565,15 +7134,13 @@ kh_kiehl02,1,1,0	script	KiehlRoom	-1,{
 OnKiehlMobDead:
 	set .KHKilled,.KHKilled+1;
 	if (.KHKilled == 5) { 
-		donpcevent "Kiehl#Original::OnChangeState";
-		enablenpc "Kiehl#Original"; 
+		hideoffnpc "Kiehl#Original"; 
 	}
 	end;
 
 OnKiehlDead:
 	set .KHKilledBoss,1;
-	donpcevent "Kiehl#Original::OnChangeState";
-	enablenpc "Kiehl#Original";
+	hideoffnpc "Kiehl#Original";
 	end;
 	
 OnReset:
@@ -7582,13 +7149,13 @@ OnReset:
 		mapwarp "kh_kiehl02","lighthalzen",192,200;
 	killmonsterall "kh_kiehl02";
 	disablenpc "Kiehl_Room_Exit";
-	disablenpc "Mitchell#KiehlRoom";
-	disablenpc "Agent#KHAgent1";
-	disablenpc "Agent#KHAgent2";
-	disablenpc "Agent#KHAgent3";
-	disablenpc "Agent#KHAgent4";
-	disablenpc "Kiehl#Copy";
-	enablenpc "Kiehl#Original"; 
+	hideonnpc "Mitchell#KiehlRoom";
+	hideonnpc "Agent#KHAgent1";
+	hideonnpc "Agent#KHAgent2";
+	hideonnpc "Agent#KHAgent3";
+	hideonnpc "Agent#KHAgent4";
+	hideonnpc "Kiehl#Copy";
+	hideoffnpc "Kiehl#Original"; 
 	set .KHKilledBoss,0;
 	set .KHKilled,0;
 	set getvariableofnpc(.KHTrapSprung,"Kiehl_Room_Trap"),0;
@@ -7599,11 +7166,21 @@ OnReset:
 //----------------------------------------------------------------------------
 // Kiehl's Room; Mitchell and Agents. (Floating NPC + Duplicates)
 //----------------------------------------------------------------------------
--	script	Agent#KHAgent1::KHAgent	-1,{
+kh_kiehl02,49,55,6	script	Mitchell#KiehlRoom	727,{
+	end;
+OnInit:
+	hideonnpc "Mitchell#KiehlRoom";
 	end;
 
-OnKHAgent:
-	misceffect 215;
+OnKHSpiderWeb:
+	misceffect 404;
+	end;
+}
+
+kh_kiehl02,53,52,4	script	Agent#KHAgent1	880,{
+	end;
+OnInit:
+	hideonnpc "Agent#KHAgent1";
 	end;
 
 OnKHSpiderWeb:
@@ -7611,16 +7188,38 @@ OnKHSpiderWeb:
 	end;
 }
 
+kh_kiehl02,51,49,1	script	Agent#KHAgent2	880,{
+	end;
+OnInit:
+	hideonnpc "Agent#KHAgent2";
+	end;
 
-kh_kiehl02,49,55,6	duplicate(KHAgent)	Mitchell#KiehlRoom	727
+OnKHSpiderWeb:
+	misceffect 404;
+	end;
+}
 
-kh_kiehl02,53,52,4	duplicate(KHAgent)	Agent#KHAgent1	880
+kh_kiehl02,47,50,0	script	Agent#KHAgent3	880,{
+	end;
+OnInit:
+	hideonnpc "Agent#KHAgent3";
+	end;
 
-kh_kiehl02,51,49,1	duplicate(KHAgent)	Agent#KHAgent2	880
+OnKHSpiderWeb:
+	misceffect 404;
+	end;
+}
 
-kh_kiehl02,47,50,0	duplicate(KHAgent)	Agent#KHAgent3	880
+kh_kiehl02,46,53,6	script	Agent#KHAgent4	880,{
+	end;
+OnInit:
+	hideonnpc "Agent#KHAgent4";
+	end;
 
-kh_kiehl02,46,53,6	duplicate(KHAgent)	Agent#KHAgent4	880
+OnKHSpiderWeb:
+	misceffect 404;
+	end;
+}
 
 
 //----------------------------------------------------------------------------
@@ -7629,12 +7228,8 @@ kh_kiehl02,46,53,6	duplicate(KHAgent)	Agent#KHAgent4	880
 kh_kiehl02,48,53,6	script	Kiehl#Copy	902,{
 	end;
 
-OnChangeState:
-	misceffect 215;
-	end;
-
 OnInit:
-	disablenpc "Kiehl#Copy";
+	hideonnpc "Kiehl#Copy";
 	end;
 }
 
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 9a18248c8..362761ab8 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -28,6 +28,7 @@
 //= 2.0 Turtle Island quest now clears TURTLE var and set 
 //= MISC_QUEST bit (MISC_QUEST & 65536) [Lupus]
 //= 2.1 Added missing close. [L0ne_W0lf]
+//= 2.2 Updated Gotan to be compliant with misc_quiest var. [L0ne_W0lf
 //============================================================ 
 
 
@@ -991,7 +992,7 @@ alberta_in,23,104,4	script	Grandpa Turtle#tur	120,{
 }
 
 alberta,247,122,4	script	Sailor#tur	709,{
-	if (TURTLE) {
+	if (TURTLE || (MISC_QUEST & 65536)) {
 		mes "[Gotanblue]";
 		mes "Heh...";
 		mes "Your eyes...";
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index b1ae1022f..4b91a751a 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= sabernet09 & eAthena Team
 //===== Current Version: ===================================== 
-//= 2.1
+//= 2.2
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -35,6 +35,7 @@
 //= than a stone at once, up to 10. [SinSloth]
 //= 2.0 Updated hack check and added a weight check to dismantling. [SinSloth]
 //= 2.1 Rescripted to Aegis 10.3 standards. Added strange quest. [L0ne_W0lf]
+//= 2.2 Readded the ability to dismantle multiple stones at once. [L0ne_W0lf]
 //============================================================ 
 
 //==============================================================================
@@ -365,6 +366,15 @@ um_in,39,122,5	script	Utan Chief	784,{
 //                    Create Essence/Dismantle Stone
 //=====================================================================
 um_in,44,71,2	script	Utan Shaman	782,{
+	if (checkweight(908,600) == 0) {
+		mes "^3355FFWait a second!";
+		mes "Right now, you're carrying";
+		mes "too many things with you.";
+		mes "Please come back after";
+		mes "using the Kafra Service";
+		mes "to store some of your items.^000000";
+		close;
+	}	
 	switch(event_umbala) {
 	default:	
 		mes "[??????????]";
@@ -607,7 +617,7 @@ um_in,44,71,2	script	Utan Shaman	782,{
 			case 990:
 				mes "Fire property...";
 				mes "I will need natural";
-					mes "objects that are filled with";
+				mes "objects that are filled with";
 				mes "the spirit of fire.";
 				next;
 				mes "[Puchuchartan]";
@@ -681,150 +691,129 @@ um_in,44,71,2	script	Utan Shaman	782,{
 			set .@divide,996; //Rough_Wind
 			break;
 		}
-		if (countitem(.@divide) > 0) {
-			mes "[Puchuchartan]";
-			mes "Let me try to return the enchanted";
-			mes "stone to its rough form...";
-			mes "Choose a number from 1 to 9.";
-			mes "If you wish to cancel this";
-			mes "request, enter 0.";
-			next;
-			while(1) {
-				input .@input,0,10;
-				if (.@input == 0) {
+		mes "[Puchuchartan]";
+		mes "Please enter the";
+		mes "number of enchanted";
+		mes "stones that you wish";
+		mes "to divide. I can only";
+		mes "divide up to 10 at a time.";
+		next;
+		input .@input,0,11;
+		if ((.@input > 0) && (.@input < 11)) {
+			if (countitem(.@divide) >= .@input) {
+				if (checkweight(.@divide,.@input * 300) == 0) {
 					mes "[Puchuchartan]";
-					mes "I see. It's your call.";
-					mes "Come back when you need me.";
+					mes "You're carrying too";
+					mes "many items right now.";
+					mes "Put some of your stuff";
+					mes "in Kafra Storage, and then";
+					mes "come back to me, okay?";
 					close;
 				}
-				else if (.@input > 9) {
-					mes "[Puchuchartan]";
-					mes "Remember to choose a number";
-					mes "from 1 to 9.";
-					next;
-				}
-				else {
-					break;
-				}
-			}
-			mes "[Puchuchartan]";
-			mes "I will now cast a sacred";
-			mes "incantation. Remember the number you entered.";
-			next;
-			mes "[Puchuchartan]";
-			mes "Umba Umba Kalapum! Umba! Ta!";
-			mes "Lukura Ukulele Um! Umba! Ka!";
-			mes "Abulaka Tabulakan! Umba! La!";
-			mes "Ombaludu Zan Kunu! Umba! Ku!";
-			mes "Kum Tum Lakulakun! Umba! Ha!";
-			next;
-			mes "[Puchuchartan]";
-			mes "Here's the rough enchanted stones";
-			mes "you wished to have. I created this";
-			mes "with a lot of effort, so make good";
-			mes "use of them.";
-			delitem .@divide,1;
-			switch(.@divide) {
-			case 994:
-				set .@shaman_p,rand(1,10);
-				if (.@shaman_p == 1) {
-					getitem 990,10; //Boody_Red
-				}
-				else if (.@shaman_p == 2 || .@shaman_p == 3) {
-					getitem 990,8; //Boody_Red
-				}
-				else if (.@shaman_p >= 4 && .@shaman_p == 6) {
-					getitem 990,7; //Boody_Red
-				}
-				else {
-					getitem 990,6; //Boody_Red
-				}
-				close;
-			case 995:
-				set .@shaman_p,rand(1,10);
-				if (.@shaman_p == 1) {
-					getitem 991,10; //Crystal_Blue
-				}
-				else if (.@shaman_p == 2 || .@shaman_p == 3) {
-					getitem 991,8; //Crystal_Blue
-				}
-				else if (.@shaman_p >= 4 && .@shaman_p <= 6) {
-					getitem 991,7; //Crystal_Blue
-				}
-				else {
-					getitem 991,6; //Crystal_Blue
-				}
-				close;
-			case 996:
-				set .@shaman_p,rand(1,10);
-				if (.@shaman_p == 1) {
-					if (rand(1,2) == 1) {
-						getitem 992,10; //Wind_Of_Verdure
+				mes "[Puchuchartan]";
+				mes "I'll try to revert these";
+				mes "enchanted stones to their";
+				mes "rough forms. Enter a number";
+				mes "from 1 to 9, or enter 0 if";
+				mes "you decide to cancel.";
+				next;
+				while(1) {
+					input .@input2,0,10;
+					if (.@input2 == 0) {
+						mes "[Puchuchartan]";
+						mes "You want to cancel?";
+						mes "Well, if you change your";
+						mes "mind, feel free to come";
+						mes "ask me to help at any time.";
+						close;
+					}
+					else if (.@input2 > 9) {
+						mes "[Puchuchartan]";
+						mes "Hm? You need to enter";
+						mes "a number from 1 to 9.";
+						next;
 					}
 					else {
-						getitem 992,6; //Wind_Of_Verdure
+						break;
 					}
 				}
-				else if (.@shaman_p == 2 || .@shaman_p == 3) {
-					getitem 992,8; //Wind_Of_Verdure
-				}
-				else if (.@shaman_p >= 4 && .@shaman_p == 6) {
-					getitem 992,7; //Wind_Of_Verdure
-				}
-				else {
-					getitem 992,6; //Wind_Of_Verdure
-				}
-				close;
-			case 997: 
-				set .@shaman_p,rand(1,5);
-				if (.@shaman_p == 1) {
-					getitem 993,10; //Yellow_Live
-				}
-				else if (.@shaman_p == 2) {
-					getitem 993,8; //Yellow_Live
-				}
-				else if (.@shaman_p >= 3 || .@shaman_p <= 4) {
-					getitem 993,7; //Yellow_Live
-				}
-				else {
-					if (rand(1,2) == 1) {
-						getitem 993,6; //Yellow_Live
+				mes "[Puchuchartan]";
+				mes "I will now chant the";
+				mes "sacred words. Remember";
+				mes "the number you entered!";
+				next;
+				mes "[Puchuchartan]";
+				mes "Umba Umba Kalapum! Umba! Ta!";
+				mes "Lukura Ukulele Um! Umba! Ka!";
+				mes "Abulaka Tabulakan! Umba! La!";
+				mes "Ombaludu Zan Kunu! Umba! Ku!";
+				mes "Kum Tum Lakulakun! Umba! Ha!";
+				next;
+				mes "[Puchuchartan]";
+				mes "Here's the rough enchanted stones";
+				mes "you wished to have. I created this";
+				mes "with a lot of effort, so make good";
+				mes "use of them.";
+				while(1) {
+					if (.@sha_man == .@input) {
+						break;
 					}
 					else {
-						getitem 993,7; //Yellow_Live
+						set .@shaman_max,.@shaman_max + rand(6,10);
+						set .@sha_man,.@sha_man + 1;
 					}
 				}
+				switch(.@divide) {
+				case 994:
+					getitem 990,.@shaman_max; //Boody_Red
+					break;
+				case 995:
+					getitem 991,.@shaman_max; //Crystal_Blue
+					break;
+				case 996:
+					getitem 992,.@shaman_max; //Wind_Of_Verdure
+					break;
+				case 997: 
+					getitem 993,.@shaman_max; //Yellow_Live
+				}
+				delitem .@divide,.@input;
+				close;
+			}
+			else {
+				mes "[Puchuchartan]";
+				mes "So, you wish to have rough";
+				switch(.@divide) {
+				case 994:
+					mes "fire stones? Then I will need";
+					mes "you to bring "+input_want+" pure fire stone.";
+					break;
+				case 995:
+					mes "water stones? Then I'll need";
+					mes "you to bring "+input_want+" pure water stone.";
+					break;
+				case 996:
+					mes "wind stones? Then I will need";
+					mes "you to bring "+input_want+" pure wind stone.";
+					break;
+				case 997: 
+					mes "earth stones? Then I'll need";
+					mes "you to bring "+.@input+" pure earth stone.";
+					break;
+				}
+				mes "^3377FF1 "+.@input+" "+getitemname(.@divide)+"^000000.";
+				next;
+				mes "[Puchuchartan]";
+				mes "That's all I need...";
+				mes "Come back when";
+				mes "you're ready.";
+				mes "I will be here.";
 				close;
 			}
 		}
 		else {
 			mes "[Puchuchartan]";
-			mes "So, you wish to have rough";
-			switch(.@divide) {
-			case 994:
-				mes "fire stones? Then I will need";
-				mes "you to bring a pure fire stone.";
-				break;
-			case 995:
-				mes "water stones? Then I'll need";
-				mes "you to bring a pure water stone.";
-				break;
-			case 996:
-				mes "wind stones? Then I will need";
-				mes "you to bring a pure wind stone.";
-				break;
-			case 997: 
-				mes "earth stones? Then I'll need";
-				mes "you to bring a pure earth stone.";
-				break;
-			}
-			mes "^3377FF1 "+getitemname(.@divide)+"^000000.";
-			next;
-			mes "[Puchuchartan]";
-			mes "That's all I need...";
-			mes "Come back when";
-			mes "you're ready.";
-			mes "I will be here.";
+			mes "Hm? You need to enter";
+			mes "a number from 1 to 10.";
 			close;
 		}
 	case 3: