diff --git a/azumauindo/suno-yamatoshi/temples/ruggilli2 b/azumauindo/suno-yamatoshi/temples/ruggilli2
index 840556821..7f7186c25 100644
--- a/azumauindo/suno-yamatoshi/temples/ruggilli2
+++ b/azumauindo/suno-yamatoshi/temples/ruggilli2
@@ -9,25 +9,22 @@ enter_x 7
 enter_y 14
 msg
 Created:  2005-03-12 MikeeUSA
-Modified: 2008-10-25 Rick Tanner
+Modified: 2011-10-26 Rick Tanner
 endmsg
 end
 arch blocked
 name nothing
-name_pl nothing
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 1
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 2
 move_block 0
 blocksview 0
@@ -37,14 +34,12 @@ y 2
 end
 arch blocked
 name nothing
-name_pl nothing
 y 3
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 4
 move_block 0
 blocksview 0
@@ -54,28 +49,24 @@ y 4
 end
 arch blocked
 name nothing
-name_pl nothing
 y 5
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 6
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 7
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 8
 move_block 0
 blocksview 0
@@ -85,35 +76,30 @@ y 8
 end
 arch blocked
 name nothing
-name_pl nothing
 y 9
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 10
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 11
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 12
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 13
 move_block 0
 blocksview 0
@@ -123,21 +109,18 @@ y 13
 end
 arch blocked
 name nothing
-name_pl nothing
 y 14
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 y 15
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 move_block 0
 blocksview 0
@@ -152,7 +135,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 1
 move_block 0
@@ -168,7 +150,6 @@ y 2
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 2
 move_block 0
@@ -184,7 +165,6 @@ y 3
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 3
 move_block 0
@@ -200,7 +180,6 @@ y 4
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 4
 move_block 0
@@ -216,7 +195,6 @@ y 5
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 5
 move_block 0
@@ -232,7 +210,6 @@ y 6
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 6
 move_block 0
@@ -248,7 +225,6 @@ y 7
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 7
 move_block 0
@@ -264,7 +240,6 @@ y 8
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 8
 move_block 0
@@ -280,7 +255,6 @@ y 9
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 9
 move_block 0
@@ -296,7 +270,6 @@ y 10
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 10
 move_block 0
@@ -312,7 +285,6 @@ y 11
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 11
 move_block 0
@@ -328,7 +300,6 @@ y 12
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 12
 move_block 0
@@ -344,7 +315,6 @@ y 13
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 13
 move_block 0
@@ -360,7 +330,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 14
 move_block 0
@@ -368,7 +337,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 1
 y 15
 move_block 0
@@ -376,7 +344,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 2
 move_block 0
 blocksview 0
@@ -394,7 +361,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 2
 y 1
 move_block 0
@@ -522,7 +488,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 2
 y 14
 move_block 0
@@ -530,7 +495,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 2
 y 15
 move_block 0
@@ -538,7 +502,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 3
 move_block 0
 blocksview 0
@@ -553,7 +516,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 3
 y 1
 move_block 0
@@ -669,7 +631,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 3
 y 14
 move_block 0
@@ -677,7 +638,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 3
 y 15
 move_block 0
@@ -689,7 +649,6 @@ y 15
 end
 arch blocked
 name nothing
-name_pl nothing
 x 4
 move_block 0
 blocksview 0
@@ -704,7 +663,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 4
 y 1
 move_block 0
@@ -840,7 +798,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 4
 y 14
 move_block 0
@@ -848,7 +805,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 4
 y 15
 move_block 0
@@ -856,7 +812,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 5
 move_block 0
 blocksview 0
@@ -874,7 +829,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 5
 y 1
 move_block 0
@@ -906,7 +860,6 @@ y 4
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 5
 y 4
@@ -973,7 +926,6 @@ y 11
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 5
 y 11
@@ -1004,7 +956,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 5
 y 14
 move_block 0
@@ -1012,7 +963,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 5
 y 15
 move_block 0
@@ -1020,7 +970,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 6
 move_block 0
 blocksview 0
@@ -1035,7 +984,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 6
 y 1
 move_block 0
@@ -1067,7 +1015,6 @@ y 4
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 6
 y 4
@@ -1130,7 +1077,6 @@ y 11
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 6
 y 11
@@ -1161,7 +1107,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 6
 y 14
 move_block 0
@@ -1169,7 +1114,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 6
 y 15
 move_block 0
@@ -1177,7 +1121,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 7
 move_block 0
 blocksview 0
@@ -1192,7 +1135,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 7
 y 1
 move_block 0
@@ -1224,7 +1166,6 @@ y 4
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 7
 y 4
@@ -1246,7 +1187,6 @@ y 5
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 7
 y 5
@@ -1297,7 +1237,6 @@ y 10
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 7
 y 10
@@ -1316,7 +1255,6 @@ y 11
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 7
 y 11
@@ -1351,7 +1289,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 7
 y 14
 move_block 0
@@ -1359,7 +1296,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 7
 y 15
 move_block 0
@@ -1367,7 +1303,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 8
 move_block 0
 blocksview 0
@@ -1382,7 +1317,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 8
 y 1
 move_block 0
@@ -1418,7 +1352,6 @@ y 4
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 8
 y 4
@@ -1440,7 +1373,6 @@ y 5
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 8
 y 5
@@ -1487,7 +1419,6 @@ y 10
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 8
 y 10
@@ -1502,7 +1433,6 @@ y 11
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 8
 y 11
@@ -1533,7 +1463,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 8
 y 14
 move_block 0
@@ -1541,7 +1470,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 8
 y 15
 move_block 0
@@ -1549,7 +1477,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 9
 move_block 0
 blocksview 0
@@ -1567,7 +1494,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 9
 y 1
 move_block 0
@@ -1599,7 +1525,6 @@ y 4
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 9
 y 4
@@ -1670,7 +1595,6 @@ y 11
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 9
 y 11
@@ -1705,7 +1629,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 9
 y 14
 move_block 0
@@ -1713,7 +1636,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 9
 y 15
 move_block 0
@@ -1721,7 +1643,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 10
 move_block 0
 blocksview 0
@@ -1736,7 +1657,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 10
 y 1
 move_block 0
@@ -1772,7 +1692,6 @@ y 4
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 10
 y 4
@@ -1839,7 +1758,6 @@ y 11
 end
 arch flagstone
 name floor
-name_pl floor
 face shop_empty.111
 x 10
 y 11
@@ -1870,7 +1788,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 10
 y 14
 move_block 0
@@ -1878,7 +1795,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 10
 y 15
 move_block 0
@@ -1890,7 +1806,6 @@ y 15
 end
 arch blocked
 name nothing
-name_pl nothing
 x 11
 move_block 0
 blocksview 0
@@ -1905,7 +1820,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 11
 y 1
 move_block 0
@@ -2029,7 +1943,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 11
 y 14
 move_block 0
@@ -2037,7 +1950,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 11
 y 15
 move_block 0
@@ -2045,7 +1957,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 12
 move_block 0
 blocksview 0
@@ -2060,7 +1971,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 12
 y 1
 move_block 0
@@ -2180,7 +2090,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 12
 y 14
 move_block 0
@@ -2188,7 +2097,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 12
 y 15
 move_block 0
@@ -2196,7 +2104,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 13
 move_block 0
 blocksview 0
@@ -2214,7 +2121,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 13
 y 1
 move_block 0
@@ -2334,7 +2240,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 13
 y 14
 move_block 0
@@ -2342,7 +2247,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 13
 y 15
 move_block 0
@@ -2350,7 +2254,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 move_block 0
 blocksview 0
@@ -2365,7 +2268,6 @@ y 1
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 1
 move_block 0
@@ -2381,7 +2283,6 @@ y 2
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 2
 move_block 0
@@ -2397,7 +2298,6 @@ y 3
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 3
 move_block 0
@@ -2413,7 +2313,6 @@ y 4
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 4
 move_block 0
@@ -2429,7 +2328,6 @@ y 5
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 5
 move_block 0
@@ -2445,7 +2343,6 @@ y 6
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 6
 move_block 0
@@ -2461,7 +2358,6 @@ y 7
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 7
 move_block 0
@@ -2477,7 +2373,6 @@ y 8
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 8
 move_block 0
@@ -2493,7 +2388,6 @@ y 9
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 9
 move_block 0
@@ -2509,7 +2403,6 @@ y 10
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 10
 move_block 0
@@ -2525,7 +2418,6 @@ y 11
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 11
 move_block 0
@@ -2541,7 +2433,6 @@ y 12
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 12
 move_block 0
@@ -2557,7 +2448,6 @@ y 13
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 13
 move_block 0
@@ -2573,7 +2463,6 @@ y 14
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 14
 move_block 0
@@ -2581,7 +2470,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 14
 y 15
 move_block 0
@@ -2593,14 +2481,12 @@ y 15
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 move_block 0
 blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 1
 move_block 0
@@ -2608,7 +2494,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 2
 move_block 0
@@ -2620,7 +2505,6 @@ y 2
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 3
 move_block 0
@@ -2628,7 +2512,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 4
 move_block 0
@@ -2636,7 +2519,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 5
 move_block 0
@@ -2644,7 +2526,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 6
 move_block 0
@@ -2656,7 +2537,6 @@ y 6
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 7
 move_block 0
@@ -2664,7 +2544,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 8
 move_block 0
@@ -2672,7 +2551,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 9
 move_block 0
@@ -2680,7 +2558,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 10
 move_block 0
@@ -2688,7 +2565,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 11
 move_block 0
@@ -2696,7 +2572,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 12
 move_block 0
@@ -2704,7 +2579,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 13
 move_block 0
@@ -2716,7 +2590,6 @@ y 13
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 14
 move_block 0
@@ -2724,7 +2597,6 @@ blocksview 0
 end
 arch blocked
 name nothing
-name_pl nothing
 x 15
 y 15
 move_block 0