5 files changed, 32 insertions, 9 deletions
diff --git a/npc/009-1/guards.txt b/npc/009-1/guards.txt
index bb6260046..9ad87b43c 100644
--- a/npc/009-1/guards.txt
+++ b/npc/009-1/guards.txt
@@ -179,7 +179,7 @@ OnInit:
     .distance = 4;
 
     // Check items.xml for info about this.
-    .@npcId = getnpcid(.name$);
+    .@npcId = getnpcid();
     setunitdata(.@npcId, UDT_HEADTOP, Bull);
     setunitdata(.@npcId, UDT_HEADMIDDLE, LieutenantArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index 0fffaaa50..701135f34 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -37,6 +37,11 @@ L_Quest:
     if (.@q == 8 && BaseLevel >= 36) @fc=9;
     if (.@q == 9 && BaseLevel >= 38) @fc=10;
     if (.@q == 10 && BaseLevel >= 40) @fc=11;
+    if (.@q == 11 && BaseLevel >= 42) @fc=12;
+    if (.@q == 12 && BaseLevel >= 44) @fc=13;
+    if (.@q == 13 && BaseLevel >= 46) @fc=14;
+    if (.@q == 14 && BaseLevel >= 48) @fc=15;
+    if (.@q == 15 && BaseLevel >= 50) @fc=16;
     if (@fc)
         goto L_Assign;
     mesn;
@@ -70,6 +75,11 @@ L_Assign:
             case 9: @xp=5303; break;
             case 10: @xp=6532; break;
             case 11: @xp=10234; break;
+            case 12: @xp=12630; break;
+            case 13: @xp=15908; break;
+            case 14: @xp=19212; break;
+            case 15: @xp=22792; break;
+            case 16: @xp=34577; break;
         }
         getexp @xp, @fc*3;
         Zeny=Zeny+@fc*15+@fc;
diff --git a/npc/020-1/guards.txt b/npc/020-1/guards.txt
index 15d8b2122..b9344d6aa 100644
--- a/npc/020-1/guards.txt
+++ b/npc/020-1/guards.txt
@@ -134,6 +134,18 @@ OnTimer690000:
     end;
 
 OnInit:
+    .sex = G_MALE;
+    .distance = 4;
+
+    // Check items.xml for info about this.
+    .@npcId = getnpcid();
+    setunitdata(.@npcId, UDT_HEADTOP, Bull);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, LieutenantArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
+    setunitdata(.@npcId, UDT_SHIELD, LousyMoccasins);    // TODO FIXME: Display Boots
+    setunitdata(.@npcId, UDT_WEAPON, Backsword);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 12);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 15);
     end;
 
 
diff --git a/npc/commands/ucp.txt b/npc/commands/ucp.txt
index 04743f0f5..87e5bfc64 100644
--- a/npc/commands/ucp.txt
+++ b/npc/commands/ucp.txt
@@ -164,6 +164,13 @@ function	script	UserCtrlPanel	{
                 mes "";
 
                 switch (@menu) {
+                    case 1:
+                        // Update savepoint if needed
+                        if (@unsaved) {
+                            if (!GSET_SOULMENHIR_MANUAL) savepoint "000-1", 22, 22;
+                            else doevent "Emergency Exit::OnSetLX";
+                        }
+                        break;
                     case 2:
                         GSET_SOULMENHIR_MANUAL=!GSET_SOULMENHIR_MANUAL;
                         @unsaved=true;
@@ -176,13 +183,7 @@ function	script	UserCtrlPanel	{
                 clear;
               } while (@menu != 1);
             break;
-            case 8:
-                // Update savepoint if needed
-                if (@unsaved) {
-                    if (!GSET_SOULMENHIR_MANUAL) savepoint "000-1", 22, 22;
-                    else doevent "Emergency Exit::OnSetLX";
-                }
-                close; break;
+            case 8: close; break;
         }
     } while (1);
 }
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index 83a02fecd..74824d5f3 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -121,7 +121,7 @@ OnMinute45:
         if (.@mk & MASK_EVILSANCTUM)
             .@mk=.@mk^MASK_EVILSANCTUM;
 
-        // Monster King Sieges
+        // Monster King Sieges (can be weird, siege last 10mn and mask last 15)
         if ($@MK_SCENE)
             .@mk=.@mk|MASK_EVILSANCTUM;
         if (.@mk & (MASK_MATTACK|MASK_EVILSANCTUM))