diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 290474df25..fdd5ed7f58 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,11 @@
+19990919-17:14 GMT+1 Victor Szel <info@szelvesz.hu>
+
+  * source/compiler/harbour.y
+    + Added some new items to the new TODO list.
+  * include/hbsetup.h
+    source/compiler/harbour.y
+    + HARBOUR_YYDEBUG moved here for easy setup.
+
 19990919-15:34 GMT+1 Victor Szel <info@szelvesz.hu>
 
   * source/rtl/console.c
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index 657ec5e588..c1dc138c49 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -57,6 +57,17 @@
 */
 /*#define HARBOUR_STRICT_ANSI_C */
 
+/* ***********************************************************************
+ * Define this option if you want the /y YACC trace option to be available
+ * in the Harbour compiler.
+ *
+ * Note that if you turn this on, the compiler will slighly grow in size.
+ *
+ * By default this is turned on.
+ * TODO: This should be disabled, when the parser has matured.
+*/
+#define HARBOUR_YYDEBUG
+
 /* ***********************************************************************
  * This symbol defines if we are trying to compile using GCC for OS/2
  *
@@ -94,6 +105,10 @@
  * This symbol defines if we want an ability to create and link OBJ files
  * generated by Harbour compiler
  *
+ * Note that the Virtual Machine support need a platform/compiler specific
+ * assembler module, so you will be able to use this only with 32 bits
+ * Borland C/C++ compilers.
+ *
  * By default it is disabled (symbol is not defined)
 */
 /*#define HARBOUR_OBJ_GENERATION*/
diff --git a/harbour/source/compiler/harbour.y b/harbour/source/compiler/harbour.y
index 052f670413..aad6886dd9 100644
--- a/harbour/source/compiler/harbour.y
+++ b/harbour/source/compiler/harbour.y
@@ -41,6 +41,13 @@
  *       memvars now - we should add runtime recognition of variable type)
  *       - work in progress (rglab@imid.med.pl)
  * 4) in some cases incorrect warnings are generated when -w option is used
+ * 5) in some cases GPF occurs when -w option is used, example:
+ *    LOCAL nDouble := NumAnd32(RandGetLong() / 65536, 32767) / 997
+ * 6) support for expr:expr (QSELF():cVar) syntax.
+ *    see tests/broken/clasname.prg
+ * 7) Change the pcode generated by ::cVar from Self:cVar to QSELF():cVar
+ * 8) Support this syntax: _FIELD->c->mmezo := mt
+ * 9) Support this syntax: nPtr := @Hello()
  */
 
 /* Compile using: bison -d -v harbour.y */
@@ -270,7 +277,9 @@ static BOOL SwitchCmp( char * szString, char * szSwitch );
 void PrintUsage( char * );
 void PrintCredits( void );
 
-#define YYDEBUG        1    /* Parser debug information support */
+#ifdef HARBOUR_YYDEBUG
+   #define YYDEBUG        1 /* Parser debug information support */
+#endif
 
 typedef enum
 {