diff --git a/lake_country/elven_moon/elvenmoon.1 b/lake_country/elven_moon/elvenmoon.1
index ee0e3affb..d169faacb 100644
--- a/lake_country/elven_moon/elvenmoon.1
+++ b/lake_country/elven_moon/elvenmoon.1
@@ -1128,7 +1128,7 @@ Elven Moon is a sacred place where the elves come to pray.
 The door to Elven Moon is at the center of the lake.
 @match lake
 The lake is north east of here.  Did you need help?
-@match yes|help|how*
+@match yes|help|how
 One must speak the magic words, then the bridge will appear by the flowers.
 @match magic|magic words
 The elves change the words every now and then.  Seek the guardian of the maze.
diff --git a/navar_city/mlab/tavern2 b/navar_city/mlab/tavern2
index dda0fd0f4..396f44920 100644
--- a/navar_city/mlab/tavern2
+++ b/navar_city/mlab/tavern2
@@ -9,7 +9,7 @@ enter_x 28
 enter_y 16
 msg
 Created:  2002-02-19 mikeeusa
-Modified: 2013-07-18 Kevin Zheng
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 end
 arch grass_only
@@ -6504,9 +6504,6 @@ y 7
 end
 arch guard
 name Elite Mikhovian Guard
-msg
-@match *
-endmsg
 hp 350
 x 25
 y 7
diff --git a/navar_city/smugglers_cove/smugglercamp b/navar_city/smugglers_cove/smugglercamp
index 4af5b3c7e..78c679b42 100644
--- a/navar_city/smugglers_cove/smugglercamp
+++ b/navar_city/smugglers_cove/smugglercamp
@@ -8,6 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2003-10-10 Avion
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 outdoor 1
 end
@@ -1579,7 +1580,7 @@ end
 arch woman2
 name Shelly
 msg
-@match smuggler[s]
+@match smuggler|smugglers
 Yes yes these horrible smugglers kidnapped me.
 @match *
 Oh please save me from these smugglers!
diff --git a/pup_land/rainbow/w-tower b/pup_land/rainbow/w-tower
index f59232533..d283344f2 100644
--- a/pup_land/rainbow/w-tower
+++ b/pup_land/rainbow/w-tower
@@ -367,7 +367,7 @@ end
 arch a_guard_h
 name Cain, the guard
 msg
-@match t.k.
+@match t[.]k[.]
 He is my master.  In his days of youth, no monster or quest was too hard for him! He collected lots of treasure... But now, he is an old man.
 @match *
 T.K., an old treasure hunter, lives in this tower.  Please do not disturb him.
diff --git a/quests/saromok/castlesaromok_towerf11 b/quests/saromok/castlesaromok_towerf11
index 72bb14b27..693663f25 100644
--- a/quests/saromok/castlesaromok_towerf11
+++ b/quests/saromok/castlesaromok_towerf11
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 1
 msg
 Created:  2008-08-14 Chad Opperman | cromagic@sbcglobal.net
-Modified: 2012-03-14 Rick Tanner
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 end
 arch stonefloor2
@@ -976,9 +976,6 @@ lifesave 1
 arch chair_2.1
 name Animated Chair
 race human
-msg
-@match *
-endmsg
 Con 2
 Int 14
 hp 10
@@ -1196,9 +1193,6 @@ lifesave 1
 arch platter1_plat
 name Animated Platter
 race human
-msg
-@match *
-endmsg
 Con 2
 Int 14
 hp 10
@@ -1434,9 +1428,6 @@ lifesave 1
 arch dagger
 name Animated Dinner Knife
 race human
-msg
-@match *
-endmsg
 Con 2
 Int 14
 hp 10
@@ -1673,9 +1664,6 @@ lifesave 1
 arch w_glass
 name Animated Wineglass
 race Human
-msg
-@match *
-endmsg
 Con 2
 Int 14
 hp 10
@@ -2975,9 +2963,6 @@ lifesave 1
 arch platter1_plat
 name Animated Platter
 race human
-msg
-@match *
-endmsg
 Con 2
 Int 14
 hp 10
@@ -3036,9 +3021,6 @@ lifesave 1
 arch dagger
 name Animated Dinner Knife
 race human
-msg
-@match *
-endmsg
 Con 2
 Int 14
 hp 10
@@ -3099,9 +3081,6 @@ lifesave 1
 arch w_glass
 name Animated Wineglass
 race Human
-msg
-@match *
-endmsg
 Con 2
 Int 14
 hp 10
@@ -3164,9 +3143,6 @@ lifesave 1
 arch chair_2.1
 name Animated Chair
 race human
-msg
-@match *
-endmsg
 Con 2
 Int 14
 hp 10
diff --git a/quests/saromok/castlesaromok_volcano b/quests/saromok/castlesaromok_volcano
index 367e6c59e..de4f841ca 100644
--- a/quests/saromok/castlesaromok_volcano
+++ b/quests/saromok/castlesaromok_volcano
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 13
 msg
 Created:  2008-08-11 Chad Opperman | cromagic@sbcglobal.net
-Modified: 2020-03-08 Kevin Zheng
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 end
 arch blackrock
@@ -1517,9 +1517,6 @@ y 4
 end
 arch merchant
 name Saromok's Projection
-msg
-@match *
-endmsg
 face wraith.111
 animation wraith
 x 7
diff --git a/scorn/taverns/goths2 b/scorn/taverns/goths2
index 88f04b5ff..4228bddfb 100644
--- a/scorn/taverns/goths2
+++ b/scorn/taverns/goths2
@@ -1895,9 +1895,6 @@ x 9
 y 22
 end
 arch pirate
-msg
-@match argh! matie!
-endmsg
 x 9
 y 22
 carrying 2
diff --git a/templates/keep/keep_b.tpl b/templates/keep/keep_b.tpl
index 46580857e..be0f4f7b7 100644
--- a/templates/keep/keep_b.tpl
+++ b/templates/keep/keep_b.tpl
@@ -4395,7 +4395,7 @@ msg
 oooooOOOOOOOoooooOOO
 @match hello arnie
 Hey how's tricks?
-@match not bad, yourself?
+@match not bad, yourself[?]
 Well, I've been better obviously, but I can't complain.
 @match *
 OOOOOoooooooOOOOOoooo
diff --git a/unlinked/chadfire/towns/castle/bank b/unlinked/chadfire/towns/castle/bank
index c1cb52e53..c95a15c84 100644
--- a/unlinked/chadfire/towns/castle/bank
+++ b/unlinked/chadfire/towns/castle/bank
@@ -221,9 +221,6 @@ end
 arch guildmaster
 name Guard
 race none
-msg
-@match *
-endmsg
 face guard_hard.111
 hp 100
 maxhp 100
@@ -669,9 +666,6 @@ end
 arch guildmaster
 name Guard
 race none
-msg
-@match *
-endmsg
 face guard_ligh.111
 hp 100
 maxhp 100
@@ -1099,9 +1093,6 @@ end
 arch guildmaster
 name Guard
 race none
-msg
-@match *
-endmsg
 face knight.111
 hp 100
 maxhp 100
@@ -1580,9 +1571,6 @@ end
 arch guildmaster
 name Bank Teller
 race none
-msg
-@match *
-endmsg
 face woman.151
 hp 100
 maxhp 100
@@ -2030,9 +2018,6 @@ end
 arch guildmaster
 name Guard
 race none
-msg
-@match *
-endmsg
 face knight.111
 hp 100
 maxhp 100
@@ -2462,9 +2447,6 @@ end
 arch guildmaster
 name Guard
 race none
-msg
-@match *
-endmsg
 face guard_ligh.111
 hp 100
 maxhp 100
@@ -2916,9 +2898,6 @@ end
 arch guildmaster
 name Guard
 race none
-msg
-@match *
-endmsg
 face guard_hard.111
 hp 100
 maxhp 100
diff --git a/unlinked/chadfire/towns/castle/keep b/unlinked/chadfire/towns/castle/keep
index b61495c84..a40a79c1b 100644
--- a/unlinked/chadfire/towns/castle/keep
+++ b/unlinked/chadfire/towns/castle/keep
@@ -4029,9 +4029,6 @@ end
 arch guildmaster
 name Lord
 race none
-msg
-@match *
-endmsg
 face lord_e.111
 animation lord_e
 hp 100
@@ -4435,9 +4432,6 @@ end
 arch guildmaster
 name Lady
 race none
-msg
-@match *
-endmsg
 face princess.111
 animation princess
 hp 100