--- a/data/game.json	Sun Apr 10 00:11:18 2011 +0200
+++ b/data/game.json	Sun Apr 10 00:14:30 2011 +0200
@@ -51,11 +51,11 @@
         "salmon": { "type": "Salmon", "level": "_limbo", "pos": [1, 3] },
         "no_mask": { "type": "NoMask", "level": "theatre", "pos": [10, 10], "broken": false },
         "no_costume": { "type": "NoCostume", "level": "theatre", "pos": [13, 10] },
-        "haiku1": { "type": "HaikuScroll", "level": "temple", "pos": [14, 16], "text": "remaining in it?" },
-        "haiku2": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "the end of autumn." },
-        "haiku3": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "with no leaves to blow." },
-        "haiku4": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "and it passes by." },
-        "haiku5": { "type": "HaikuScroll", "level": "_limbo", "pos": [0, 0], "text": "the Galaxy." },
+        "haiku1": { "type": "HaikuScroll", "level": "temple", "pos": [6, 4], "text": "remaining in it?" },
+        "haiku2": { "type": "HaikuScroll", "level": "town", "pos": [72, 17], "text": "the end of autumn." },
+        "haiku3": { "type": "HaikuScroll", "level": "geisha_room", "pos": [1, 13], "text": "with no leaves to blow." },
+        "haiku4": { "type": "HaikuScroll", "level": "market", "pos": [21, 4], "text": "and it passes by." },
+        "haiku5": { "type": "HaikuScroll", "level": "town", "pos": [1, 2], "text": "the Galaxy." },
         "aburage_00": { "type": "Aburage", "level": "temple", "pos": [18, 5] },
         "aburage_01": { "type": "Aburage", "level": "temple", "pos": [1, 15] },
         "aburage_02": { "type": "Aburage", "level": "temple", "pos": [5, 4] },
@@ -106,16 +106,16 @@
         "aburage_47": { "type": "Aburage", "level": "tea_house", "pos": [23, 10] },
         "aburage_48": { "type": "Aburage", "level": "tea_house", "pos": [17, 10] },
         "aburage_49": { "type": "Aburage", "level": "tea_house", "pos": [13, 3] },
-        "aburage_50": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_51": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_52": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_53": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_54": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_55": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_56": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_57": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_58": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
-        "aburage_59": { "type": "Aburage", "level": "geisha_room", "pos": [1, 1] },
+        "aburage_50": { "type": "Aburage", "level": "geisha_room", "pos": [1, 2] },
+        "aburage_51": { "type": "Aburage", "level": "geisha_room", "pos": [4, 3] },
+        "aburage_52": { "type": "Aburage", "level": "geisha_room", "pos": [11, 3] },
+        "aburage_53": { "type": "Aburage", "level": "geisha_room", "pos": [14, 4] },
+        "aburage_54": { "type": "Aburage", "level": "geisha_room", "pos": [22, 4] },
+        "aburage_55": { "type": "Aburage", "level": "geisha_room", "pos": [1, 6] },
+        "aburage_56": { "type": "Aburage", "level": "geisha_room", "pos": [26, 6] },
+        "aburage_57": { "type": "Aburage", "level": "geisha_room", "pos": [1, 10] },
+        "aburage_58": { "type": "Aburage", "level": "geisha_room", "pos": [19, 12] },
+        "aburage_59": { "type": "Aburage", "level": "geisha_room", "pos": [26, 12] },
         "aburage_60": { "type": "Aburage", "level": "fishmonger_house", "pos": [15, 3] },
         "aburage_61": { "type": "Aburage", "level": "fishmonger_house", "pos": [32, 3] },
         "aburage_62": { "type": "Aburage", "level": "fishmonger_house", "pos": [1, 7] },
@@ -173,7 +173,7 @@
         "sasuke": { "type": "Sasuke", "level": "road", "pos": [54, 8], "dsm": "npcs/sasuke.json", "state": "start", "present": true},
         "kaneda2": { "type": "Kaneda", "level": "tea_house", "pos": [6, 10], "dsm": "npcs/kaneda2.json", "state": "start", "facing": "right" },
         "tetsuo": { "type": "Tetsuo", "level": "tea_house", "pos": [9, 10], "dsm": "npcs/tetsuo.json", "state": "start", "facing": "left" },
-        "kaneda": { "type": "Kaneda", "level": "geisha_house", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left" },
+        "kaneda": { "type": "Kaneda", "level": "geisha_room", "pos": [10, 3], "dsm": "npcs/kaneda.json", "state": "start", "facing": "left" },
         "kumiko": { "type": "Kumiko", "level": "geisha_room", "pos": [11, 13], "dsm": "npcs/kumiko.json", "state": "start" },
         "maneki": { "type": "Maneki", "level": "market", "pos": [35, 6], "dsm": "npcs/maneki.json", "state": "start" },
         "fishmonger": { "type": "FishMonger", "level": "fishmonger_house", "pos": [23, 5], "dsm": "npcs/fishmonger.json", "state": "start" },