diff --git a/lex2_python.py b/lex2_python.py
index 074275f..63486fa 100755
--- a/lex2_python.py
+++ b/lex2_python.py
@@ -10,10 +10,10 @@ class StringGrammar(Grammar):
             name=r'escaped',
             pattern=r'\\.',
         ),
-        PatternRule(
-            name=r'format',
-            pattern=r'%(?:\([a-zA-Z_]+\))?[-# +]*(?:[0-9]+|\*)?\.?(?:[0-9]+|\*)?[hlL]?[a-zA-Z%]',
-        ),
+        #PatternRule(
+        #    name=r'format',
+        #    pattern=r'%(?:\([a-zA-Z_]+\))?[-# +]*(?:[0-9]+|\*)?\.?(?:[0-9]+|\*)?[hlL]?[a-zA-Z%]',
+        #),
     ]
 
 class PythonGrammar(Grammar):
@@ -72,15 +72,15 @@ class PythonGrammar(Grammar):
         ),
         PatternRule(
             name=r"integer",
-            pattern=r"(?:0|[1-9][0-9]*|0[0-7]+|0[xX][0-9a-fA-F]+)[lL]?",
+            pattern=r"(?<![\.0-9a-zA-Z_])(?:0|[1-9][0-9]*|0[0-7]+|0[xX][0-9a-fA-F]+)[lL]?(?![\.0-9a-zA-Z_])",
         ),
         PatternRule(
             name=r"float",
-            pattern=r"[0-9]+\.[0-9]*|\.[0-9]+|(?:[0-9]|[0-9]+\.[0-9]*|\.[0-9]+)[eE][\+-]?[0-9]+",
+            pattern=r"(?<![\.0-9a-zA-Z_])(?:[0-9]+\.[0-9]*|\.[0-9]+|(?:[0-9]|[0-9]+\.[0-9]*|\.[0-9]+)[eE][\+-]?[0-9]+)(?![\.0-9a-zA-Z_])",
         ),
         PatternRule(
             name=r"imaginary",
-            pattern=r"[0-9]+|(?:[0-9]+\.[0-9]*|\.[0-9]+|(?:[0-9]|[0-9]+\.[0-9]*|\.[0-9]+)[eE][\+-]?[0-9]+)[jJ]",
+            pattern=r"(?<![\.0-9a-zA-Z_])(?:[0-9]+|(?:[0-9]+\.[0-9]*|\.[0-9]+|(?:[0-9]|[0-9]+\.[0-9]*|\.[0-9]+)[eE][\+-]?[0-9]+)[jJ])(?![\.0-9a-zA-Z_])",
         ),
 
         RegionRule(
diff --git a/mode2.py b/mode2.py
index 05163a6..9a1d43e 100644
--- a/mode2.py
+++ b/mode2.py
@@ -3,8 +3,8 @@ import sets, string
 
 import color, default, highlight, method, point
 
-#DEBUG = False
-DEBUG = True
+DEBUG = False
+#DEBUG = True
 
 class Handler:
     def __init__(self):