diff --git a/scorn/houses/breezy_under b/scorn/houses/breezy_under
index ad8f358c3..59a29839b 100644
--- a/scorn/houses/breezy_under
+++ b/scorn/houses/breezy_under
@@ -813,6 +813,10 @@ arch dungeon_floor
 x 4
 y 28
 end
+arch generate_orc
+x 4
+y 28
+end
 arch dungeon_floor
 x 4
 y 29
@@ -1255,6 +1259,10 @@ arch dungeon_floor
 x 7
 y 19
 end
+arch generate_orc
+x 7
+y 19
+end
 arch dungeon_floor
 x 7
 y 20
@@ -2149,26 +2157,54 @@ arch dungeon_floor
 x 13
 y 20
 end
+arch dun_1_4
+x 13
+y 20
+end
 arch dungeon_floor
 x 13
 y 21
 end
+arch igate_closed_2
+connected 2
+x 13
+y 21
+end
 arch dungeon_floor
 x 13
 y 22
 end
+arch igate_closed_2
+connected 2
+x 13
+y 22
+end
 arch dungeon_floor
 x 13
 y 23
 end
+arch igate_closed_2
+connected 2
+x 13
+y 23
+end
 arch dungeon_floor
 x 13
 y 24
 end
+arch igate_closed_2
+connected 2
+x 13
+y 24
+end
 arch dungeon_floor
 x 13
 y 25
 end
+arch dun_1_4
+x 13
+y 25
+end
 arch dungeon_floor
 x 13
 y 26
@@ -2302,30 +2338,58 @@ arch dungeon_floor
 x 14
 y 20
 end
+arch dun_2_1_2
+x 14
+y 20
+end
 arch dungeon_floor
 x 14
 y 21
 end
+arch orc
+x 14
+y 21
+end
 arch dungeon_floor
 x 14
 y 22
 end
+arch orc
+x 14
+y 22
+end
 arch dungeon_floor
 x 14
 y 23
 end
+arch orc
+x 14
+y 23
+end
 arch dungeon_floor
 x 14
 y 24
 end
+arch orc
+x 14
+y 24
+end
 arch dungeon_floor
 x 14
 y 25
 end
+arch dun_2_1_2
+x 14
+y 25
+end
 arch dungeon_floor
 x 14
 y 26
 end
+arch generate_orc
+x 14
+y 26
+end
 arch dungeon_floor
 x 14
 y 27
@@ -2509,7 +2573,7 @@ arch dungeon_floor
 x 15
 y 20
 end
-arch dun_2_2_1
+arch dun_3_1
 x 15
 y 20
 end
@@ -2517,8 +2581,7 @@ arch dungeon_floor
 x 15
 y 21
 end
-arch igate_closed_2
-connected 2
+arch orc
 x 15
 y 21
 end
@@ -2526,8 +2589,7 @@ arch dungeon_floor
 x 15
 y 22
 end
-arch igate_closed_2
-connected 2
+arch orc
 x 15
 y 22
 end
@@ -2535,8 +2597,7 @@ arch dungeon_floor
 x 15
 y 23
 end
-arch igate_closed_2
-connected 2
+arch orc
 x 15
 y 23
 end
@@ -2544,8 +2605,7 @@ arch dungeon_floor
 x 15
 y 24
 end
-arch igate_closed_2
-connected 2
+arch orc
 x 15
 y 24
 end
@@ -2553,7 +2613,7 @@ arch dungeon_floor
 x 15
 y 25
 end
-arch dun_2_2_2
+arch dun_3_3
 x 15
 y 25
 end
@@ -2739,7 +2799,7 @@ arch dungeon_floor
 x 16
 y 20
 end
-arch dun_2_1_2
+arch dun_2_2_3
 x 16
 y 20
 end
@@ -2747,7 +2807,7 @@ arch dungeon_floor
 x 16
 y 21
 end
-arch orc
+arch dun_2_2_1
 x 16
 y 21
 end
@@ -2771,7 +2831,7 @@ arch dungeon_floor
 x 16
 y 24
 end
-arch orc
+arch dun_2_2_2
 x 16
 y 24
 end
@@ -2779,7 +2839,7 @@ arch dungeon_floor
 x 16
 y 25
 end
-arch dun_2_1_2
+arch dun_2_2_4
 x 16
 y 25
 end
@@ -2903,10 +2963,18 @@ arch dungeon_floor
 x 17
 y 17
 end
+arch kobold
+x 17
+y 17
+end
 arch dungeon_floor
 x 17
 y 18
 end
+arch kobold
+x 17
+y 18
+end
 arch dungeon_floor
 x 17
 y 19
@@ -2915,15 +2983,11 @@ arch dungeon_floor
 x 17
 y 20
 end
-arch dun_2_1_2
-x 17
-y 20
-end
 arch dungeon_floor
 x 17
 y 21
 end
-arch orc
+arch dun_2_1_2
 x 17
 y 21
 end
@@ -2931,32 +2995,20 @@ arch dungeon_floor
 x 17
 y 22
 end
-arch orc
-x 17
-y 22
-end
 arch dungeon_floor
 x 17
 y 23
 end
-arch orc
-x 17
-y 23
-end
 arch dungeon_floor
 x 17
 y 24
 end
-arch orc
-x 17
-y 24
-end
-arch dungeon_floor
-x 17
-y 25
-end
 arch dun_2_1_2
 x 17
+y 24
+end
+arch dungeon_floor
+x 17
 y 25
 end
 arch dungeon_floor
@@ -3092,6 +3144,10 @@ arch dungeon_floor
 x 18
 y 18
 end
+arch kobold
+x 18
+y 18
+end
 arch dungeon_floor
 x 18
 y 19
@@ -3100,15 +3156,11 @@ arch dungeon_floor
 x 18
 y 20
 end
-arch dun_2_1_2
-x 18
-y 20
-end
 arch dungeon_floor
 x 18
 y 21
 end
-arch orc
+arch dun_2_1_2
 x 18
 y 21
 end
@@ -3116,38 +3168,30 @@ arch dungeon_floor
 x 18
 y 22
 end
-arch orc
-x 18
-y 22
-end
 arch dungeon_floor
 x 18
 y 23
 end
-arch orc
-x 18
-y 23
-end
 arch dungeon_floor
 x 18
 y 24
 end
-arch orc
-x 18
-y 24
-end
-arch dungeon_floor
-x 18
-y 25
-end
 arch dun_2_1_2
 x 18
+y 24
+end
+arch dungeon_floor
+x 18
 y 25
 end
 arch dungeon_floor
 x 18
 y 26
 end
+arch kobold
+x 18
+y 26
+end
 arch dungeon_floor
 x 18
 y 27
@@ -3284,14 +3328,14 @@ arch dungeon_floor
 x 19
 y 20
 end
-arch dun_2_1_2
-x 19
-y 20
-end
 arch dungeon_floor
 x 19
 y 21
 end
+arch dun_2_1_2
+x 19
+y 21
+end
 arch dungeon_floor
 x 19
 y 22
@@ -3312,7 +3356,7 @@ arch dungeon_floor
 x 19
 y 24
 end
-arch bones3
+arch dun_2_1_2
 x 19
 y 24
 end
@@ -3320,10 +3364,6 @@ arch dungeon_floor
 x 19
 y 25
 end
-arch dun_2_1_2
-x 19
-y 25
-end
 arch dungeon_floor
 x 19
 y 26
@@ -3480,7 +3520,7 @@ arch dungeon_floor
 x 20
 y 20
 end
-arch dun_3_4
+arch dun_2_1_1
 x 20
 y 20
 end
@@ -3488,7 +3528,7 @@ arch dungeon_floor
 x 20
 y 21
 end
-arch dun_1_2
+arch dun_2_2_4
 x 20
 y 21
 end
@@ -3514,7 +3554,7 @@ arch dungeon_floor
 x 20
 y 24
 end
-arch dun_1_1
+arch dun_2_2_3
 x 20
 y 24
 end
@@ -3522,7 +3562,7 @@ arch dungeon_floor
 x 20
 y 25
 end
-arch dun_3_4
+arch dun_2_1_1
 x 20
 y 25
 end
diff --git a/scorn/houses/cornerbrook b/scorn/houses/cornerbrook
index 71230db3d..c484052dd 100644
--- a/scorn/houses/cornerbrook
+++ b/scorn/houses/cornerbrook
@@ -3052,7 +3052,7 @@ arch pirate_lass
 msg
 @match ahoy|Ahoy
 Hey sailor, want some treasure?
-@match Swabbie|swabbie
+@match old|pirate|Swabbie
 I shouldn't have married him,
 I should have stuck with Tomasso the Pirate.
 I hear he found a treasure map.
diff --git a/scorn/houses/riverside_manor b/scorn/houses/riverside_manor
index 04daf1e24..c059bff9d 100644
--- a/scorn/houses/riverside_manor
+++ b/scorn/houses/riverside_manor
@@ -2866,6 +2866,7 @@ Amy, you have to let me come back
 and get my stuff...it's important.
 At least feed the thing eh, I'm telling you
 it's worth a bundle.
+-M
 endmsg
 level 1
 arch letter
@@ -2874,6 +2875,7 @@ msg
 Amy let me come home...
 Honest, I was just visiting Oled and I never
 saw her there before.
+-M
 endmsg
 level 1
 end
diff --git a/scorn/houses/riverside_under b/scorn/houses/riverside_under
index 2e26e6b8b..476f8b569 100644
--- a/scorn/houses/riverside_under
+++ b/scorn/houses/riverside_under
@@ -186,6 +186,7 @@ end
 arch button_small
 invisible 1
 connected 1
+activate_on_release 0
 x 1
 y 5
 end
@@ -197,12 +198,6 @@ arch dirtfloor
 x 1
 y 7
 end
-arch button_small
-invisible 1
-connected 1
-x 1
-y 7
-end
 arch dirtfloor
 x 1
 y 8
@@ -338,6 +333,13 @@ arch dirtfloor
 x 2
 y 4
 end
+arch button_small
+invisible 1
+connected 1
+activate_on_release 0
+x 2
+y 4
+end
 arch dirtfloor
 x 2
 y 5
@@ -1286,6 +1288,13 @@ arch dirtfloor
 x 8
 y 5
 end
+arch pit_closed
+connected 1
+hp 19
+sp 9
+x 8
+y 5
+end
 arch dirtfloor
 x 8
 y 6
@@ -1317,6 +1326,7 @@ end
 arch button_small
 invisible 1
 connected 1
+activate_on_release 0
 x 8
 y 10
 end
@@ -3652,7 +3662,7 @@ msg
 Mrk, yu lev us lon
 an we sta in hows
 an we lev yew lon.
-ok 
+ok
 -burrg ogr chif
 endmsg
 name_pl notes