Index: ./configure.in
===================================================================
--- ./configure.in (revision 292)
+++ ./configure.in (revision 340)
@@ -1,4 +1,4 @@
 AC_INIT(src/main.cc)
-AM_INIT_AUTOMAKE(devtodo,0.1.19)
+AM_INIT_AUTOMAKE(devtodo,0.1.20)
 
 # We don't want the util source to be made into a shared lib as it's
Index: ./src/Todo.h
===================================================================
--- ./src/Todo.h (revision 290)
+++ ./src/Todo.h (revision 340)
@@ -14,4 +14,6 @@
 	01/02/01	Initial creation
 */
+
+class TodoDB;
 
 class Todo {
Index: ./src/TodoDB.h
===================================================================
--- ./src/TodoDB.h (revision 290)
+++ ./src/TodoDB.h (revision 340)
@@ -109,5 +109,5 @@
 		void initColourPost();
 		Todo::Priority getPriority(string current = "");
-		int TodoDB::markDone(Todo &todo);
+		int markDone(Todo &todo);
 
 		void formatItem(ostream &out, int depth, Todo const &item, string const &format);
Index: ./util/XML.cc
===================================================================
--- ./util/XML.cc (revision 290)
+++ ./util/XML.cc (revision 340)
@@ -52,5 +52,6 @@
 		xmlScan.addPattern(XmlEnd, "</[a-zA-Z0-9_-]+>");
 		xmlScan.addPattern(XmlDataBegin, "<!DATA[[:space:]]*\\[\\[");
-		xmlScan.addPattern(XmlContent, "([^<]|[\n\r])+");                                     
+		xmlScan.addPattern(XmlContent, "([\n\r]|[^<])+");
+
 
 		commentScan.addPattern(CommentEnd, "-->[[:space:]]*");
@@ -167,4 +168,7 @@
 				_child.push_back(new XML(Body, this, token));
 			break;
+			default:
+				throw exception("unexpected token '" + token.value() + "'", token.line());
+			break;
 		}
 }