2 files changed, 14 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index eade3522..fab6d018 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,10 +33,21 @@ void init_debug_list()
 {
     g_debug_disable_map.insert( "Parse" );
     g_debug_disable_map.insert( "Expand" );
+    
     g_debug_disable_map.insert( "Resolve" );
+    
+    g_debug_disable_map.insert( "Resolve Type Aliases" );
+    g_debug_disable_map.insert( "Resolve Bind" );
     g_debug_disable_map.insert( "Resolve UFCS paths" );
+    g_debug_disable_map.insert( "Constant Evaluate" );
+    
     g_debug_disable_map.insert( "Typecheck Expressions" );
+    
+    g_debug_disable_map.insert( "Expand HIR Annotate" );
+    g_debug_disable_map.insert( "Expand HIR Closures" );
+    g_debug_disable_map.insert( "Expand HIR Calls" );
     g_debug_disable_map.insert( "Typecheck Expressions (validate)" );
+    
     g_debug_disable_map.insert( "Dump HIR" );
 }
 bool debug_enabled()
diff --git a/src/parse/lex.cpp b/src/parse/lex.cpp
index c5b5c11f..ee453579 100644
--- a/src/parse/lex.cpp
+++ b/src/parse/lex.cpp
@@ -20,8 +20,9 @@
 #include <typeinfo>
 #include <algorithm>	// std::count
 
-//const bool DEBUG_PRINT_TOKENS = false;
-const bool DEBUG_PRINT_TOKENS = true;
+const bool DEBUG_PRINT_TOKENS = false;
+//const bool DEBUG_PRINT_TOKENS = true;
+//#define DEBUG_PRINT_TOKENS  debug_enabled("Lexer Tokens")
 
 Lexer::Lexer(const ::std::string& filename):
     m_path(filename.c_str()),