--- a/orpg/dieroller/_base.py	Tue Mar 30 06:07:10 2010 -0600
+++ b/orpg/dieroller/_base.py	Tue Mar 30 06:08:39 2010 -0600
@@ -237,7 +237,8 @@
             logger.exception(traceback.format_exc())
             return roll_string
         finally:
-            print "Roll Time:", time.time()-st
+            pass
+            #print "Roll Time:", time.time()-st
 
     def _get_roller(self):
         if self._roller:

--- a/orpg/gametree/gametree.py	Tue Mar 30 06:07:10 2010 -0600
+++ b/orpg/gametree/gametree.py	Tue Mar 30 06:08:39 2010 -0600
@@ -32,7 +32,7 @@
 import time
 import os
 import re
-
+import traceback
 import wx
 from wx.lib.filebrowsebutton import  *
 

--- a/orpg/gametree/nodehandlers/minilib.py	Tue Mar 30 06:07:10 2010 -0600
+++ b/orpg/gametree/nodehandlers/minilib.py	Tue Mar 30 06:08:39 2010 -0600
@@ -145,7 +145,7 @@
 
 
     def new_mini( self, data={}, add=1 ):
-        mini = ET.Element( TAG_MINIATURE )
+        mini = Element( TAG_MINIATURE )
         for key in data.keys():
             mini.set( key, data[ key ] )
         for key in CORE_ATTRIBUTES:

--- a/orpg/main.py	Tue Mar 30 06:07:10 2010 -0600
+++ b/orpg/main.py	Tue Mar 30 06:08:39 2010 -0600
@@ -30,7 +30,7 @@
 
 import traceback
 from xml.parsers.expat import ExpatError
-
+import time
 import wx
 import wx.py
 try:

--- a/orpg/mapper/miniatures.py	Tue Mar 30 06:07:10 2010 -0600
+++ b/orpg/mapper/miniatures.py	Tue Mar 30 06:08:39 2010 -0600
@@ -732,7 +732,7 @@
             recvdata = f.read()
             f.close()
             try:
-                xml = ET.fromstring(recvdata)
+                xml = fromstring(recvdata)
                 if xml.tag == 'path':
                     path = xml.get('url')
                     path = urllib.unquote(path)

--- a/orpg/ui/_alias_lib.py	Tue Mar 30 06:07:10 2010 -0600
+++ b/orpg/ui/_alias_lib.py	Tue Mar 30 06:08:39 2010 -0600
@@ -222,10 +222,13 @@
             dlg = wx.FileDialog(self, "Select an Alias Lib to Open",
                                 dir_struct["user"], wildcard="*.alias",
                                 style=wx.HIDE_READONLY|wx.OPEN)
-            if dlg.ShowModal() == wx.ID_OK:
-                new_filename = dlg.GetFilename()
-
-            dlg.Destroy()
+            try:
+                if dlg.ShowModal() == wx.ID_OK:
+                    new_filename = dlg.GetFilename()
+                else:
+                    return
+            finally:
+                dlg.Destroy()
 
             if self._filename == new_filename:
                 return

--- a/plugins/xxminimenu.py	Tue Mar 30 06:07:10 2010 -0600
+++ b/plugins/xxminimenu.py	Tue Mar 30 06:08:39 2010 -0600
@@ -5,6 +5,7 @@
 from orpg.mapper.miniatures_handler import *
 
 from orpg.orpgCore import open_rpg
+from orpg.orpgCore import ParserContext
 from orpg.pluginhandler import PluginHandler
 from orpg.mapper.base_handler import base_layer_handler