diff --git a/dragonisland/advguild3 b/dragonisland/advguild3
index 4d614e9c4..0684e45ec 100644
--- a/dragonisland/advguild3
+++ b/dragonisland/advguild3
@@ -6,7 +6,7 @@ width 32
 height 32
 msg
 Created:  1997-07-15 Viola Krings
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch dungeon_floor
@@ -1165,7 +1165,7 @@ end
 arch dark_elf
 name Shalathar
 msg
-@match [Hh][ea]llo|[Hh]i
+@match h[ea]llo|hi
 Hi there! I'm here to watch the
 dragons. They are beautiful, don't you
 think? Oh yes, if you want a
@@ -3205,7 +3205,7 @@ end
 arch big_dragon
 name friendly dragon
 msg
-@match [Hh][ae]llo|[Hh]i|[Gg]reet
+@match h[ae]llo|hi|greet
 My greetings, proud adventurer!
 endmsg
 x 16
diff --git a/dragonisland/advshop0 b/dragonisland/advshop0
index a757af0ad..22dc50327 100644
--- a/dragonisland/advshop0
+++ b/dragonisland/advshop0
@@ -9,6 +9,7 @@ width 16
 height 16
 msg
 Created:  1997-02-22
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch woodfloor
@@ -869,7 +870,7 @@ end
 arch madman
 name shopkeeper
 msg
-@match [Hh][ae]llo|[Hh]i
+@match h[ae]llo|hi
 Hello there! Welcome to this fantastic
 shop! It is full of monsters, so
 please be careful!
diff --git a/dragonisland/house4 b/dragonisland/house4
index 09c37cedc..6f264c4a6 100644
--- a/dragonisland/house4
+++ b/dragonisland/house4
@@ -6,7 +6,7 @@ width 20
 height 20
 msg
 Created:  1997-02-17
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch grass
@@ -966,9 +966,9 @@ end
 arch woman2
 name Jaskharella
 msg
-@hello
+@match hello|hi
 Hello! I'm sorry Myrnek is not here right now, perhaps I can give you an appointment?
-@appointment
+@match appointment
 Well, how about next thursday evening? Perhaps he's back by then
 endmsg
 Pow 20
diff --git a/dragonisland/house7 b/dragonisland/house7
index 904fe070c..b4252e91e 100644
--- a/dragonisland/house7
+++ b/dragonisland/house7
@@ -6,7 +6,7 @@ width 35
 height 20
 msg
 Created:  1997-06-28 Viola Krings
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch flagstone
@@ -1150,7 +1150,7 @@ end
 arch woman
 name Sabine
 msg
-@match [Hh][ae]llo|[Hh]i
+@match h[ae]llo|[hi
 Hello, fool!
 @match fool
 All who enter here are fools! Else
diff --git a/dragonisland/house8 b/dragonisland/house8
index ca1979319..77bb3c712 100644
--- a/dragonisland/house8
+++ b/dragonisland/house8
@@ -6,6 +6,7 @@ width 10
 height 10
 msg
 Created:  1997-02-12
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch afloor_left
@@ -153,7 +154,7 @@ end
 arch courier
 name Timothius
 msg
-@match [Hh][ae]llo|[Hh]i|[Gg]reet
+@match h[ae]llo|hi|greet
 My Greetigs to you! Welcome to my
 humble home. Have you heard of my
 friend, Carthon? He was heading of to
@@ -166,7 +167,7 @@ Oh dear!!!
 Please leave me alone for a while.
 @match yes
 Well, where have you seen him?
-@match [Cc]arthon
+@match carthon
 Carthon is a friend of mine. He's an
 adventurer and dragon hunter.
 @match mountain
diff --git a/dragonisland/house9 b/dragonisland/house9
index 9a052294f..afedb45bb 100644
--- a/dragonisland/house9
+++ b/dragonisland/house9
@@ -6,6 +6,7 @@ width 6
 height 6
 msg
 Created:  1997-02-12
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch marble
@@ -171,7 +172,7 @@ y 2
 end
 arch slave
 msg
-@match [Hh][ae]llo|[Hh]i|[Gg]reet
+@match h[ae]llo|hi|greet
 Hello! I'm waiting for my master.
 @match master
 Yes, he went adventuring and I await
diff --git a/dragonisland/tavern b/dragonisland/tavern
index d5f655c45..99ec0bfb8 100644
--- a/dragonisland/tavern
+++ b/dragonisland/tavern
@@ -6,6 +6,7 @@ width 18
 height 16
 msg
 Created:  1997-02-18
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch afloor_right
@@ -419,13 +420,13 @@ end
 arch fatman
 name Tobias
 msg
-@match [Hh][ae]llo|[Hh]i|[Gg]reet
+@match h[ae]llo|hi|greet
 Hi there.
 *Tobias sighs deeply.*
 So, you're an adventurer, aren't you?
-@match [Nn]o
+@match no
 Oh well.
-@match [Yy]es|adventurer
+@match yes|adventurer
 Well, that this is probably the right
 place for you to live. The guild is
 famous. That's what I came here for,
@@ -607,7 +608,7 @@ end
 arch veiled_woman
 name Jalishea
 msg
-@match [Hh][ae]llo|[Hh]i|[Gg]reet
+@match h[ae]llo|hi|greet
 Hello !
 @match day
 Oh, a beautiful day indeed! Just don't
@@ -1049,7 +1050,7 @@ end
 arch c_man
 name barkeep
 msg
-@match [Dd]rink|[Bb]ooze|[Yy]es
+@match drink|booze|yes
 A drink costs 3 gp.
 @match *
 Do you want something to drink?
@@ -1897,7 +1898,7 @@ end
 arch dark_elf
 name Kharazzad Do'Bredin
 msg
-@match [Hh][ae]llo|[Hh]i
+@match h[ae]llo|hi
 Hello !
 You seem to be a nice person. Maybe
 you would like to visit my friends in
@@ -1944,12 +1945,12 @@ y 7
 end
 arch sailor
 msg
-@match [Hh][ae]llo|[Hh]i
+@match h[ae]llo|hi
 Hello, landrat! I'm so happy I can
 leave Stoneville with the next ship.
 You cannot imagine what kind of
 people live here!
-@match [Pp]eople|live|[Ss]toneville
+@match people|live|stoneville
 The people who live here are
 adventurers, and they got all their
 pet monsters with them! They have a
@@ -2094,7 +2095,7 @@ end
 arch elec_dragon
 name electric dragon child
 msg
-@match [Hh][ae]llo|[Hh]i
+@match h[ae]llo|hi
 Hello! This is a nice tavern the
 humans have build here! I wish my
 parents could see it!
@@ -2115,7 +2116,7 @@ end
 arch fire_dragon
 name red dragon child
 msg
-@match [Hh][ae]llo|[Hh]i
+@match h[ae]llo|hi
 Hello!
 endmsg
 x 16
diff --git a/navar_city/misc/library b/navar_city/misc/library
index 4c1cbdc2a..0f2042f96 100644
--- a/navar_city/misc/library
+++ b/navar_city/misc/library
@@ -13,6 +13,7 @@ enter_x 9
 enter_y 15
 msg
 Created:  1996-04-28 b.t. (thomas@astro.psu.edu)
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch grass
@@ -1402,7 +1403,7 @@ end
 arch sage
 name Nanoc the Sage
 msg
-@match Hi|hi|hello
+@match hi|hello
 Err... well welcome (*harumph*). Please
 try to keep quiet in the library.
 @match door|gate|enter|entrance|help
@@ -2489,7 +2490,7 @@ end
 arch sage
 name Conan the Librarian
 msg
-@match Hi|hi|hello
+@match hi|hello
 Err... well welcome (*harumph*). Please
 try to keep quiet in the library.
 @match door|gate|enter|entrance|help
diff --git a/port_joseph/town/dshark b/port_joseph/town/dshark
index b6fff9adb..1e7005e2f 100644
--- a/port_joseph/town/dshark
+++ b/port_joseph/town/dshark
@@ -6,6 +6,7 @@ width 18
 height 14
 msg
 Created:  1994-05-17 langley (langley@fermat.dartmouth.edu)
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch brush
@@ -352,13 +353,13 @@ end
 arch pirate
 name Redeye
 msg
-@match redeye|Redeye
+@match redeye
 That's me name, what of it?
-@match percival|percy|Percy|Percival
+@match percival|percy
 Ah, ye want to learn his secrets?
 Well, the only one who he will speak
 to is the lovely lady Portia.
-@match portia|lady|Portia
+@match portia|lady
 Ah, a pretty lass in her day.  She
 has a house up near the church.  Ask
 her about Percy, not me.
@@ -366,7 +367,7 @@ her about Percy, not me.
 Heh he everyones after a pirate's
 gold.  More like yer bones will
 litter the sandy deep.
-@match moogly|bill|Moogly|Bill
+@match moogly|bill
 Moogly Bill was a terror to peaceful
 folk.  He took his secrets to his
 grave, and made sure his grave was
@@ -585,7 +586,7 @@ y 11
 end
 arch pirate
 msg
-@match redeye|Redeye
+@match redeye
 Heh, he's me mate oer in the
 corner.
 @match *
@@ -1041,7 +1042,7 @@ end
 arch woman
 name Drunk woman
 msg
-@ match *
+@match *
 Won'tcha buy a girl a drink? >hic<
 endmsg
 x 10
@@ -1099,7 +1100,7 @@ Yes, he was buried with his treasure
 map.  Only Peg Leg Percival knows where.
 Redeye knows Percival, but he won't
 talk to us.
-@match redeye|Redeye
+@match redeye
 Redeye is in the back room watching
 the fight.  He's the ugly one.
 endmsg
@@ -1291,13 +1292,13 @@ y 12
 end
 arch pirate
 msg
-@match [Pp]ercy|[Pp]ercival|pegleg
+@match percy|percival|pegleg
 Old Percival is retired and
 spends his time fishin.  He won't
 talk to the likes o' us.
 @match hello|howdy|hi
 Arr.  Goodday to ye.
-@match bill|moogly|Moogly|Bill
+@match bill|moogly
 Ay, the dread pirate Moogly Bill.
 Terror of the high seas.
 No one found his pirate loot, he
diff --git a/port_joseph/town/portia2 b/port_joseph/town/portia2
index 7cb608e3a..18e8c93b9 100644
--- a/port_joseph/town/portia2
+++ b/port_joseph/town/portia2
@@ -6,7 +6,7 @@ width 24
 height 16
 msg
 Created:  1994-05-26 langley
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch woodfloor
@@ -2031,10 +2031,10 @@ end
 arch pirate_lass
 name Portia
 msg
-@match hello|hi|greetings|Hello|Hi
+@match hello|hi|greetings
 Hello, stranger, you sure do know
 how to make an entrance!
-@match percival|percy|Percival|Percy
+@match percival|percy
 Ah Percy!  Being stubborn is he?
 Well, he and I are old friends.
 Yes, just mention `violet'
@@ -2047,7 +2047,7 @@ My pirating days are over.
 @match entrance
 You handily dealt with my rough crew,
 now, what can I do for you?
-@match moogly|bill|Moogly|Bill
+@match moogly|bill
 The dread Moogly Bill.  It
 is said he haunts his grave tormented
 by the souls of those he murdered.
diff --git a/pup_land/ancient/castle/castle.4 b/pup_land/ancient/castle/castle.4
index 2b7196066..7d36cfe69 100644
--- a/pup_land/ancient/castle/castle.4
+++ b/pup_land/ancient/castle/castle.4
@@ -6,6 +6,7 @@ width 28
 height 28
 msg
 Created:  1996-02-15
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch marble
@@ -2050,13 +2051,13 @@ end
 arch prisoner
 name dying prisoner
 msg
-@match [Cc]orpse|[Yy]es
+@match corpse|yes
 ... the Evil Masters... killing one
 person - every week... and
 Gothwolte... searching for the
 `perfect body'... so they... joined
 forces...
-@match [Gg]othwolte
+@match gothwolte
 ... Gothwolte... testing our
 strengh... all of us... died...
 and now... my turn...
@@ -2198,7 +2199,7 @@ y 19
 end
 arch magic_ear
 msg
-@match whirlwind|Whirlwind
+@match whirlwind
 Click.
 endmsg
 x 11
diff --git a/pup_land/ancient/castle/castle.6 b/pup_land/ancient/castle/castle.6
index b12c67f7c..5229bd122 100644
--- a/pup_land/ancient/castle/castle.6
+++ b/pup_land/ancient/castle/castle.6
@@ -6,6 +6,7 @@ width 29
 height 28
 msg
 Created:  1996-02-15
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch marble
@@ -3239,7 +3240,7 @@ connected 1
 end
 arch magic_ear
 msg
-@match fulgor|Fulgor
+@match fulgor
 Click.
 endmsg
 x 9
diff --git a/pup_land/ancient/castle/castle.ud1 b/pup_land/ancient/castle/castle.ud1
index 77e5dc071..30e3a4c78 100644
--- a/pup_land/ancient/castle/castle.ud1
+++ b/pup_land/ancient/castle/castle.ud1
@@ -6,6 +6,7 @@ width 32
 height 32
 msg
 Created:  Andreas Vogl (red.blaze@gmx.net)
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch marble
@@ -932,14 +933,14 @@ end
 arch woman2
 name Lara
 msg
-@match [Mm]arr[iy]
+@match marr[iy]
 My husband's name is Romeo. If you
 ever see him, tell him that I love him
 and that I'll wait for him in
 afterlife!
 There's no way for you to set me free,
 I'm heavily chained... *crying*
-@match [Rr]omeo
+@match romeo
 He is working on the translation
 of ancient scripts. The Evil Masters
 don't want them to be translated...
diff --git a/pup_land/ancient/castle/gothwolte.3 b/pup_land/ancient/castle/gothwolte.3
index c4e019f3c..a2bf3fd9d 100755
--- a/pup_land/ancient/castle/gothwolte.3
+++ b/pup_land/ancient/castle/gothwolte.3
@@ -6,6 +6,7 @@ width 19
 height 23
 msg
 Created:  2000-06-04
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch dirtfloor
@@ -1120,7 +1121,7 @@ y 8
 end
 arch lord_e
 msg
-@match acid|Acid
+@match acid
 Ouch, you know my weakness! But that
 won't change anything...
 @match *
diff --git a/pup_land/ancient/company b/pup_land/ancient/company
index 5bf3e8325..876c301d8 100644
--- a/pup_land/ancient/company
+++ b/pup_land/ancient/company
@@ -6,6 +6,7 @@ width 16
 height 16
 msg
 Created:  1996-02-21
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch grass
@@ -582,13 +583,13 @@ end
 arch conjurer
 name telepathist
 msg
-@match Margaret|margaret
+@match margaret
 I see Joseph's brother in the fire.
 Margaret loves Joseph's brother.
-@match Joseph|joseph
+@match joseph
 I see Margaret in the fire.
 Joseph loves Margaret.
-@match [Ee]vil [Mm]aster
+@match evil master
 Haha you would like to defeat the
 evil masters? You cannot defeat evil
 itself! I see your grave in the fire,
diff --git a/pup_land/ancient/kurte/house b/pup_land/ancient/kurte/house
index 3be02b7c7..14dc18e8d 100644
--- a/pup_land/ancient/kurte/house
+++ b/pup_land/ancient/kurte/house
@@ -6,6 +6,7 @@ width 21
 height 21
 msg
 Created:  1996-02-02
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch grass
@@ -1023,7 +1024,7 @@ justify the usage of necromantic magic.
 You dare to ask ME about necromantic
 spells? By the bounds of honour, I
 cannot teach it to you.
-@match [Ee]vil [Mm]aster
+@match evil master
 The Evil Masters pose a threat to this
 world. But don't forget that you
 came here to save Eureca.
diff --git a/pup_land/ancient/mountain/cave.b3 b/pup_land/ancient/mountain/cave.b3
index 1a64620f6..f881851d7 100644
--- a/pup_land/ancient/mountain/cave.b3
+++ b/pup_land/ancient/mountain/cave.b3
@@ -6,6 +6,7 @@ width 22
 height 32
 msg
 Created:  1996-02-30
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch medium_stones
@@ -1372,7 +1373,7 @@ end
 arch sage
 name wise old man
 msg
-@match Ladder|ladder
+@match ladder
 You entered this cave by using a ladder,
 didn't you?
 @match *
diff --git a/pup_land/ancient/mountain/tower.1 b/pup_land/ancient/mountain/tower.1
index 3057699c9..acda7dc07 100644
--- a/pup_land/ancient/mountain/tower.1
+++ b/pup_land/ancient/mountain/tower.1
@@ -6,6 +6,7 @@ width 26
 height 33
 msg
 Created:  1996-02-31
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch large_stones
@@ -3123,7 +3124,7 @@ activate_on_release 1
 end
 arch necromancer
 msg
-@match [Ss]iegfried
+@match siegfried
 I hate Siegfried!!! He's a dork!
 @match *
 Grr... You're getting on my nerves!
diff --git a/pup_land/ancient/mountain/tower.2 b/pup_land/ancient/mountain/tower.2
index 27e711430..643529f4b 100755
--- a/pup_land/ancient/mountain/tower.2
+++ b/pup_land/ancient/mountain/tower.2
@@ -6,7 +6,7 @@ width 18
 height 23
 msg
 Created:  1996-06-01
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch blocked
@@ -1364,7 +1364,7 @@ activate_on_release 1
 end
 arch necromancer
 msg
-@match [Ss]iegfried
+@match siegfried
 I hate Siegfried!!! He's a liar!
 @match *
 Arrgh! HIM again!
diff --git a/pup_land/ancient/mountain/tower.3 b/pup_land/ancient/mountain/tower.3
index 642d26de4..c063dd641 100755
--- a/pup_land/ancient/mountain/tower.3
+++ b/pup_land/ancient/mountain/tower.3
@@ -5,7 +5,7 @@ width 19
 height 19
 msg
 Created:  1996-06-01
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch generate_zombie
@@ -1268,7 +1268,7 @@ y 12
 end
 arch necromancer
 msg
-@match [Ss]iegfried
+@match siegfried
 I hate Siegfried!!!!!
 He is a swindler, a jerk, a rascal!
 @match *
diff --git a/pup_land/ancient/ruin/underground b/pup_land/ancient/ruin/underground
index 1cd8ca81b..f674cf791 100644
--- a/pup_land/ancient/ruin/underground
+++ b/pup_land/ancient/ruin/underground
@@ -7,6 +7,7 @@ width 20
 height 20
 msg
 Created:  1996-06-08
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch dungeon_floor
@@ -1281,11 +1282,11 @@ end
 arch thief
 name Andersen, boss of the gang
 msg
-@match Siegfried|siegfried
+@match siegfried
 Haha, he is the hero of this land.
 He would never kill anybody!
 I don't believe you.
-@match Cordish|cordish
+@match cordish
 Siegfried and Cordish are one and the
 same person? Now I begin to
 understand...
@@ -1293,11 +1294,11 @@ I will kill him! And you may pass
 friend. But be careful...
 I hear frightening noises from the
 castle every night!
-@match Path|path|gate|Gate
+@match path|gate
 If you want to pass,
 please tell me "who killed Jacob, my
 follower".
-@match Boss|boss|Gang|gang
+@match boss|gang
 Yeah!
 We Robbed the mysterious cristal from
 the castle by using the secret Path!
diff --git a/pup_land/ancient/village/hole/hole.B1 b/pup_land/ancient/village/hole/hole.B1
index 1a38a83c2..b23b191c7 100644
--- a/pup_land/ancient/village/hole/hole.B1
+++ b/pup_land/ancient/village/hole/hole.B1
@@ -1400,7 +1400,7 @@ end
 arch beggar
 name crazy old man
 msg
-@match [Cc]astle|evil
+@match castle|evil
 Oh yes I can feel it! They must have
 opened a gate to another dimension...
 We will surely perish...
diff --git a/pup_land/ancient/village/hut1 b/pup_land/ancient/village/hut1
index 7f83034a7..1f41ac916 100644
--- a/pup_land/ancient/village/hut1
+++ b/pup_land/ancient/village/hut1
@@ -6,6 +6,7 @@ width 16
 height 16
 msg
 Created:  1996-02-17
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch pstone_1
@@ -342,10 +343,10 @@ end
 arch a_townsman2
 name father
 msg
-@match [Ss]iegfried
+@match siegfried
 This country is in serious need of a
 hero. Siegfried will save us!
-@match [Gg]othwolte
+@match gothwolte
 Shhh! You should only wisper that name.
 It can be dangerous to speak it loud.
 @match *
@@ -513,7 +514,7 @@ end
 arch woman
 name mother
 msg
-@match Daughter|daughter
+@match daughter
 Two weeks ago, suddenly she lost her
 speech...
 @match *
@@ -875,9 +876,9 @@ end
 arch woman
 name Janet
 msg
-@match Siegfried|siegfried
+@match siegfried
 ....
-@match Jacob|jacob
+@match jacob
 .. he was killed by ...
 @match *
 ...
diff --git a/pup_land/ancient/village/hut2 b/pup_land/ancient/village/hut2
index 1f134e639..85946fb21 100644
--- a/pup_land/ancient/village/hut2
+++ b/pup_land/ancient/village/hut2
@@ -6,6 +6,7 @@ width 16
 height 16
 msg
 Created:  1996-02-17
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch pstone_1
@@ -680,11 +681,11 @@ end
 arch man
 name timothey
 msg
-@match Kurte|kurte
+@match kurte
 Kurte means "elders of our land".
 They live in the forest north-east
 of the country.
-@match [Gg]othwolte
+@match gothwolte
 I helped Kurte researching about
 Gothwolte. I found out that his sword,
 the ancient dancing sword, is called
diff --git a/pup_land/ancient/village/hut3 b/pup_land/ancient/village/hut3
index 3808e8824..a1eea716e 100644
--- a/pup_land/ancient/village/hut3
+++ b/pup_land/ancient/village/hut3
@@ -6,6 +6,7 @@ width 19
 height 16
 msg
 Created:  1996-02-18
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch pstone_1
@@ -631,7 +632,7 @@ Seek his advice.
 @match kurte
 I don't know where to find him. Ask
 Timothey, he might know.
-@match Jacob|jacob
+@match jacob
 My husband, Jacob got murdered
 two weeks ago...
 @match *
diff --git a/pup_land/ancient/village/hut4 b/pup_land/ancient/village/hut4
index 75ec9135a..9202c1268 100644
--- a/pup_land/ancient/village/hut4
+++ b/pup_land/ancient/village/hut4
@@ -6,6 +6,7 @@ width 16
 height 16
 msg
 Created:  1996-02-18
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch pstone_1
@@ -436,16 +437,16 @@ y 11
 end
 arch sage
 msg
-@match Robber|robber
+@match robber
 The castle was locked by Siegfried.
 How could they enter the castle?
 Isn't that remarkable?
-@match Mysterious|mysterious|crystal
+@match mysterious|crystal
 The monsters loved it.
 So, when they noticed that the crystal
 had been stolen they got very angry and
 destroyed the village.
-@match Destroy|destroy
+@match destroy
 Because of the Mysterious Crystal.
 Three robbers from that village
 robbed the crystal from evil masters'
diff --git a/pup_land/ancient/village/hut5 b/pup_land/ancient/village/hut5
index fd5a7b2e7..e116ca18b 100644
--- a/pup_land/ancient/village/hut5
+++ b/pup_land/ancient/village/hut5
@@ -6,6 +6,7 @@ width 16
 height 16
 msg
 Created:  1996-02-21
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch pstone_1
@@ -542,7 +543,7 @@ end
 arch man
 name Joseph
 msg
-@match yes|Yes
+@match yes
 Thanks.
 When success is ours, I'll give you
 some money.
@@ -1045,7 +1046,7 @@ end
 arch woman
 name Margaret
 msg
-@match love|Love|Joseph|joseph
+@match love|joseph
 ... It's secret.
 ** She blushed fiery red. **
 @match *
diff --git a/pup_land/ancient/village/hut6 b/pup_land/ancient/village/hut6
index e44425c57..b288b0b36 100644
--- a/pup_land/ancient/village/hut6
+++ b/pup_land/ancient/village/hut6
@@ -6,6 +6,7 @@ width 16
 height 16
 msg
 Created:  1997-02-03
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch pstone_1
@@ -767,9 +768,9 @@ y 5
 end
 arch woman
 msg
-@match Artifact|artifact
+@match artifact
 I don't know any details about it.
-@match Necromancer|necromancer
+@match necromancer
 He lives at the tower in the east
 mountain. Maybe my husband is
 imprisoned near that tower. Please save
diff --git a/pup_land/ancient/village/inn b/pup_land/ancient/village/inn
index 86d10cfa9..f9d4dde8b 100644
--- a/pup_land/ancient/village/inn
+++ b/pup_land/ancient/village/inn
@@ -6,6 +6,7 @@ width 16
 height 16
 msg
 Created:  1996-02-17
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch pstone_1
@@ -943,7 +944,7 @@ end
 arch human
 name Rloy
 msg
-@match Jacob|jacob
+@match jacob
 One day before he got killed,
 me and him went to Siegfried's
 house in order to rob his treasure.
@@ -953,12 +954,12 @@ I was not interested in it, But Jacob
 took it with brightening eyes.
 Next day he was killed by someone.
 I'm sad... he was my best friend...
-@match Boss|boss
+@match boss
 I don't know where he is.
 All I can say is  that he should live
 somewhere. I haven't seen him since
 the day Shining Village was destroyed.
-@match [Mm]ysterious|[Cc]rystal
+@match mysterious|crystal
 Yeah!, our Boss and us robbed that
 crystal from the evil masters.
 @match *
diff --git a/pup_land/ancient/village/library b/pup_land/ancient/village/library
index 8393d4fba..3a5e6f14b 100644
--- a/pup_land/ancient/village/library
+++ b/pup_land/ancient/village/library
@@ -6,6 +6,7 @@ width 15
 height 14
 msg
 Created:  2000-06-03
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch dungeon_magic
@@ -938,7 +939,7 @@ y 7
 end
 arch magic_ear
 msg
-@match favour|Favour
+@match favour
 endmsg
 x 6
 y 7
@@ -955,20 +956,20 @@ end
 arch merchant
 name Romeo
 msg
-@match Lara|lara
+@match lara
 You have seen her? In the castle...
 What did she say? - Afterlife?
 That is not an option, I want to have
 babies with her! Please, could you do
 me a favour?
-@match [Jj]ulia|[Jj]uliet
+@match julia|juliet
 It is not THAT easy, you know...
-@match [Ff]avour
+@match favour
 Great, please defeat the Evil Masters!
 Take this book of mine. It might help
 you to find your way through that
 castle.
-@match [Ww]ife
+@match wife
 You have seen her? You are a liar, you
 don't even know her name.
 @match *
diff --git a/pup_land/ancient/village/siegfried/siegfried.1 b/pup_land/ancient/village/siegfried/siegfried.1
index 4764f2331..166730c5d 100644
--- a/pup_land/ancient/village/siegfried/siegfried.1
+++ b/pup_land/ancient/village/siegfried/siegfried.1
@@ -6,7 +6,7 @@ width 40
 height 32
 msg
 Created:  1996-06-03
-Modified: 2008-05-08 Nicolas Weeger
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch pstone_1
@@ -2032,7 +2032,7 @@ y 18
 end
 arch magic_ear
 msg
-@match kill|Kill
+@match kill
 endmsg
 x 8
 y 18
@@ -3382,7 +3382,7 @@ y 4
 end
 arch magic_ear
 msg
-@match open|Open|OPEN|boGus
+@match open|boGus
 Error: unexpected message.
 endmsg
 x 14
diff --git a/pup_land/ancient/village/siegfried/siegfried.3 b/pup_land/ancient/village/siegfried/siegfried.3
index 8b6f775e2..ad50b5bbc 100644
--- a/pup_land/ancient/village/siegfried/siegfried.3
+++ b/pup_land/ancient/village/siegfried/siegfried.3
@@ -6,6 +6,7 @@ width 13
 height 13
 msg
 Created:  1996-06-07
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch woodfloor
@@ -446,40 +447,40 @@ y 6
 end
 arch siegfried
 msg
-@match Key|key
+@match key
 ... I cannot give you it to you...
 because Eureca is very dangerous now!
-@match Lock|lock
+@match lock
 I locked the castle entrance with my
 Key.
-@match Ran|ran
+@match ran
 I ran away from the castle,
 and I Locked the castle entrance
 in order to prevent Eureca from
 leaving that place.
-@match Sword|sword
+@match sword
 Eureca picked up the sword, because he
 was curious about it. Then he started
 screaming and punching at his own head.
 I was frightened by his behavior, and
 ran away from the castle.
-@match [Gg]othwolte
+@match gothwolte
 Eureca fought against Ghothwolte.
 After a long fight, Eureca killed him!
 As soon as Ghothwolte had died,
 his black Sword flashed mysteriously.
-@match Castle|castle
+@match castle
 There were four evil masters in the
 castle. But we didn't deal with them.
 We went directly to the top of the
 castle, to Ghothwolte's room.
-@match Everything|everything
+@match everything
 Eureca and I came here two months ago.
 We went straight to Ghothwolte's
 Castle.
-@match Unpunished|unpunished
+@match unpunished
 I say Everything.
-@match Kill|kill
+@match kill
 No, please! I'm too young to die!
 @match *
 Don't Kill me!
diff --git a/pup_land/ancient/village/siegfried/siegfried.B1 b/pup_land/ancient/village/siegfried/siegfried.B1
index c2126efae..cfeb59c51 100644
--- a/pup_land/ancient/village/siegfried/siegfried.B1
+++ b/pup_land/ancient/village/siegfried/siegfried.B1
@@ -6,6 +6,7 @@ width 16
 height 16
 msg
 Created:  1996-06-05
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch flagstone
@@ -327,7 +328,7 @@ y 10
 end
 arch magic_ear
 msg
-@match open|Open|OPEN
+@match open
 Click.
 endmsg
 x 3
diff --git a/pup_land/ancient/village/tavern b/pup_land/ancient/village/tavern
index 8ddd37c5f..a4b688e40 100644
--- a/pup_land/ancient/village/tavern
+++ b/pup_land/ancient/village/tavern
@@ -6,6 +6,7 @@ width 16
 height 18
 msg
 Created:  1996-02-21
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch woodfloor
@@ -533,12 +534,12 @@ y 2
 end
 arch priest
 msg
-@match Necromancer|necromancer
+@match necromancer
 He is very nasty because he dislikes
 Siegfried. He lives in the mountains.
 But Siegfried is kind enough to let
 him live for another weak or two.
-@match Hole|hole
+@match hole
 Monsters manage to come out.
 I guess they are Necromancer's work.
 @match *
@@ -1238,19 +1239,19 @@ y 2
 end
 arch siegfried
 msg
-@match Cordish|cordish
+@match cordish
 Psst! You know my old name, don't you?
 I want to have a talk with you.
 There is a switch in the tree of my
 house.
-@match [Yy]ou killed [Jj]acob
+@match you killed jacob
 Hahaha!
 I love such kind of joke.
 BTW, I wanna invite you to dinner.
 There is a switch in the tree of my
 house.
 I'll be waiting for you :)
-@match no|No
+@match no
 You refuse to fetch my beer? Don't
 forget that you all owe me for my
 heroic deeds!
@@ -1951,11 +1952,11 @@ y 3
 end
 arch sage
 msg
-@match Servant|servant
+@match servant
 Siegfried's servant got killed during
 the battle. He obviously wasn't much
 of help.
-@match Siegfried|siegfried
+@match siegfried
 We have been suffering from evil
 monsters for a long time.
 Six months ago, he and his servant
diff --git a/pup_land/ancient/village/tavern1 b/pup_land/ancient/village/tavern1
index e54553c49..c84a625e5 100644
--- a/pup_land/ancient/village/tavern1
+++ b/pup_land/ancient/village/tavern1
@@ -6,7 +6,7 @@ width 34
 height 19
 msg
 Created:  1996-02-21
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch woodfloor
@@ -1029,11 +1029,11 @@ y 11
 end
 arch viking
 msg
-@match [Pp]erson
+@match person
 I have never seen him.
 But I expect that he lives in the house
 where there is the burning fireplace.
-@match yes|Yes|No|no
+@match yes|no
 It's a ghost town now.
 But I've heard that one Person
 still lives in the town.
@@ -1788,7 +1788,7 @@ y 4
 end
 arch magic_ear
 msg
-@match yes|Yes
+@match yes
 Click.
 endmsg
 x 11
@@ -1802,10 +1802,10 @@ end
 arch swashbuckler
 name Hans
 msg
-@match Yes|yes
+@match yes
 Thanks.
 This symbol is needed to see him.
-@match [Bb]oss|find
+@match boss|find
 I can't tell you about the hiding
 place of the boss. There are too many
 people watching us.
diff --git a/pup_land/barrier b/pup_land/barrier
index cd142308a..76ec69687 100644
--- a/pup_land/barrier
+++ b/pup_land/barrier
@@ -6,6 +6,7 @@ width 34
 height 16
 msg
 Created:  1996-02-28
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch cobblestones2
@@ -359,7 +360,7 @@ y 3
 end
 arch viking
 msg
-@match Liberation|liberation
+@match liberation
 Oops!
 @match *
 I cannot pass. Members of Liberation
@@ -652,9 +653,9 @@ arch guard
 msg
 @match Siegfried
 You may pass :-).
-@match yes|Yes
+@match yes
 Please bring up it.
-@match no|No
+@match no
 .. Are you a member of resistance,
 aren't you?
 @match *
@@ -1073,7 +1074,7 @@ arch guard
 msg
 @match yes|passport
 Please bring it up.
-@match no|No
+@match no
 .. So you're a member of resistance,
 aren't you?
 @match *
@@ -1258,7 +1259,7 @@ arch guard
 msg
 @match yes|passport
 Please bring it up.
-@match no|No
+@match no
 .. So you're a member of resistance,
 aren't you?
 @match *
@@ -1405,7 +1406,7 @@ arch guard
 msg
 @match yes|passport
 Please bring it up.
-@match no|No
+@match no
 .. So you're a member of resistance,
 aren't you?
 @match *
@@ -1497,7 +1498,7 @@ arch guard
 msg
 @match yes|passport
 Please bring it up.
-@match no|No
+@match no
 .. So you're a member of resistance,
 aren't you?
 @match *
@@ -1526,7 +1527,7 @@ arch guard
 msg
 @match yes|passport
 Please bring it up.
-@match no|No
+@match no
 .. So you're a member of resistance,
 aren't you?
 @match *
@@ -1561,7 +1562,7 @@ arch guard
 msg
 @match yes|passport
 Please bring it up.
-@match no|No
+@match no
 .. So you're a member of resistance,
 aren't you?
 @match *
@@ -1978,7 +1979,7 @@ arch guard
 msg
 @match yes|passport
 Please bring it up.
-@match no|No
+@match no
 .. So you're a member of resistance,
 aren't you?
 @match *
diff --git a/pup_land/castle_eureca/castle_eureca5 b/pup_land/castle_eureca/castle_eureca5
index 38ebd3475..c3b93ecbd 100644
--- a/pup_land/castle_eureca/castle_eureca5
+++ b/pup_land/castle_eureca/castle_eureca5
@@ -6,6 +6,7 @@ width 22
 height 45
 msg
 Created:  1996-02-07
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch flagstone
@@ -3783,7 +3784,7 @@ connected 15
 end
 arch magic_ear
 msg
-@match disperse|Disperse
+@match disperse
 endmsg
 x 9
 y 30
@@ -3803,7 +3804,7 @@ end
 arch corpse1
 name Lord Eureca
 msg
-@match disperse|Disperse
+@match disperse
 Good.. now kill.. that.. son of a..
 bitch...
 *Eureca is coughing blood*
@@ -4067,15 +4068,15 @@ end
 arch sailor
 name Gothwolte
 msg
-@match [Ff]amily
+@match family
 Eureca's family? I don't care, bua ha
 ha...
-@match Eureca|eureca
+@match eureca
 Eureca is the perfect body. He fled
 from my attack and I have to find him
 soon. I'll let you live if you help me
 find Eureca.
-@match [Bb]ody
+@match body
 My body... that is the guy who found
 me recently, after horrible decades of
 waiting. But you don't understand my
diff --git a/pup_land/castle_eureca/castle_eureca9 b/pup_land/castle_eureca/castle_eureca9
index f8fab091d..0e74aaacc 100644
--- a/pup_land/castle_eureca/castle_eureca9
+++ b/pup_land/castle_eureca/castle_eureca9
@@ -6,6 +6,7 @@ width 15
 height 15
 msg
 Created:  1996-02-13
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch dungeon_floor
@@ -621,16 +622,16 @@ end
 arch woman
 name Lauretta
 msg
-@match [Gg]hothwolte
+@match ghothwolte
 Ghothwolte is the "perfect being".
 Even Eureca couldn't defeat him...
-@match Eureca|eureca
+@match eureca
 Eureca and Cordish went to consult
 with Kurte.
-@match Cordish|cordish
+@match cordish
 Cordish is our servant. He is a
 coward... I don't like him.
-@match Kurte|kurte
+@match kurte
 Kurte are the elders of pupland.
 They know everything about pupland.
 So they'll solve this disaster.
diff --git a/pup_land/kurte/kurte b/pup_land/kurte/kurte
index e4f4edb26..8ca2307f4 100644
--- a/pup_land/kurte/kurte
+++ b/pup_land/kurte/kurte
@@ -6,6 +6,7 @@ width 23
 height 25
 msg
 Created:  1996-02-03
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch blocked
@@ -1465,7 +1466,7 @@ y 3
 end
 arch magic_ear
 msg
-@match Yes|yes
+@match yes
 Click.
 endmsg
 x 11
@@ -1479,12 +1480,12 @@ end
 arch unicorn
 name Kurte
 msg
-@match Family|family
+@match family
 I can look all over this country...
 So... I saw that the hideout of
 Eureca's family has been discovered by
 the monsters...
-@match Solve|solve|[Aa]nswer
+@match solve|answer
 I didn't know anything about Ghothwolte.
 So I did some research. Read the
 scrolls above. I found out that
@@ -1493,7 +1494,7 @@ Nothing can harm it. So I told Eureca,
  "There is only one way to defeat it.
   Travel to the Past, and kill Ghothwolte
   before it is getting invulnerable!"
-@match [Tt]rouble|[Ss]tart
+@match trouble|start
 One night, Eureca's castle was attacked
 by monsters. Eureca defended his castle
 bravely, but Ghothwolte, the leader of
@@ -1505,16 +1506,16 @@ secret room in the castle. Then he
 and his servant, Cordish, came here
 to ask me how they could solve their
 disaster.
-@match [Ss]aving [Ee]ureca
+@match saving eureca
 At first, I'll tell you how all of this
 trouble started...
-@match Yes|yes
+@match yes
 Find and save Eureca...
 I count on you!
-@match Cordish|cordish
+@match cordish
 He is one of Eureca's servants.
 He looked scared and coward...
-@match Past|past
+@match past
 Eureca and his servant went to the
 past... and they didn't return yet...
 They must have gotten into trouble
diff --git a/pup_land/lone_town/guild_freedom b/pup_land/lone_town/guild_freedom
index c5d645546..d8ffa2c9f 100644
--- a/pup_land/lone_town/guild_freedom
+++ b/pup_land/lone_town/guild_freedom
@@ -6,6 +6,7 @@ width 20
 height 16
 msg
 Created:  1996-02-18
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch woodfloor
@@ -254,15 +255,15 @@ y 1
 end
 arch cleric
 msg
-@match Nurnberg|nurnberg
+@match nurnberg
 Far east from Lone Town.
-@match Liberation|liberation
+@match liberation
 We are members of Liberation Army.
-@match Regular|regular
+@match regular
 We fight against Regular Army.
-@match No|no|Sumson|sumson
+@match no|sumson
 Sumson is the spy of Liberation Army. He entered the city of Nurnberg, to collected information about our enemies, the Regular Army.
-@match Yes|yes
+@match yes
 Really!? So, Where is he?
 @match *
 Do you know Sumson?
@@ -584,13 +585,13 @@ y 13
 end
 arch sage
 msg
-@match Barrier|barrier
+@match barrier
 There is the barrior station to the south-east from Lone Town.
-@match Regular|regular
+@match regular
 We fight against Regular Army.
-@match Bauer|bauer
+@match bauer
 He is the leader of Regular Army and he is the mayer of Nurnberg.
-@match Lone|lone|town|Town
+@match lone|town
 Welcome to lone town!
 @match *
 Mr.Bauer and his Regular Army built the Barrier station.
@@ -1057,12 +1058,12 @@ y 2
 end
 arch barbarian
 msg
-@match [Rr]esistance
+@match resistance
 We are not the "resistance"!
-@match Regular|regular
+@match regular
 They call us "Resistance". In fact,
 we want nothing but freedom.
-@match Liberation|liberation
+@match liberation
 We'll win the war against Regular Army.
 There's no doubt about that.
 @match *
@@ -1373,9 +1374,9 @@ name Reception of Liberation Army
 msg
 @match protect nature
 Good, you passed the test! Talk to the guildmaster now. He will provide you with further instructions.
-@match Tower|tower
+@match tower
 The Tower of Ordeal lies to the east of lone town. I'll give you the key when you are ready.
-@match key|Key
+@match key
 Here it is. The key for the Tower of Ordeal.
 @match scroll
 You must find the scroll by yourself.
diff --git a/pup_land/lone_town/guild_law b/pup_land/lone_town/guild_law
index b9ccdc2c2..6b1e8f48f 100644
--- a/pup_land/lone_town/guild_law
+++ b/pup_land/lone_town/guild_law
@@ -6,7 +6,7 @@ width 24
 height 17
 msg
 Created:  1996-02-18
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch grass
@@ -464,7 +464,7 @@ end
 arch magic_ear
 name 1
 msg
-@match yes|Yes
+@match yes
 Click.
 endmsg
 x 4
@@ -478,7 +478,7 @@ end
 arch elf
 name Reception of ???
 msg
-@match Yes|yes
+@match yes
 Sorry, but I have to test your combat abilities first: Enter the Cave of Ordeal and search for a scroll. I have opened the gate for you...
 @match *
 Sssh! Please lower your voice...
@@ -979,9 +979,9 @@ end
 arch elf
 name Regular Army
 msg
-@match [Rr]esistance
+@match resistance
 Lone town is the origin and center of the "resistance" movement.
-@match Regular|regular
+@match regular
 We'll win the war against the resistance because we can outnumber them.
 @match *
 This is the guild of Regular Army. I'm working as a spy.
@@ -1444,9 +1444,9 @@ end
 arch elf
 name Regular Army
 msg
-@match Resistance|resistance
+@match resistance
 We fight against them.
-@match [Bb]arrier|[Ss]tation
+@match barrier|station
 There is a barrior station to the
 south-east from this town.
 We prevent Liberation Army from
@@ -1946,7 +1946,7 @@ end
 arch guildmaster
 name James, the guildmaster
 msg
-@match Siegfried
+@match siegfried
 He is our Hero!
 @match *
 Conglaturations! Now you are a member of Regular Army. Don't loose your passport, it enables you to pass the barrier station.
diff --git a/pup_land/lone_town/tavern b/pup_land/lone_town/tavern
index 19e906f7b..905a3fea5 100644
--- a/pup_land/lone_town/tavern
+++ b/pup_land/lone_town/tavern
@@ -6,6 +6,7 @@ width 25
 height 25
 msg
 Created:  1997-02-22
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch afloor_left
@@ -220,13 +221,13 @@ y 9
 end
 arch dwarf
 msg
-@match Fox|fox|Tail|tail
+@match fox|tail
 Fox Tails live in the forest, somewhere in the center of lone town. But we don't know how to get there.
-@match Nazgul|nazgul
+@match nazgul
 Nazgul's crew lives in the power plant, to the west of lone town.
-@match Gang|gang|Bandit|bandit
+@match gang|bandit
 One is Nazgul and his devils, the other one is "Fox Tails". The former are very cruel, Nazgul kills anyone on sight. The latter don't murder people.
-@match Rob|rob
+@match rob
 There are two Gangs of Bandits in this town.
 @match *
 Don't Rob anything!
@@ -296,16 +297,16 @@ end
 arch wizard
 name Trainee
 msg
-@match no|No
+@match no
 You should see it.
-@match yes|Yes
+@match yes
 So where did the "paper-sword" go?
 @match underground
 You are very bright! I'll tell you a secret:
 There is an invisible stairway to the south, under the Dressing room.
-@match stair|Stair
+@match stair
 Be careful! The Magician Leader is very strong.
-@match fool|Fool
+@match fool
 He is just stupid. However, his queries can be difficult. So, if you can't think of any correct answer, say honestly "I don't know".
 @match *
 Have you ever seen the Magic Show?
@@ -681,9 +682,9 @@ y 3
 end
 arch thief
 msg
-@match No|no|Castle|castle
+@match no|castle
 There are two ways into the castle. Eureca was very smart. Don't you know the cave to the north of castle? A secret passage from that cave leads into the castle.
-@match Yes|yes
+@match Yes
 ...
 @match *
 Have you ever been to the Castle of Eureca?
@@ -1248,15 +1249,15 @@ end
 arch mage
 name Learned man
 msg
-@match Cordish|cordish
+@match cordish
 He lives in the south-eastern part of the town.
-@match son|Son|wife|Wife
+@match son|wife
 Ask Cordish about them.
-@match daughter|Daughter
+@match daughter
 "he has no daughter"
-@match family|Family
+@match family
 Eureca has a Wife and a Son.
-@match Eureca|eureca|No|no
+@match eureca|no
 He used to be the lord of this country. But he disappeared two years ago. His Family is still waiting for him to return...
 @match *
 Do you know the Castle of Eureca?
@@ -1319,11 +1320,11 @@ y 22
 end
 arch viking
 msg
-@match Item|item
+@match item
 Shopkeepers say, "Transports are stopped by the war". But they hide many items under their shop, and wait for a rise in prices!
-@match yes|Yes
+@match yes
 There are a few Items in it.
-@match No|no
+@match no
 You had not better going there.
 @match *
 Have you ever been to shops in Lone Town?
@@ -1448,9 +1449,9 @@ y 17
 end
 arch swashbuckler
 msg
-@match Tower|tower|No|no
+@match tower|no
 It's to the east of the Lone Town. I've heard there should be a powerful artifact, a cloak, inside that tower... If I only knew how to enter!!!
-@match yes|Yes
+@match yes
 I have been there too, but I couldn't enter... :-(
 @match *
 Do you know Tower of Ordeal yet?
@@ -1931,11 +1932,11 @@ y 3
 end
 arch northman
 msg
-@match Tree|tree
+@match tree
 He loves trees very much.
-@match Tower|tower
+@match tower
 He plants Tree around the tower.
-@match Pupuly|pupuly
+@match pupuly
 He lives in his Tower.
 @match *
 Pupuly is in his second childhood.
@@ -2139,9 +2140,9 @@ end
 arch viking
 name Frederick
 msg
-@match heinrich|Heinrich
+@match heinrich
 We live in sourth-eastern part of lone town.
-@match yes|Yes
+@match yes
 So you have traveled to many places yet, I guess? Have you ever seen the pre-historical site? My brother, Heinrich has searched for that pre-historical sites for many years now. If you know anything about it, please go and talk to Heinrich.
 @match *
 Are you an adventurer?
@@ -2479,11 +2480,11 @@ end
 arch swashbuckler
 name Canvasser
 msg
-@match yes|Yes
+@match yes
 Great, go to the guild of freedom, our guild.
-@match [Ll]iberation|[Aa]rmy
+@match liberation|army
 Do you wanna join us? :-)
-@match no|No
+@match no
 You are a member of Regular Army, aren't you? - I'LL KILL YOU!!
 @match *
 I'm a member of Liberation army.
@@ -2991,11 +2992,11 @@ y 12
 end
 arch sage
 msg
-@match Hello|Hi|hello|hi
+@match hello|hi
 Hello stranger! Do you buy a booze for me?
-@match no|No|nope
+@match no|nope
 Then go away!
-@match yes|Yes
+@match yes
 Thank you. Did you ever heared of Maveric the founder of the Forgotten Town? Until he died there was everything better in the Town. As he died only adventurers discovered the entrance to the town hidden under the earth.
 @match where
 When you want to see it travel to Darcap.
@@ -3261,15 +3262,15 @@ y 6
 end
 arch dwarf_priest
 msg
-@match [Ee]lectric|[Pp]ower|[Pp]lant
+@match electric|power|plant
 It's located to the west of Lone Town. Would you retrieve the report for me?
-@match Thieves|thieves
+@match thieves
 Their aggitating point (agito) is the Electric Power Plant.
-@match Nazgul|nazgul
+@match nazgul
 He is the boss of those Thieves.
-@match Note|note
+@match note
 It is the Nazgul Report. We must know him - to defeat him. Now he stole it!
-@match yes|Yes
+@match yes
 Thanks. If you get the Report, please put it on this table. I'll give you my special tool. But be careful! Nazgul is an odd creature. And his bodyguard, Ologhi is very strong.
 @match *
 My research Notes were stolen by thieves!
@@ -3361,7 +3362,7 @@ end
 arch guildmaster
 name Bob
 msg
-@match Nurnberg|nurnberg
+@match nurnberg
 Nurnberg is located far east from this here.
 @match Lickmond
 He works for Bauer. He is the general of Regular Army.
@@ -3369,13 +3370,13 @@ He works for Bauer. He is the general of Regular Army.
 He is the mayor of the Nurnberg. Shortly after Eureca was gone, he said:
 "The people of Lone Town kidnapped Eureca. We must not permit their reckless attempt."
 In fact, THEY have kidnapped Eureca, probably Bauer himself did it.
-@match Regular|regular
+@match regular
 Bauer and Lickmond are the leaders of Regular Army.
-@match Eureca|eureca
+@match eureca
 He is the lord of this country.
-@match no|No
+@match no
 They kidnapped the lord of the land, Eureca. Those dirty bastards!
-@match yes|Yes
+@match yes
 ...
 @match *
 Do you know why we fight agaist the Regular Army?
@@ -3507,13 +3508,13 @@ end
 arch elf
 name Spy of Regular Army
 msg
-@match No|no
+@match no
 You will regret your decision...
-@match spy|Spy
+@match spy
 Oops! Sure... I'm a spy of Regular Army. Please, don't tell anybody.
-@match Regular|regular
+@match regular
 Would you like to join us? :-)
-@match yes|Yes
+@match yes
 So, go to the guild of law, our guild. The password of the guild is "blackbird". Don't forget that...
 @match *
 Be quiet!
diff --git a/pup_land/lone_town/training b/pup_land/lone_town/training
index 58c54a00d..1f6ad30c0 100644
--- a/pup_land/lone_town/training
+++ b/pup_land/lone_town/training
@@ -7,6 +7,7 @@ height 25
 enter_x 1
 msg
 Created:  1996-02-29
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch cobblestones2
@@ -571,11 +572,11 @@ y 3
 end
 arch mage
 msg
-@match yes|Yes
+@match yes
 He is such a coward. He always ran away
 from the kobolds in Room 1.
 hahaha!
-@match no|No|Cordish|cordish
+@match no|cordish
 He used to live in the south-east of
 lone town.
 But now he his missing.
@@ -1159,7 +1160,7 @@ end
 arch fighter
 name Instructor
 msg
-@match [Cc]ordish
+@match cordish
 Cordish was my worst pupil ever. I couldn't teach him how to fight because he always ran away. Unbelievable that Eureca accepted such a person as royal servant.
 @match *
 Here is the Training Center of Liberation Army. Do you want to be my pupil?
diff --git a/pup_land/world b/pup_land/world
index b16749204..b3d3f572a 100644
--- a/pup_land/world
+++ b/pup_land/world
@@ -10,7 +10,7 @@ msg
 Created:  1996-02-25
 Updated 2007.11.12 by Gene Alexander
  - made this an outdoor map
-Modified: 2007-11-12 crossfire
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -2523,7 +2523,7 @@ end
 arch dog
 name Poppy the pup
 msg
-@match new|New
+@match new
 All of pupland has changed. Tons of
 bugfixes and new features. Enjoy it!
 @match friend|amigo
diff --git a/quests/peterm/Demonology/Demon1 b/quests/peterm/Demonology/Demon1
index db4d81151..79e453d25 100644
--- a/quests/peterm/Demonology/Demon1
+++ b/quests/peterm/Demonology/Demon1
@@ -5,6 +5,7 @@ width 15
 height 15
 msg
 Created:  1994-05-30 peterm (peterm@soda.berkeley.edu)
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch woodfloor
@@ -1261,7 +1262,7 @@ end
 arch charwoman
 name overworked gossipy cleaning woman
 msg
-@match hi|Hi
+@match hi|hello
 Hello to you, and good day, please
 don't mind me, i'm just straightening
 up a bit.
@@ -1284,7 +1285,7 @@ of their own name, it strikes fear
 into them.  So if you can get the name
 of the elementals, you may be able to
 force them to tell you what you want.
-@match thank you|Thank you
+@match thank you
 Why you're welcome!  It's really rare
 to find adventurers these days who
 have any manners whatsoever
diff --git a/quests/peterm/Demonology/Demon3 b/quests/peterm/Demonology/Demon3
index 812486bdf..2045cb021 100644
--- a/quests/peterm/Demonology/Demon3
+++ b/quests/peterm/Demonology/Demon3
@@ -5,6 +5,7 @@ width 15
 height 25
 msg
 Created:  1994-05-30 peterm (peterm@soda.berkeley.edu)
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch woodfloor
@@ -389,7 +390,7 @@ end
 arch lich
 name Dead Master of Earth
 msg
-@match Word
+@match word
 HAHAHAHAHAHAHAHAHAHAHA!!!!!!!
 @match Ycronrcldeth
 AAAAAAARRRRRGGGGGGHHHHH.......
@@ -409,7 +410,7 @@ end
 arch lich
 name Dead Master of Air
 msg
-@match Word
+@match word
 You think I'm going to tell you the
 word?  Well, why should I?  You can't
 do anything to me, I'm already dead.
@@ -1029,20 +1030,20 @@ end
 arch charwoman
 name even more gossipy cleaning woman
 msg
-@match hello|Hi|hi|boo
+@match hello|hi|boo
 You're not planning on opening those
 doors are you????
 If you are, let me run downstairs.
 Opening the gates summons the
 Guardians!
-@match Guardians|Guardian|guardians
+@match guardian|guardians
 yes, two visible, and two invisible.
 They guard the Portals in the corners
 of the rooms.  The Dead can be
 summoned by means of those portals.
 The Masters used the portals to
 question those who have passed on.
-@match word|Word|password|teleport
+@match word|password|teleport
 The teleporters lead to the levels
 above.  Each of the Masters had a
 syllable of the Word.  They had to
@@ -1053,7 +1054,7 @@ share the Word.  They spoke the
 Word in the order of their power,
 Air, Earth, Water, Fire.  But
 the Word died with them.
-@match Portal
+@match portal
 Yes, you can summon the dead
 with those portals if you know
 their names.  Getting them to
@@ -1069,7 +1070,7 @@ end
 arch lich
 name Dead Master of Water
 msg
-@match word|Word
+@match word
 I will not tell you.
 @match Brenlorien
 huunnnnnhhh....
@@ -1086,7 +1087,7 @@ end
 arch lich
 name Dead Master of Fire
 msg
-@match Word|word
+@match word
 I will not speak it to you.
 @match Brunvelden
 ....'rachakamar'........
@@ -1359,20 +1360,20 @@ end
 arch charwoman
 name even more gossipy cleaning woman
 msg
-@match hello|Hi|hi|boo
+@match hello|hi|boo
 You're not planning on opening those
 doors are you????
 If you are, let me run downstairs.
 Opening the gates summons the
 Guardians!
-@match Guardians|Guardian|guardians
+@match guardian|guardians
 yes, two visible, and two invisibile.
 They guard the Portals in the corners
 of the rooms.  The Dead can be
 summoned by means of those portals.
 The Masters used the portals to
 question those who have passed on.
-@match word|Word|password|teleport
+@match word|password|teleport
 The teleporters lead to the levels
 above.  Each of the Masters had a
 syllable of the Word.  They had to
@@ -1383,7 +1384,7 @@ share the Word.  They spoke the
 Word in the order of their power,
 Air, Earth, Water, Fire.  But
 the Word died with them.
-@match Portal
+@match portal
 Yes, you can summon the dead
 with those portals if you know
 their names.  Getting them to
diff --git a/scorn/misc/library b/scorn/misc/library
index 17270d98a..f8d4ec1a9 100644
--- a/scorn/misc/library
+++ b/scorn/misc/library
@@ -10,6 +10,7 @@ enter_x 9
 enter_y 15
 msg
 Created:  1996-04-28 b.t. (thomas@astro.psu.edu)
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 end
 arch grass
@@ -1399,7 +1400,7 @@ end
 arch sage
 name Holtsapple the Sage
 msg
-@match Hi|hi|hello
+@match hi|hello
 Err... well welcome (*harumph*). Please
 try to keep quiet in the library.
 @match door|gate|enter|entrance|help
@@ -2483,7 +2484,7 @@ end
 arch sage
 name Narweenle the Librarian
 msg
-@match Hi|hi|hello
+@match hi|hello
 Err... well welcome (*harumph*). Please
 try to keep quiet in the library.
 @match door|gate|enter|entrance|help