diff --git a/uppsrc/CppBase/CppBase.h b/uppsrc/CppBase/CppBase.h
index 3d23c5d17..ca8a17538 100644
--- a/uppsrc/CppBase/CppBase.h
+++ b/uppsrc/CppBase/CppBase.h
@@ -108,6 +108,8 @@ class Lex {
 		String text;
 		double number;
 		bool   grounding;
+		
+		Term() { grounding = false; }
 	};
 
 	bool statsCollected;
diff --git a/uppsrc/CppBase/Parser.cpp b/uppsrc/CppBase/Parser.cpp
index 2a3bb1394..7f8a63ee2 100644
--- a/uppsrc/CppBase/Parser.cpp
+++ b/uppsrc/CppBase/Parser.cpp
@@ -8,7 +8,7 @@ NAMESPACE_UPP
 #endif
 
 
-#define LLOG(x) // LOG(x)
+#define LLOG(x)    // DLOG(x)
 #define LTIMING(x) // TIMING(x)
 
 inline const char *bew(const char *s, const char *t)
@@ -216,7 +216,13 @@ void Parser::Line()
 void Parser::ThrowError(const String& e)
 {
 	err(GetLine(lex.Pos()), e);
-	LLOG(e);
+#ifdef _DEBUG
+	int i = 0;
+	while(i < 40 && lex[i] != t_eof)
+		i++;
+	LLOG("ERROR: (" << GetLine(lex.Pos()) << ") " << e << ", nest: " << current_nest <<
+	     "  " << AsCString(String(lex.Pos(), lex.Pos(i))));
+#endif
 	throw Error();
 }
 
@@ -1177,12 +1183,14 @@ CppItem& Parser::Fn(const Decl& d, const String& templ, bool body, int kind)
 		im.virt = d.s_virtual;
 		im.type = d.type;
 		im.decla = true;
+		LLOG("FnItem: " << nesting << "::" << item << ", natural: " << im.natural);
 	}
 	return im;
 }
 
 void Parser::Do()
 {
+	LLOG("Do, nest: " << current_nest);
 	Line();
 	if(Key(tk_using)) {
 		while(!Key(';') && lex != t_eof)
@@ -1378,11 +1386,11 @@ void Parser::Do()
 void Parser::Do(Stream& in, const Vector<String>& ignore, CppBase& _base, const String& fn,
                 Callback2<int, const String&> _err, const Vector<String>& typenames)
 {
+	LLOG("= C++ Parser ==================================== " << fn);
 	base = &_base;
 	file = PreProcess(in);
 	lex.Init(~file.text, ignore);
 	err = _err;
-	inbody = false;
 	filei = GetCppFileIndex(fn);
 	lpos = 0;
 	line = 0;
@@ -1397,6 +1405,7 @@ void Parser::Do(Stream& in, const Vector<String>& ignore, CppBase& _base, const
 				context.noclass = true;
 				context.typenames.Clear();
 				context.tparam.Clear();
+				inbody = false;
 				for(int i = 0; i < typenames.GetCount(); i++)
 					context.typenames.Add(lex.Id(typenames[i]));
 				context.namespacel = 0;
@@ -1404,10 +1413,12 @@ void Parser::Do(Stream& in, const Vector<String>& ignore, CppBase& _base, const
 			}
 			catch(Error) {
 				if(lex.IsBody()) {
+					LLOG("---- Recovery to next ';'");
 					Resume(lex.GetBracesLevel());
 					Key(';');
 				}
 				else {
+					LLOG("---- Recovery to file level");
 					++lex;
 					lex.SkipToGrounding();
 					lex.ClearBracesLevel();
@@ -1415,6 +1426,7 @@ void Parser::Do(Stream& in, const Vector<String>& ignore, CppBase& _base, const
 			}
 		}
 		catch(Lex::Grounding) {
+			LLOG("---- Grounding to file level");
 			lex.ClearBracesLevel();
 			lex.ClearBody();
 		}
diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp
index 85e3ef9b6..2ff38af7b 100644
--- a/uppsrc/ide/Assist.cpp
+++ b/uppsrc/ide/Assist.cpp
@@ -125,7 +125,9 @@ bool AssistEditor::NestId(const CppNest& n, const String& id, Vector<String>& ty
 
 void AssistScanError(int line, const String& text)
 {
+#ifdef _DEBUG
 	PutVerbose(String().Cat() << "(" << line << "): " << text);
+#endif
 }
 
 void AssistEditor::Context(Parser& parser, int pos)
@@ -137,6 +139,10 @@ void AssistEditor::Context(Parser& parser, int pos)
 	parser.Do(ss, IgnoreList(), BrowserBase(), Null, callback(AssistScanError));
 	QualifyTypes(BrowserBase(), parser.current_nest, parser.current);
 	inbody = parser.IsInBody();
+#ifdef _DEBUG
+	PutVerbose("body: " + AsString(inbody));
+	PutVerbose("nest: " + AsString(parser.current_nest));
+#endif
 }
 
 void AssistEditor::TypeOf(const String& id, Vector<String>& r, bool& code)