Index: adventure/thing.py
===================================================================
--- adventure/thing.py (revision 151)
+++ adventure/thing.py (revision 156)
@@ -20,5 +20,5 @@
 from movable import Movable
 
-class Thing:
+class Thing(object):
     def __init__(self, world, name, place):
         self.world = world
@@ -29,5 +29,4 @@
         self.on_enters = list()
         self.on_leaves = list()
-        self.uid = 0 # Useful?
     
     def add_aliases(self, aliases_obj, alias_str):
@@ -236,4 +235,5 @@
         return False
 
+
 class NonPlayableCharacter(Movable, Thing):
     def __init__(self, world, name, jid, place):
Index: adventure/adventuremuc.py
===================================================================
--- adventure/adventuremuc.py (revision 131)
+++ adventure/adventuremuc.py (revision 156)
@@ -187,7 +187,9 @@
         print 'Syntax: ./adventuremuc.py <JID> <Password> <Host> <Port>'
         print 'See README for further help'
-    MUD = AdventureMUC(argv[1], argv[2], argv[3], int(argv[4]))
-    MUD.add_world('cave.xml')
-    MUD.add_world('tower/tower.xml')
-    while 1:
-        MUD.Process(10)
+    else:
+        MUD = AdventureMUC(argv[1], argv[2], argv[3], int(argv[4]))
+        MUD.add_world('cave.xml')
+        MUD.add_world('tower/tower.xml')
+        while 1:
+            MUD.Process(10)
+
Index: adventure/place.py
===================================================================
--- adventure/place.py (revision 143)
+++ adventure/place.py (revision 156)
@@ -22,5 +22,5 @@
 from thing import NonPlayableCharacter
 
-class Place:
+class Place(object):
     def __init__(self, world, name, description):
         self.world = world
@@ -140,3 +140,4 @@
         for visitor in self.visitors:
             visitor.send_message(from_, message)
+    
 
Index: adventure/movable.py
===================================================================
--- adventure/movable.py (revision 142)
+++ adventure/movable.py (revision 156)
@@ -32,4 +32,5 @@
         self.place = None
         self.presence = None
+        self.image_path = None
         
         self.vcard = None
@@ -40,7 +41,9 @@
         if image:
             if not isabs(image):
-                image = path_join(self.world.data_dir, image)
-            if isfile(image):
-                file = open(image, 'rb')
+                image_path = path_join(self.world.data_dir, image)
+            if isfile(image_path):
+                self.image_path = image
+                
+                file = open(image_path, 'rb')
                 data = file.read()
                 encoded_data = encodestring(data)
Index: adventure/world.py
===================================================================
--- adventure/world.py (revision 147)
+++ adventure/world.py (revision 156)
@@ -28,5 +28,5 @@
 from thing import Thing, NonPlayableCharacter
 
-class World:
+class World(object):
     """ World class.
     Worlds have their own JID and correspond to an xml file """
@@ -417,2 +417,3 @@
                     return True
         return False
+