diff --git a/brest/dungeons/kolmtak-mine/ore-station b/brest/dungeons/kolmtak-mine/ore-station
index cf2c8d2ab..c2b9e3c96 100644
--- a/brest/dungeons/kolmtak-mine/ore-station
+++ b/brest/dungeons/kolmtak-mine/ore-station
@@ -5,7 +5,7 @@ width 39
 height 19
 msg
 Created:  2015-04-05 Rick Tanner
-Modified: 2015-05-31 Rick Tanner
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 end
 arch cobblestones2
@@ -1180,12 +1180,12 @@ msg
 Well met, adventurer! Do you have ore to turn in today?
 @match ore silverfrost silver frost yes
 Place the 10 silver frost on the table next to you to collect your gate pass.
-@match *
-This is the Ore Station for turning in silver frost
 @match gate pass gatepass
 Of course good adventurer. That is why you are here, right?
 @match help
 You collect 10 silver frost, come back here and turn them over to me and I give you a gate pass so you can go rejoin the surface world without facing the beasts and ice storm in the frigid mountain pass.
+@match *
+This is the Ore Station for turning in silver frost
 endmsg
 x 11
 y 4
@@ -1630,12 +1630,12 @@ msg
 Great day, adventurer! Do you have ore to turn in today?
 @match ore silverfrost silver frost yes
 Place the 10 silver frost on the table next to you to collect your gate pass.
-@match *
-This is the Ore Station for turning in silver frost
 @match gate pass gatepass
 Of course good adventurer. That is why you are here, right?
 @match help
 You collect 10 silver frost, come back here and turn them over to me and I give you a gate pass so you can go rejoin the surface world without facing the beasts and ice storm in the frigid mountain pass.
+@match *
+This is the Ore Station for turning in silver frost
 endmsg
 x 15
 y 3
@@ -2098,12 +2098,12 @@ msg
 Greetings, adventurer! Do you have ore to turn in today?
 @match ore silverfrost silver frost yes
 Place the 10 silver frost on the table next to you to collect your gate pass.
-@match *
-This is the Ore Station for turning in silver frost
 @match gate pass gatepass
 Of course good adventurer. That is why you are here, right?
 @match help
 You collect 10 silver frost, come back here and turn them over to me and I give you a gate pass so you can go rejoin the surface world without facing the beasts and ice storm in the frigid mountain pass.
+@match *
+This is the Ore Station for turning in silver frost
 endmsg
 x 19
 y 3
@@ -2560,12 +2560,12 @@ msg
 Hello, adventurer! Do you have ore to turn in today?
 @match ore silverfrost silver frost yes
 Place the 10 silver frost on the table next to you to collect your gate pass.
-@match *
-This is the Ore Station for turning in silver frost
 @match gate pass gatepass
 Of course good adventurer. That is why you are here, right?
 @match help
 You collect 10 silver frost, come back here and turn them over to me and I give you a gate pass so you can go rejoin the surface world without facing the beasts and ice storm in the frigid mountain pass.
+@match *
+This is the Ore Station for turning in silver frost
 endmsg
 x 23
 y 4
diff --git a/lake_country/ebony/masterlev b/lake_country/ebony/masterlev
index dd0366243..228c1f115 100644
--- a/lake_country/ebony/masterlev
+++ b/lake_country/ebony/masterlev
@@ -9,7 +9,7 @@ width 25
 height 25
 msg
 Created:  1995-04-24 Kundi, Xue (xkd@soda.csua.berkeley.edu)
-Modified: 2012-03-14 Rick Tanner
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 end
 arch woodfloor
@@ -1956,10 +1956,10 @@ name thief guildmaster
 msg
 @match door|exit
 Do you deserve to be a guild member if you can't even find the door by yourself!!??
-@match *
-Hello stranger! So you want to be a member of the guild!? Well, since you passed the test, I will let you in the guild.  There are many things that the guild provide you.  Make your contributions on time, remember! And be a good fellow.  Okay you may go now.  You have to search the rooms for the master keys of thievery, which you may have and use as symbol of this guild.
 @match symbol|thivery
 You may use the master key for many uses.  Keep them safe and you will find it useful.
+@match *
+Hello stranger! So you want to be a member of the guild!? Well, since you passed the test, I will let you in the guild.  There are many things that the guild provide you.  Make your contributions on time, remember! And be a good fellow.  Okay you may go now.  You have to search the rooms for the master keys of thievery, which you may have and use as symbol of this guild.
 endmsg
 face guildmaste.111
 hp 3000
diff --git a/marksel/mines b/marksel/mines
index ca8796119..0a2da8df7 100644
--- a/marksel/mines
+++ b/marksel/mines
@@ -9,7 +9,7 @@ enter_x 13
 enter_y 18
 msg
 Created:  2002-12-20 Joel Southall
-Modified: 2021-01-29 Nicolas Weeger
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 end
 arch cave_15
@@ -1671,11 +1671,11 @@ end
 arch guildmaster
 name guard
 msg
-@match *
-This is a boring post.  Sitting here in this dark hole.  I wish I was posted in the other mine.
 @match mine
 Bit more exciting, I think.  If you get the area near the spider's lair.  I've heard that undead prowl somewhere deep in those mines.  A dwarf told me that it was even more exciting, before they completely drove the goblins
 away.
+@match *
+This is a boring post.  Sitting here in this dark hole.  I wish I was posted in the other mine.
 endmsg
 face warrior.151
 hp 100
diff --git a/navar_city/city1enter b/navar_city/city1enter
index 880e18fb6..0eac2a1cf 100644
--- a/navar_city/city1enter
+++ b/navar_city/city1enter
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 5
 msg
 Created:  1993-10-28
-Modified: 2012-04-25 Rick Tanner
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 end
 arch dungeon_floor
@@ -160,12 +160,12 @@ y 11
 end
 arch guard
 msg
-@match *
-Sheesh!  The smell of death when the wind comes over the mountains to the west make standing at this post unbearable!!
 @match death|smell
 Can't you smell it?  Must be a couple hundred corpses up in the mountains all rotting and decaying to make a stench like that.
 @match corpses|dead
 Of course.. nothing, and I meaning nothing.. could smell that bad.
+@match *
+Sheesh!  The smell of death when the wind comes over the mountains to the west make standing at this post unbearable!!
 endmsg
 x 1
 y 11
@@ -897,14 +897,14 @@ y 3
 end
 arch c_man
 msg
-@match *
-We were heading north with some trade goods when some monsters ambushed us!
 @match monsters|monster
 They came down from the mountains and attacked, dozens of them and we barely escaped with our lives.
 @match attack|ambush
 The monsters were in some sort of frenzy when they attacked, they were so vicious and ruthless - like nothing we have seen before.
 @match mountains|mountain
 There must be some huge battle happening in the mountain peaks and surrounding valleys.  Stench of rotting flesh is overwhelming.
+@match *
+We were heading north with some trade goods when some monsters ambushed us!
 endmsg
 x 11
 y 3
diff --git a/pup_land/ancient/village/shop b/pup_land/ancient/village/shop
index 0cd517fe1..cecd64fd8 100644
--- a/pup_land/ancient/village/shop
+++ b/pup_land/ancient/village/shop
@@ -11,7 +11,7 @@ enter_x 7
 enter_y 8
 msg
 Created:  1996-05-21
-Modified: 2012-02-26 Rick Tanner
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 end
 arch blocked
@@ -413,10 +413,10 @@ end
 arch courier
 name vendor
 msg
-@match *
-Welcome to my shop.  I'll exchange my items for your nuggets.
 @match job|business|money
 *sigh* Nobody is buying anything here.  The people don't have any money.  I used to sell my stuff in shining village - and now it's in ruins.  These are bad days indeed...
+@match *
+Welcome to my shop.  I'll exchange my items for your nuggets.
 endmsg
 hp 300
 maxhp 300
diff --git a/unlinked/kandora/circus/mp_world b/unlinked/kandora/circus/mp_world
index acfd3e067..16ff57ca3 100644
--- a/unlinked/kandora/circus/mp_world
+++ b/unlinked/kandora/circus/mp_world
@@ -6,7 +6,7 @@ enter_x 39
 enter_y 39
 msg
 Created:  1999-02-18 King Zoobus
-Modified: 2013-11-23 SilverNexus
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 end
 arch desert
@@ -7478,10 +7478,10 @@ y 36
 end
 arch veiled_woman
 msg
-@match *
-She's a witch!
 @match witch
 Burn her
+@match *
+She's a witch!
 endmsg
 x 35
 y 36
diff --git a/unlinked/kandora/dd_shop b/unlinked/kandora/dd_shop
index 099af102f..e9c2c3c92 100644
--- a/unlinked/kandora/dd_shop
+++ b/unlinked/kandora/dd_shop
@@ -7,7 +7,7 @@ height 11
 enter_x 5
 msg
 Created:  1999-02-27 King Zoobus
-Modified: 2014-08-29 Rick Tanner
+Modified: 2021-07-25 Andreas Kirschbaum
 endmsg
 end
 arch woodfloor
@@ -362,9 +362,6 @@ y 2
 end
 arch elf_1
 msg
-@match *
-I've come to trade some longbows for
-iron and steel.
 @match steel
 The elves do not have good smiths.
 @match elves
@@ -376,6 +373,9 @@ The forest Anduin' is ancient and
 wild. Some say the trees even move
 around at night! The only safe passage
 through is the road to the north.
+@match *
+I've come to trade some longbows for
+iron and steel.
 endmsg
 hp 400
 x 5