diff --git a/marksel/m_inn b/marksel/m_inn
new file mode 100644
index 0000000..a5db81b
--- /dev/null
+++ b/marksel/m_inn
@@ -0,0 +1,902 @@
+arch map
+name Inn on the river
+width 10
+height 14
+enter_y 10
+msg
+Created:  1999-02-28 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
+endmsg
+end
+arch grass
+end
+arch rjunct_we-ne
+end
+arch grass
+y 1
+end
+arch tree5
+y 1
+end
+arch grass
+y 2
+end
+arch woodfloor2
+y 3
+end
+arch wall_2_2_2
+y 3
+end
+arch woodfloor2
+y 4
+end
+arch wall_1_2
+y 4
+end
+arch flagstone
+y 5
+end
+arch flagstone_2_2_2
+y 5
+end
+arch flagstone
+y 6
+end
+arch flagstone_2_1_1
+y 6
+end
+arch flagstone
+y 7
+end
+arch flagstone_2_1_1
+y 7
+end
+arch flagstone
+y 8
+end
+arch flagstone_2_1_1
+y 8
+end
+arch flagstone
+y 9
+end
+arch flagstone_2_1_1
+y 9
+end
+arch flagstone
+y 10
+end
+arch flagstone_2_1_1
+y 10
+end
+arch flagstone
+y 11
+end
+arch flagstone_2_1_1
+y 11
+end
+arch flagstone
+y 12
+end
+arch flagstone_2_1_1
+y 12
+end
+arch flagstone
+y 13
+end
+arch flagstone_2_2_1
+y 13
+end
+arch grass
+x 1
+end
+arch rjunct_we-nw
+x 1
+end
+arch grass
+x 1
+y 1
+end
+arch grass
+x 1
+y 2
+end
+arch flowers_permanent
+x 1
+y 2
+end
+arch woodfloor2
+x 1
+y 3
+end
+arch wall_1_3
+x 1
+y 3
+end
+arch woodfloor2
+x 1
+y 4
+end
+arch poison
+x 1
+y 4
+end
+arch flagstone
+x 1
+y 5
+end
+arch flagstone_2_1_2
+x 1
+y 5
+end
+arch flagstone
+x 1
+y 6
+end
+arch flagstone
+x 1
+y 7
+end
+arch flagstone
+x 1
+y 8
+end
+arch flagstone
+x 1
+y 9
+end
+arch flagstone
+x 1
+y 10
+end
+arch flagstone
+x 1
+y 11
+end
+arch flagstone
+x 1
+y 12
+end
+arch flagstone
+x 1
+y 13
+end
+arch flagstone_1_3
+x 1
+y 13
+end
+arch grass
+x 2
+end
+arch rjunct_we-se
+x 2
+end
+arch grass
+x 2
+y 1
+end
+arch grass
+x 2
+y 2
+end
+arch flowers_permanent
+x 2
+y 2
+end
+arch woodfloor2
+x 2
+y 3
+end
+arch woodfloor2
+x 2
+y 4
+end
+arch chair_1.3
+x 2
+y 4
+end
+arch flagstone
+x 2
+y 5
+end
+arch flagstone_2_1_2
+x 2
+y 5
+end
+arch flagstone
+x 2
+y 6
+end
+arch stair_up_2
+slaying m_inn2
+hp 1
+sp 1
+x 2
+y 6
+end
+arch flagstone
+x 2
+y 7
+end
+arch flagstone_1_4
+x 2
+y 7
+end
+arch flagstone
+x 2
+y 8
+end
+arch flagstone
+x 2
+y 9
+end
+arch flagstone
+x 2
+y 10
+end
+arch dwarf
+name Quando
+msg
+@match *
+Welcome to my humble inn.  Rooms are
+upstairs. Dinner served at sundown.
+Enjoy your stay
+endmsg
+x 2
+y 10
+end
+arch flagstone
+x 2
+y 11
+end
+arch flagstone
+x 2
+y 12
+end
+arch flagstone
+x 2
+y 13
+end
+arch oakdoor
+slaying /world/world_120_109
+hp 12
+sp 36
+x 2
+y 13
+end
+arch grass
+x 3
+end
+arch rcrook_we-se
+x 3
+end
+arch grass
+x 3
+y 1
+end
+arch grass
+x 3
+y 2
+end
+arch woodfloor2
+x 3
+y 3
+end
+arch woodfloor2
+x 3
+y 4
+end
+arch c_sage
+name Old Man
+msg
+@match retire
+I once was a merchant, but retired
+here for its peace and scenery.  There
+are many riches yet to be found in the
+mines, but I'm too tired to help find
+them.
+@match yes
+A good place to retire.
+@match *
+The view is pleasant, no?
+endmsg
+x 3
+y 4
+end
+arch flagstone
+x 3
+y 5
+end
+arch flagstone_2_2_3
+x 3
+y 5
+end
+arch flagstone
+x 3
+y 6
+end
+arch flagstone_2_1_1
+x 3
+y 6
+end
+arch flagstone
+x 3
+y 7
+end
+arch flagstone_2_2_4
+x 3
+y 7
+end
+arch flagstone
+x 3
+y 8
+end
+arch flagstone
+x 3
+y 9
+end
+arch flagstone_2_2_2
+x 3
+y 9
+end
+arch flagstone
+x 3
+y 10
+end
+arch flagstone_1_2
+x 3
+y 10
+end
+arch flagstone
+x 3
+y 11
+end
+arch flagstone
+x 3
+y 12
+end
+arch flagstone
+x 3
+y 13
+end
+arch flagstone_1_4
+x 3
+y 13
+end
+arch grass
+x 4
+end
+arch rjunct_we-ne
+x 4
+end
+arch grass
+x 4
+y 1
+end
+arch grass
+x 4
+y 2
+end
+arch woodfloor2
+x 4
+y 3
+end
+arch woodfloor2
+x 4
+y 4
+end
+arch magic_mouth
+msg
+A nice porch with a view over the
+river..
+endmsg
+x 4
+y 5
+end
+arch flagstone
+x 4
+y 5
+end
+arch door_look_1
+x 4
+y 5
+end
+arch flagstone
+x 4
+y 6
+end
+arch flagstone
+x 4
+y 7
+end
+arch flagstone
+x 4
+y 8
+end
+arch flagstone
+x 4
+y 9
+end
+arch flagstone_2_1_2
+x 4
+y 9
+end
+arch flagstone
+x 4
+y 10
+end
+arch fireplace
+x 4
+y 10
+end
+arch flagstone
+x 4
+y 11
+end
+arch flagstone
+x 4
+y 12
+end
+arch flagstone
+x 4
+y 13
+end
+arch flagstone_2_1_2
+x 4
+y 13
+end
+arch grass
+x 5
+end
+arch rcrook_we-ne
+x 5
+end
+arch grass
+x 5
+y 1
+end
+arch grass
+x 5
+y 2
+end
+arch woodfloor2
+x 5
+y 3
+end
+arch woodfloor2
+x 5
+y 4
+end
+arch chair_1.3
+x 5
+y 4
+end
+arch flagstone
+x 5
+y 5
+end
+arch flagstone_2_2_2
+x 5
+y 5
+end
+arch flagstone
+x 5
+y 6
+end
+arch flagstone_2_1_1
+x 5
+y 6
+end
+arch flagstone
+x 5
+y 7
+end
+arch flagstone_2_1_1
+x 5
+y 7
+end
+arch flagstone
+x 5
+y 8
+end
+arch flagstone_2_1_1
+x 5
+y 8
+end
+arch flagstone
+x 5
+y 9
+end
+arch flagstone_2_2_4
+x 5
+y 9
+end
+arch flagstone
+x 5
+y 10
+end
+arch flagstone
+x 5
+y 11
+end
+arch flagstone
+x 5
+y 12
+end
+arch flagstone
+x 5
+y 13
+end
+arch flagstone_2_1_2
+x 5
+y 13
+end
+arch grass
+x 6
+end
+arch rjunct_we-se
+x 6
+end
+arch grass
+x 6
+y 1
+end
+arch grass
+x 6
+y 2
+end
+arch woodfloor2
+x 6
+y 3
+end
+arch woodfloor2
+x 6
+y 4
+end
+arch table
+x 6
+y 4
+end
+arch flagstone
+x 6
+y 5
+end
+arch flagstone_2_1_2
+x 6
+y 5
+end
+arch flagstone
+x 6
+y 6
+end
+arch flagstone
+x 6
+y 7
+end
+arch chair_1.4
+x 6
+y 7
+end
+arch flagstone
+x 6
+y 8
+end
+arch flagstone
+x 6
+y 9
+end
+arch flagstone
+x 6
+y 10
+end
+arch chair_1.4
+x 6
+y 10
+end
+arch flagstone
+x 6
+y 11
+end
+arch flagstone
+x 6
+y 12
+end
+arch flagstone
+x 6
+y 13
+end
+arch flagstone_2_1_2
+x 6
+y 13
+end
+arch grass
+x 7
+end
+arch rjunct_we-sw
+x 7
+end
+arch grass
+x 7
+y 1
+end
+arch grass
+x 7
+y 2
+end
+arch flowers_permanent
+x 7
+y 2
+end
+arch woodfloor2
+x 7
+y 3
+end
+arch woodfloor2
+x 7
+y 4
+end
+arch chair_1.3
+x 7
+y 4
+end
+arch flagstone
+x 7
+y 5
+end
+arch flagstone_2_1_2
+x 7
+y 5
+end
+arch flagstone
+x 7
+y 6
+end
+arch chair_1.1
+x 7
+y 6
+end
+arch flagstone
+x 7
+y 7
+end
+arch table_4
+x 7
+y 7
+end
+arch random_food
+x 7
+y 7
+end
+arch flagstone
+x 7
+y 8
+end
+arch chair_1.3
+x 7
+y 8
+end
+arch flagstone
+x 7
+y 9
+end
+arch chair_1.1
+x 7
+y 9
+end
+arch flagstone
+x 7
+y 10
+end
+arch table_4
+x 7
+y 10
+end
+arch random_food
+x 7
+y 10
+end
+arch flagstone
+x 7
+y 11
+end
+arch chair_1.3
+x 7
+y 11
+end
+arch flagstone
+x 7
+y 12
+end
+arch flagstone
+x 7
+y 13
+end
+arch flagstone_2_1_2
+x 7
+y 13
+end
+arch grass
+x 8
+end
+arch river_ne-w
+x 8
+end
+arch grass
+x 8
+y 1
+end
+arch tree5
+x 8
+y 1
+end
+arch grass
+x 8
+y 2
+end
+arch flowers_permanent
+x 8
+y 2
+end
+arch woodfloor2
+x 8
+y 3
+end
+arch wall_1_4
+x 8
+y 3
+end
+arch woodfloor2
+x 8
+y 4
+end
+arch flagstone
+x 8
+y 5
+end
+arch flagstone_2_1_2
+x 8
+y 5
+end
+arch flagstone
+x 8
+y 6
+end
+arch flagstone
+x 8
+y 7
+end
+arch chair_1.2
+x 8
+y 7
+end
+arch flagstone
+x 8
+y 8
+end
+arch flagstone
+x 8
+y 9
+end
+arch flagstone
+x 8
+y 10
+end
+arch chair_1.2
+x 8
+y 10
+end
+arch flagstone
+x 8
+y 11
+end
+arch flagstone
+x 8
+y 12
+end
+arch flagstone
+x 8
+y 13
+end
+arch flagstone_2_1_2
+x 8
+y 13
+end
+arch grass
+x 9
+end
+arch grass
+x 9
+y 1
+end
+arch grass
+x 9
+y 2
+end
+arch woodfloor2
+x 9
+y 3
+end
+arch wall_2_2_3
+x 9
+y 3
+end
+arch woodfloor2
+x 9
+y 4
+end
+arch wall_1_2
+x 9
+y 4
+end
+arch flagstone
+x 9
+y 5
+end
+arch flagstone_2_2_3
+x 9
+y 5
+end
+arch flagstone
+x 9
+y 6
+end
+arch flagstone_2_1_1
+x 9
+y 6
+end
+arch flagstone
+x 9
+y 7
+end
+arch flagstone_2_1_1
+x 9
+y 7
+end
+arch flagstone
+x 9
+y 8
+end
+arch flagstone_2_1_1
+x 9
+y 8
+end
+arch flagstone
+x 9
+y 9
+end
+arch flagstone_2_1_1
+x 9
+y 9
+end
+arch flagstone
+x 9
+y 10
+end
+arch flagstone_2_1_1
+x 9
+y 10
+end
+arch flagstone
+x 9
+y 11
+end
+arch flagstone_2_1_1
+x 9
+y 11
+end
+arch flagstone
+x 9
+y 12
+end
+arch flagstone_2_1_1
+x 9
+y 12
+end
+arch flagstone
+x 9
+y 13
+end
+arch flagstone_2_2_4
+x 9
+y 13
+end
diff --git a/marksel/m_inn2 b/marksel/m_inn2
new file mode 100644
index 0000000..441207c
--- /dev/null
+++ b/marksel/m_inn2
@@ -0,0 +1,648 @@
+arch map
+name Inn
+width 10
+height 10
+enter_y 10
+msg
+Created:  1999-02-28 King Zoobus
+endmsg
+end
+arch woodfloor
+end
+arch flagstone_2_2_2
+end
+arch woodfloor
+y 1
+end
+arch flagstone_2_1_1
+y 1
+end
+arch woodfloor
+y 2
+end
+arch flagstone_3_2
+y 2
+end
+arch woodfloor
+y 3
+end
+arch flagstone_2_1_1
+y 3
+end
+arch woodfloor
+y 4
+end
+arch flagstone_2_1_1
+y 4
+end
+arch woodfloor
+y 5
+end
+arch flagstone_3_2
+y 5
+end
+arch woodfloor
+y 6
+end
+arch flagstone_2_1_1
+y 6
+end
+arch woodfloor
+y 7
+end
+arch flagstone_2_1_1
+y 7
+end
+arch woodfloor
+y 8
+end
+arch flagstone_2_1_1
+y 8
+end
+arch woodfloor
+y 9
+end
+arch flagstone_2_2_1
+y 9
+end
+arch woodfloor
+x 1
+end
+arch flagstone_2_1_2
+x 1
+end
+arch woodfloor
+x 1
+y 1
+end
+arch stair_down_2
+slaying m_inn
+hp 2
+sp 6
+x 1
+y 1
+end
+arch woodfloor
+x 1
+y 2
+end
+arch door_look_1
+x 1
+y 2
+end
+arch woodfloor
+x 1
+y 3
+end
+arch woodfloor
+x 1
+y 4
+end
+arch woodfloor
+x 1
+y 5
+end
+arch flagstone_2_1_2
+x 1
+y 5
+end
+arch woodfloor
+x 1
+y 6
+end
+arch clock
+x 1
+y 6
+end
+arch woodfloor
+x 1
+y 7
+end
+arch table_2
+x 1
+y 7
+end
+arch woodfloor
+x 1
+y 8
+end
+arch woodfloor
+x 1
+y 9
+end
+arch flagstone_2_1_2
+x 1
+y 9
+end
+arch woodfloor
+x 2
+end
+arch flagstone_2_1_2
+x 2
+end
+arch woodfloor
+x 2
+y 1
+end
+arch woodfloor
+x 2
+y 2
+end
+arch flagstone_2_1_2
+x 2
+y 2
+end
+arch woodfloor
+x 2
+y 3
+end
+arch woodfloor
+x 2
+y 4
+end
+arch bed_save
+x 2
+y 4
+end
+arch woodfloor
+x 2
+y 5
+end
+arch flagstone_2_1_2
+x 2
+y 5
+end
+arch woodfloor
+x 2
+y 6
+end
+arch woodfloor
+x 2
+y 7
+end
+arch chair_1.2
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
+arch woodfloor
+x 2
+y 9
+end
+arch flagstone_2_1_2
+x 2
+y 9
+end
+arch woodfloor
+x 3
+end
+arch flagstone_2_1_2
+x 3
+end
+arch woodfloor
+x 3
+y 1
+end
+arch woodfloor
+x 3
+y 2
+end
+arch flagstone_2_2_3
+x 3
+y 2
+end
+arch woodfloor
+x 3
+y 3
+end
+arch flagstone_2_1_1
+x 3
+y 3
+end
+arch woodfloor
+x 3
+y 4
+end
+arch flagstone_2_1_1
+x 3
+y 4
+end
+arch woodfloor
+x 3
+y 5
+end
+arch flagstone_3_1
+x 3
+y 5
+end
+arch woodfloor
+x 3
+y 6
+end
+arch fireplace
+x 3
+y 6
+end
+arch woodfloor
+x 3
+y 7
+end
+arch woodfloor
+x 3
+y 8
+end
+arch bed_save
+x 3
+y 8
+end
+arch woodfloor
+x 3
+y 9
+end
+arch flagstone_2_1_2
+x 3
+y 9
+end
+arch woodfloor
+x 4
+end
+arch flagstone_2_1_2
+x 4
+end
+arch woodfloor
+x 4
+y 1
+end
+arch woodfloor
+x 4
+y 2
+end
+arch door_look_1
+x 4
+y 2
+end
+arch woodfloor
+x 4
+y 3
+end
+arch woodfloor
+x 4
+y 4
+end
+arch chair
+x 4
+y 4
+end
+arch woodfloor
+x 4
+y 5
+end
+arch flagstone_2_1_2
+x 4
+y 5
+end
+arch woodfloor
+x 4
+y 6
+end
+arch woodfloor
+x 4
+y 7
+end
+arch woodfloor
+x 4
+y 8
+end
+arch woodfloor
+x 4
+y 9
+end
+arch flagstone_2_1_2
+x 4
+y 9
+end
+arch woodfloor
+x 5
+end
+arch flagstone_2_1_2
+x 5
+end
+arch woodfloor
+x 5
+y 1
+end
+arch woodfloor
+x 5
+y 2
+end
+arch flagstone_1_4
+x 5
+y 2
+end
+arch woodfloor
+x 5
+y 3
+end
+arch woodfloor
+x 5
+y 4
+end
+arch woodfloor
+x 5
+y 5
+end
+arch flagstone_2_1_2
+x 5
+y 5
+end
+arch woodfloor
+x 5
+y 6
+end
+arch door_look_2
+x 5
+y 6
+end
+arch woodfloor
+x 5
+y 7
+end
+arch flagstone_2_2_2
+x 5
+y 7
+end
+arch woodfloor
+x 5
+y 8
+end
+arch door_look_2
+x 5
+y 8
+end
+arch woodfloor
+x 5
+y 9
+end
+arch flagstone_3_1
+x 5
+y 9
+end
+arch woodfloor
+x 6
+end
+arch flagstone_2_1_2
+x 6
+end
+arch woodfloor
+x 6
+y 1
+end
+arch woodfloor
+x 6
+y 2
+end
+arch flagstone_2_1_2
+x 6
+y 2
+end
+arch woodfloor
+x 6
+y 3
+end
+arch woodfloor
+x 6
+y 4
+end
+arch bed_save
+x 6
+y 4
+end
+arch woodfloor
+x 6
+y 5
+end
+arch flagstone_2_1_2
+x 6
+y 5
+end
+arch woodfloor
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
+arch flagstone_2_1_2
+x 6
+y 7
+end
+arch woodfloor
+x 6
+y 8
+end
+arch woodfloor
+x 6
+y 9
+end
+arch flagstone_2_1_2
+x 6
+y 9
+end
+arch woodfloor
+x 7
+end
+arch flagstone_2_1_2
+x 7
+end
+arch woodfloor
+x 7
+y 1
+end
+arch woodfloor
+x 7
+y 2
+end
+arch flagstone_2_2_3
+x 7
+y 2
+end
+arch woodfloor
+x 7
+y 3
+end
+arch flagstone_2_1_1
+x 7
+y 3
+end
+arch woodfloor
+x 7
+y 4
+end
+arch flagstone_2_1_1
+x 7
+y 4
+end
+arch woodfloor
+x 7
+y 5
+end
+arch flagstone_3_4
+x 7
+y 5
+end
+arch woodfloor
+x 7
+y 6
+end
+arch flagstone_2_1_1
+x 7
+y 6
+end
+arch woodfloor
+x 7
+y 7
+end
+arch flagstone_2_2_4
+x 7
+y 7
+end
+arch woodfloor
+x 7
+y 8
+end
+arch woodfloor
+x 7
+y 9
+end
+arch flagstone_2_1_2
+x 7
+y 9
+end
+arch woodfloor
+x 8
+end
+arch flagstone_2_1_2
+x 8
+end
+arch woodfloor
+x 8
+y 1
+end
+arch woodfloor
+x 8
+y 2
+end
+arch woodfloor
+x 8
+y 3
+end
+arch woodfloor
+x 8
+y 4
+end
+arch woodfloor
+x 8
+y 5
+end
+arch woodfloor
+x 8
+y 6
+end
+arch woodfloor
+x 8
+y 7
+end
+arch woodfloor
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
+arch flagstone_2_1_2
+x 8
+y 9
+end
+arch woodfloor
+x 9
+end
+arch flagstone_2_2_3
+x 9
+end
+arch woodfloor
+x 9
+y 1
+end
+arch flagstone_2_1_1
+x 9
+y 1
+end
+arch woodfloor
+x 9
+y 2
+end
+arch flagstone_2_1_1
+x 9
+y 2
+end
+arch woodfloor
+x 9
+y 3
+end
+arch flagstone_2_1_1
+x 9
+y 3
+end
+arch woodfloor
+x 9
+y 4
+end
+arch flagstone_2_1_1
+x 9
+y 4
+end
+arch woodfloor
+x 9
+y 5
+end
+arch flagstone_2_1_1
+x 9
+y 5
+end
+arch woodfloor
+x 9
+y 6
+end
+arch flagstone_2_1_1
+x 9
+y 6
+end
+arch woodfloor
+x 9
+y 7
+end
+arch flagstone_2_1_1
+x 9
+y 7
+end
+arch woodfloor
+x 9
+y 8
+end
+arch flagstone_2_1_1
+x 9
+y 8
+end
+arch woodfloor
+x 9
+y 9
+end
+arch flagstone_2_2_4
+x 9
+y 9
+end
diff --git a/unlinked/kandora/cave/m_inn b/unlinked/kandora/cave/m_inn
index 6766a00..a5db81b 100644
--- a/unlinked/kandora/cave/m_inn
+++ b/unlinked/kandora/cave/m_inn
@@ -258,9 +258,9 @@ x 2
 y 13
 end
 arch oakdoor
-slaying mithril
-hp 10
-sp 9
+slaying /world/world_120_109
+hp 12
+sp 36
 x 2
 y 13
 end
diff --git a/world/world_120_109 b/world/world_120_109
index 531f725..2d05a1d 100644
--- a/world/world_120_109
+++ b/world/world_120_109
@@ -1205,6 +1205,7 @@ end
 arch river_sw-ne
 x 4
 y 44
+move_block 0
 end
 arch paved_1_1
 x 4
@@ -1217,6 +1218,7 @@ end
 arch river_sw-ne_l
 x 4
 y 45
+move_block 0
 end
 arch paved_1_2
 x 4
@@ -3339,6 +3341,10 @@ x 12
 y 36
 end
 arch s_house1
+name inn by the river
+slaying /marksel/inn
+hp 2
+sp 12
 x 12
 y 36
 end