diff --git a/port_joseph/town/underground_tavern b/port_joseph/town/underground_tavern
index 769facac6..d2b555dfa 100644
--- a/port_joseph/town/underground_tavern
+++ b/port_joseph/town/underground_tavern
@@ -11,7 +11,7 @@ msg
 This tavern seems quite old, but is apparently much used.
 
 Created:  2007-05-26 Nicolas Weeger
-Modified: 2008-10-21 Rick Tanner
+Modified: 2011-04-20 Nicolas Weeger
 endmsg
 maplore
 @quest Lursendis
@@ -198,15 +198,15 @@ arch woodfloor2
 x 2
 y 6
 end
-arch table_2x1
-x 2
-y 6
-end
 arch platter1_bro
 x 2
 y 6
 no_pick 1
 end
+arch table_2x1
+x 2
+y 6
+end
 arch woodfloor2
 x 2
 y 7
@@ -247,15 +247,15 @@ arch woodfloor2
 x 3
 y 2
 end
-arch table_1x2
-x 3
-y 2
-end
 arch platter1_sil
 x 3
 y 2
 no_pick 1
 end
+arch table_1x2
+x 3
+y 2
+end
 arch woodfloor2
 x 3
 y 3
@@ -595,12 +595,14 @@ msg
 @match brother
 Yes, his brother is nicknamed the Mad Mage, famous in all Scorn.
 @match exploded
+@question brother Ha, he has a brother?
 Yes, apparently from a magical experiment gone weird.
 
 Though he did survived, it is said he works for some king.
 
 Maybe his brother knows more, you should ask him directly.
 @match farnass
+@question exploded His house exploded, really?
 Haa, Farnass, now that's a name I haven't heard in a while.
 
 He was one of the best cook chiefs of the whole world. Brother of the Mad Mage of Scorn, he shared with him passion for wizardry; yet his center of interest was much more focused on making tasty things and brewing nice beers.