diff --git a/uppsrc/CodeEditor/CInit.cpp b/uppsrc/CodeEditor/CInit.cpp
index 0e461da03..12c99b4a4 100644
--- a/uppsrc/CodeEditor/CInit.cpp
+++ b/uppsrc/CodeEditor/CInit.cpp
@@ -213,7 +213,7 @@ void CSyntax::InitKeywords()
 		"RLOG", "RLOGF", "RDUMP", "RDUMPC", "RDUMPCC", "RDUMPCCC", "RDUMPM",
 		"LOGBEGIN", "LOGEND", "LOGBLOCK", "LOGHEXDUMP", "LOGSRCPOS", 
 		"RLOGBEGIN", "RLOGEND", "RLOGBLOCK", "RLOGHEXDUMP", "RLOGSRCPOS", "RQUOTE",
-		"RTIMING", "TIMING", "LTIMING", "DTIMING", "RTIMESTOP", "TIMESTOP", "LTIMESTOP",
+		"RTIMING", "TIMING", "LTIMING", "DTIMING", "RTIMESTOP", "TIMESTOP", "LTIMESTOP", "DTIMESTOP",
 		"LOGHEX", "DUMPHEX", "DLOGHEX", "DDUMPHEX", "RLOGHEX", "RDUMPHEX", "LLOGHEX", "LDUMPHEX",
 		"DEBUGCODE",
 		NULL
diff --git a/uppsrc/CodeEditor/CodeEditor.cpp b/uppsrc/CodeEditor/CodeEditor.cpp
index c8d704b58..1bd0c1938 100644
--- a/uppsrc/CodeEditor/CodeEditor.cpp
+++ b/uppsrc/CodeEditor/CodeEditor.cpp
@@ -91,6 +91,7 @@ void CodeEditor::PostInsert(int pos, const WString& text) {
 		Refresh();
 	else
 		CheckSyntaxRefresh(pos, text);
+	WhenUpdate();
 }
 
 void CodeEditor::PreRemove(int pos, int size) {
@@ -109,6 +110,7 @@ void CodeEditor::PreRemove(int pos, int size) {
 void CodeEditor::PostRemove(int pos, int size) {
 	if(check_edited)
 		bar.SetEdited(GetLine(pos));
+	WhenUpdate();
 }
 
 void CodeEditor::ClearLines() {
diff --git a/uppsrc/CodeEditor/CodeEditor.h b/uppsrc/CodeEditor/CodeEditor.h
index d08ea1631..117b7d3b5 100644
--- a/uppsrc/CodeEditor/CodeEditor.h
+++ b/uppsrc/CodeEditor/CodeEditor.h
@@ -117,6 +117,7 @@ public:
 	LineInfoRem & GetLineInfoRem()                   { return li_removed; }
 	void     SetLineInfoRem(LineInfoRem pick_ li)    { li_removed = pick(li); }
 	
+	void     ClearAnnotations();
 	void     SetAnnotation(int line, const Image& img, const String& ann);
 	String   GetAnnotation(int line) const;
 
@@ -340,6 +341,7 @@ public:
 	Callback           WhenAnnotationRightClick;
 	Callback           WhenOpenFindReplace;
 	Callback1<String&> WhenPaste;
+	Callback           WhenUpdate;
 
 	FrameTop<Button>    topsbbutton;
 	FrameTop<Button>    topsbbutton1;
@@ -456,6 +458,7 @@ public:
 	bool     IsFindReplaceRestorePos() const          { return do_ff_restore_pos; }
 	
 	void     Annotations(int width)                   { bar.Annotations(width); }
+	void     ClearAnnotations()                       { bar.ClearAnnotations(); }
 	void     SetAnnotation(int i, const Image& icon, const String& a) { bar.SetAnnotation(i, icon, a); }
 	String   GetAnnotation(int i) const               { return bar.GetAnnotation(i); }
 	int      GetActiveAnnotationLine() const          { return bar.GetActiveAnnotationLine(); }
diff --git a/uppsrc/CodeEditor/EditorBar.cpp b/uppsrc/CodeEditor/EditorBar.cpp
index e223101e7..d756cfd8c 100644
--- a/uppsrc/CodeEditor/EditorBar.cpp
+++ b/uppsrc/CodeEditor/EditorBar.cpp
@@ -358,12 +358,21 @@ String EditorBar::GetBreakpoint(int ln)
 	return ln < li.GetCount() ? li[ln].breakpoint : Null;
 }
 
+void EditorBar::ClearAnnotations()
+{
+	for(int i = 0; i < li.GetCount(); i++) {
+		li[i].icon.Clear();
+		li[i].annotation.Clear();
+	}
+}
+
 void EditorBar::SetAnnotation(int line, const Image& img, const String& ann)
 {
 	if(line >= 0 && line < li.GetCount()) {
 		li[line].icon = img;
 		li[line].annotation = ann;
 	}
+	Refresh();
 }
 
 String EditorBar::GetAnnotation(int line) const
diff --git a/uppsrc/Core/Diag.h b/uppsrc/Core/Diag.h
index 2956f2849..a6a1ecd46 100644
--- a/uppsrc/Core/Diag.h
+++ b/uppsrc/Core/Diag.h
@@ -81,6 +81,7 @@ void __LOGF__(const char *format, ...);
 #define DTIMING(x)       TIMING(x)
 #define DLOGHEX(x)       LOGHEX(x)
 #define DDUMPHEX(x)      DUMPHEX(x)
+#define DTIMESTOP(x)     TIMESTOP(x)
 
 #else
 
@@ -91,6 +92,7 @@ void __LOGF__(const char *format, ...);
 #define DTIMING(x)       @
 #define DLOGHEX(x)       @
 #define DDUMPHEX(nx)     @
+#define DTIMESTOP(x)     @
 
 #define DEBUGCODE(x)     LOG_NOP
 
diff --git a/uppsrc/ide/Annotations.cpp b/uppsrc/ide/Annotations.cpp
index d9a49297b..fa7502f4d 100644
--- a/uppsrc/ide/Annotations.cpp
+++ b/uppsrc/ide/Annotations.cpp
@@ -4,6 +4,7 @@ void AssistEditor::Annotate(const String& filename)
 {
 	int fi = GetCppFileIndex(filename);
 	CppBase& base = CodeBase();
+	ClearAnnotations();
 	for(int j = 0; j < base.GetCount(); j++) {
 		const Array<CppItem>& n = base[j];
 		for(int k = 0; k < n.GetCount(); k++) {
diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index 7a7bc4fae..c3cf1edd5 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -911,6 +911,10 @@ public:
 	bool      CanToggleReadOnly();
 	void      ToggleReadOnly();
 	void      PosSync();
+	void      EditFileAssistSync();
+	
+	TimeCallback text_updated;
+	void      TriggerAssistSync();
 
 	void      DoEditKeys();
 	void      AKEditor();
diff --git a/uppsrc/ide/idefile.cpp b/uppsrc/ide/idefile.cpp
index de3c3d7f9..78cb23cc8 100644
--- a/uppsrc/ide/idefile.cpp
+++ b/uppsrc/ide/idefile.cpp
@@ -435,6 +435,8 @@ bool Ide::FileRemove()
 }
 
 void Ide::EditFile0(const String& path, byte charset, bool astext, const String& headername) {
+	text_updated.Kill();
+
 	AKEditor();
 	editor.CheckEdited(false);
 	editor.CloseAssist();
@@ -545,6 +547,19 @@ void Ide::EditFile0(const String& path, byte charset, bool astext, const String&
 	editor.SyncNavigator();
 }
 
+void Ide::EditFileAssistSync()
+{
+	ScanFile();
+	editor.Annotate(editfile);
+	editor.SyncNavigator();
+}
+
+void Ide::TriggerAssistSync()
+{
+	if(editor.GetLength() < 500000) // Sanity
+		text_updated.KillSet(1000, THISBACK(EditFileAssistSync));
+}
+
 void Ide::EditAsText()
 {
 	String path = editfile;
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index 9d2c2e565..3a3ea838e 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -582,6 +582,8 @@ Ide::Ide()
 	
 	error_count = 0;
 	warning_count = 0;
+	
+	editor.WhenUpdate = THISBACK(TriggerAssistSync);
 }
 
 Ide::~Ide()