diff --git a/codeeditor.py b/codeeditor.py
index f30ce1d..be464a4 100644
--- a/codeeditor.py
+++ b/codeeditor.py
@@ -4,6 +4,10 @@
 from GUI import Application, ScrollableView, Window, Font, Colors
 from pygments import highlight
 from pygments.lexers import ActionScriptLexer
+# from pygments.lexers import *
+if False:
+	from pygments.lexers import text, templates, math, dotnet, parsers, hdl, asm, foxpro, special
+	from pygments.styles import default
 from pygments.formatter import Formatter
 from pygments.filters import NameHighlightFilter
 from pygments.token import Token
diff --git a/lightningbeam.py b/lightningbeam.py
index 35bc0fd..98ad6e1 100755
--- a/lightningbeam.py
+++ b/lightningbeam.py
@@ -74,6 +74,7 @@ class maybe:
 		return self.edit
 
 svlgui.undo_stack = undo_stack
+svlgui.redo_stack = redo_stack
 svlgui.edit = edit
 svlgui.maybe = maybe
 svlgui.clear = clear
diff --git a/setup.py b/setup.py
index de7ccb8..1dda46b 100644
--- a/setup.py
+++ b/setup.py
@@ -16,8 +16,11 @@ ez_setup.use_setuptools()
 import sys
 import shutil
 import pygments
+from pygments.lexers import *
 from setuptools import setup
 
+# if sys.platform == 'darwin':
+    # shutil.copytree("/".join(pygments.__file__.split("/")[:-1]), "pygments")
 
 mainscript = 'lightningbeam.py'
 
@@ -56,10 +59,10 @@ elif sys.platform == 'win32':
     extra_options = dict(
         setup_requires=['py2exe'],
         windows=[{"script":mainscript,"icon_resources":[(1,"media/icon.ico")]}],
-		other_resources=[("media",["media"]),("gpl.txt",["gpl.txt"]),("swfc",["swfc"]),("GUI",["GUI"])],
+        other_resources=[("media",["media"]),("gpl.txt",["gpl.txt"]),("swfc",["swfc"]),("GUI",["GUI"])],
         data_files=Mydata_files,
         options=dict(py2exe=dict(packages=["win32ui","win32clipboard","win32api","win32gui","win32process"],
-		             skip_archive=True,)),
+                     skip_archive=True,)),
     )
 else:
      extra_options = dict(
diff --git a/svlgui.py b/svlgui.py
index 6305dd8..699786a 100644
--- a/svlgui.py
+++ b/svlgui.py
@@ -1768,6 +1768,11 @@ class Shape (object):
 		return retval
 
 class Text (object):
+	def __getstate__(self):
+		dict = self.__dict__.copy()
+		dict['font'] = None
+		print dict
+		return dict
 	def __init__(self,text="",x=0,y=0):
 		global SITER
 		global Library
@@ -2811,8 +2816,9 @@ class TemporaryGroup(Group):
 		if key in ("delete", "backspace"):
 			del self1.parent[self1.parent.index(self1)] # Need to clean up deletion
 		elif key in [" ", "s", "r", "e", "b", "p"]:
-			svlgui.MODE=key
-			svlgui.set_cursor({" ":"arrow","s":"arrow","r":"crosshair","e":"crosshair",
+			global MODE
+			MODE=key
+			set_cursor({" ":"arrow","s":"arrow","r":"crosshair","e":"crosshair",
 					"b":"arrow","p":"arrow"}[key], MainWindow.stage)
 			misc_funcs.update_tooloptions()
 		elif key=="F6":
@@ -3046,7 +3052,7 @@ class ColorSelectionWindow:
 						undo_stack.append(edit("fill", root.descendItem().activelayer.currentselect, \
 							{"filled":root.descendItem().activelayer.currentselect.filled, \
 									"fillcolor":root.descendItem().activelayer.currentselect.fillcolor}, 
-							{"filled":True, "fillcolor":svlgui.FILLCOLOR}))
+							{"filled":True, "fillcolor":FILLCOLOR}))
 						clear(redo_stack)
 					root.descendItem().activelayer.currentselect.fillcolor = FILLCOLOR
 					root.descendItem().activelayer.currentselect.filled = True