diff --git a/inn_and_outpost/nirlas_house b/inn_and_outpost/nirlas_house
index faa890df7..81f080d95 100644
--- a/inn_and_outpost/nirlas_house
+++ b/inn_and_outpost/nirlas_house
@@ -7,6 +7,7 @@ enter_x 23
 enter_y 6
 msg
 Created:  2004-05-28 Avion
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -1235,10 +1236,12 @@ msg
 @match hi|hello
 Hello, I am Nirla, please make yourself welcome.
 @match dark|forest
+@question greenway What is this "Greenway"?
 Although it may seem to be many places where you
 can find it, there is only one Dark Forest.
 It is all connected - these connections are called The Greenway.
-@match greenway|Greenway|way
+@match greenway
+@question portal Where can I find a portal?
 The Greenway of the forest spans the world (and some say even time itself).
 The portals are hard to find and the paths are chaotic and dangerous.
 Only the experienced may find their way.
@@ -5652,15 +5655,15 @@ smoothlevel 254
 end
 arch elf_1
 msg
-@match *
-Nirla keeps a restful house.
-
 @match Nirla
+@question queen What queen are you talking about?
 Yes this is her home. She is wise
 but also, she is the Queen's daughter.
-
-@match Queen
+@match queen
 The Queen of the elves.
+@match *
+@question Nirla Who is Nirla?
+Nirla keeps a restful house.
 endmsg
 x 21
 y 4
diff --git a/inn_and_outpost/outpost_aranor1 b/inn_and_outpost/outpost_aranor1
index fe3d85e87..412678980 100644
--- a/inn_and_outpost/outpost_aranor1
+++ b/inn_and_outpost/outpost_aranor1
@@ -6,6 +6,7 @@ enter_x 10
 enter_y 16
 msg
 Created:  2004-03-07 Avion
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -2375,13 +2376,17 @@ end
 arch merchant
 msg
 @match merchant|trade
+@question elves Where are the elves?
+@question dangerous What do you mean with "dangerous"?
 I mostly trade with the elves.
 Some say it's dangerous but you just have to be cautious.
 @match elves
 Yes there is a elven village to the west of here.
 @match dangerous
+@question elves Where are the elves?
 Well the elves aren't really dangerous but the Dark Forest is...
 @match *
+@question merchant Who do you trade with out here in the wilderness?
 Hello, good to meet you.  I'm Zim, a merchant by trade.
 endmsg
 x 18
diff --git a/inn_and_outpost/sweets_inn b/inn_and_outpost/sweets_inn
index 51e304503..907648ec1 100644
--- a/inn_and_outpost/sweets_inn
+++ b/inn_and_outpost/sweets_inn
@@ -7,6 +7,7 @@ enter_x 7
 enter_y 13
 msg
 Created:  2002-10-27 Todd Mitchell
+Modified: 2008-05-22 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -728,7 +729,7 @@ end
 arch pixie
 name Sweet
 msg
-@match hello
+@match hi|hello
 Greetings, I am Sweet
 Please take advantage of my services.
 @match Sweet
@@ -1719,7 +1720,7 @@ msg
 @match Sweet
 No, I'm not Sweet
 Sweet is the big pixie over in the corner.
-@match Hello
+@match hi|hello
 Hello, welcome to Sweets.
 Food and drink available at a reasonable rate.
 Rooms are 50 gold.
diff --git a/inn_and_outpost/treehouse_df1 b/inn_and_outpost/treehouse_df1
index 1e140001b..97eb85b89 100644
--- a/inn_and_outpost/treehouse_df1
+++ b/inn_and_outpost/treehouse_df1
@@ -6,6 +6,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -260,7 +261,7 @@ We are on watch.
 The princess has said we
 must keep watch on this part of the  forest.
 @match forest
-The DarkForest is a chaotic and dangerous place.
+The Dark forest is a chaotic and dangerous place.
 @match princess
 Princess Nirla, she lives to the northwest of here.
 @match *
diff --git a/inn_and_outpost/treehouse_df2 b/inn_and_outpost/treehouse_df2
index 572d28780..78673638b 100644
--- a/inn_and_outpost/treehouse_df2
+++ b/inn_and_outpost/treehouse_df2
@@ -6,6 +6,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -457,7 +458,7 @@ We must keep watch on the forest.
 Take care traveller
 We have seen some wolves roaming around these parts.
 @match forest
-The DarkForest is a chaotic and dangerous place.
+The Dark forest is a chaotic and dangerous place.
 @match *
 Greetings.
 endmsg
diff --git a/inn_and_outpost/treehouse_df3 b/inn_and_outpost/treehouse_df3
index 245e5a7d4..8eb7c066f 100644
--- a/inn_and_outpost/treehouse_df3
+++ b/inn_and_outpost/treehouse_df3
@@ -6,6 +6,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -455,7 +456,7 @@ We are on watch.
 @match watch
 We must keep watch on the forest.
 @match forest
-The DarkForest is a chaotic and dangerous place.
+The Dark forest is a chaotic and dangerous place.
 @match *
 Greetings.
 endmsg
diff --git a/inn_and_outpost/treehouse_df4 b/inn_and_outpost/treehouse_df4
index 42e64af60..4f47cb323 100644
--- a/inn_and_outpost/treehouse_df4
+++ b/inn_and_outpost/treehouse_df4
@@ -6,6 +6,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -261,7 +262,7 @@ We must keep watch on the forest.
 Take care traveller
 We have seen some wolves roaming around these parts.
 @match forest
-The DarkForest is a chaotic and dangerous place.
+The Dark forest is a chaotic and dangerous place.
 @match *
 Greetings.
 endmsg
diff --git a/inn_and_outpost/treehouse_df5 b/inn_and_outpost/treehouse_df5
index 1fc6c35e4..ec10d2915 100644
--- a/inn_and_outpost/treehouse_df5
+++ b/inn_and_outpost/treehouse_df5
@@ -6,6 +6,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -261,7 +262,7 @@ We must keep watch on the forest.
 Take care traveller
 We have seen some wolves roaming around these parts.
 @match forest
-The DarkForest is a chaotic and dangerous place.
+The Dark forest is a chaotic and dangerous place.
 @match *
 Greetings.
 endmsg
diff --git a/inn_and_outpost/treehouse_df6 b/inn_and_outpost/treehouse_df6
index 9fe5b0011..bf68e8281 100644
--- a/inn_and_outpost/treehouse_df6
+++ b/inn_and_outpost/treehouse_df6
@@ -6,6 +6,7 @@ enter_x 6
 enter_y 6
 msg
 Created:  2004-05-30 Avion
+Modified: 2008-05-23 Arvid Norlander
 endmsg
 outdoor 1
 end
@@ -457,7 +458,7 @@ We must keep watch on the forest.
 Take care traveller
 We have seen some wolves roaming around these parts.
 @match forest
-The DarkForest is a chaotic and dangerous place.
+The Dark forest is a chaotic and dangerous place.
 @match *
 Greetings.
 endmsg