diff --git a/ChangeLog b/ChangeLog
index 9b9d703c..f076c46f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul  5 00:04:58 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* parser.c: improved the description of a couple of interfaces
+	  upon Larry Stamper suggestion
+
 Wed Jul  4 21:42:24 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* SAX.c entities.c parser.c: changed completely the way entities
diff --git a/HTMLparser.c b/HTMLparser.c
index af9281b5..bcf4394e 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -4737,11 +4737,12 @@ htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data,
  * @sax:  the SAX handler block
  * @userData: if using SAX, this pointer will be provided on callbacks. 
  *
- * parse an HTML in-memory document and build a tree.
- * It use the given SAX function block to handle the parsing callback.
- * If sax is NULL, fallback to the default DOM tree building routines.
+ * Parse an HTML in-memory document. If sax is not NULL, use the SAX callbacks
+ * to handle parse events. If sax is NULL, fallback to the default DOM
+ * behavior and return a tree.
  * 
- * Returns the resulting document tree
+ * Returns the resulting document tree unless SAX is NULL or the document is
+ *     not well formed.
  */
 
 htmlDocPtr
@@ -4862,7 +4863,8 @@ htmlCreateFileParserCtxt(const char *filename, const char *encoding)
  * It use the given SAX function block to handle the parsing callback.
  * If sax is NULL, fallback to the default DOM tree building routines.
  *
- * Returns the resulting document tree
+ * Returns the resulting document tree unless SAX is NULL or the document is
+ *     not well formed.
  */
 
 htmlDocPtr
diff --git a/xmlIO.c b/xmlIO.c
index 84e0a46a..33f2d7ee 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -74,8 +74,7 @@
 #define xmlRegisterDefaultOutputCallbacks xmlRegisterDefOutputCallbacks
 #endif
 
-/* #define VERBOSE_FAILURE */
-/* #define DEBUG_EXTERNAL_ENTITIES */
+#define DEBUG_EXTERNAL_ENTITIES 
 /* #define DEBUG_INPUT */
 
 #ifdef DEBUG_INPUT
@@ -1594,7 +1593,7 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID,
 
 #ifdef DEBUG_EXTERNAL_ENTITIES
     xmlGenericError(xmlGenericErrorContext,
-	    "xmlDefaultExternalEntityLoader(%s, xxx)\n", URL);
+	    "xmlDefaultExternalEntityLoader(%s, %s)\n", URL, ID);
 #endif
 #ifdef LIBXML_CATALOG_ENABLED
     /*