diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 235cc0421d..2ae82b1bea 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,27 @@
+20000131-01:29 GMT+1 Victor Szel <info@szelvesz.hu>
+  * source/rtl/harbinit.prg
+    ! CLIPPER530 is declared only when HB_COMPAT_53 is defined.
+  * source/debug/debugger.prg
+    ! SAYs converted to DispOutAt() calls. NOTE added about this.
+    % Unused variables removed.
+    % Minor optimization.
+  * tests/regress/rt_main.ch
+    ! Date used for testing changed (for accuracy only).
+  * source/vm/maindll.c
+    ! Fixed CVS ID header.
+  - source/tools/ha.lnk
+    - Removed.
+  * ngdoc/*.lnk
+    * Formatting.
+  * source/rtl/oemansi.c
+    source/rtl/pvalue.c
+    source/tools/troff.prg
+    source/tools/os2.prg
+    source/tools/rtf.prg
+    source/tools/html.prg
+    source/tools/ng.prg
+    * Formatting: some newlines added, minor fixes.
+
 20000131-00:05 GMT+1 Victor Szel <info@szelvesz.hu>
   * source/rtl/environ.c
     ! Fixed VERSION() for MINGW32 (it was generating a GPF).
diff --git a/harbour/ngdoc/ha.lnk b/harbour/ngdoc/ha.lnk
index ba669684bf..471e969ae2 100644
--- a/harbour/ngdoc/ha.lnk
+++ b/harbour/ngdoc/ha.lnk
@@ -1,44 +1,42 @@
 !name: Harbour Build 31 Reference Guide
-!credits:
-Release : 01/18/2000
-        Build By Luiz Rafael Culik
+!credits: Harbour (c) http://www.harbour-project.org
+        2000/01/18 build By Luiz Rafael Culik
         Functions Documented by:
-        Victor Szel
-        Chen   Luiz  Rafael Culik
+        Chen Kedem, Luiz Rafael Culik
 !Menu: Commands
-Command     Comm.ngo
+Command                    comm.ngo
 !menu: A-E
-Array                   array.ngo
-Code Block              codeblo.ngo
-Console Input           consimpu.ngo
-Conversion              Conv.ngo 
-Data base               Database.ngo
-Data Input And Output    datai.ngo
-Dos                     dos.ngo
+Array                      array.ngo
+Code Block                 codeblo.ngo
+Console Input              consimpu.ngo
+Conversion                 conv.ngo
+Database                   database.ngo
+Data Input and Output      datai.ngo
+Dos                        dos.ngo
 !menu:F-N
-Error Recovery          error.ngo
-Enviroment   Envirom.ngo
-Events        Event.ngo  
-File Management         FILEMANa.ngo
-Internal                Internal.ngo
-Gt                      Gt.ngo
-Misc                    Misc.ngo
-Nation                  Nation.ngo
+Error Recovery             error.ngo
+Enviroment                 envirom.ngo
+Events                     event.ngo
+File Management            filemana.ngo
+Internal                   internal.ngo
+Gt                         gt.ngo
+Misc                       misc.ngo
+Nation                     nation.ngo
 !menu: O-T
-Object Manipulation     obj.ngo
-Operating System Specific        opersyst.ngo
-Parameter Checks              Parame.ngo
-Run-Time Library, Strings    runtime.ngo
-String                String.ngo
-Strings                Strings.ngo
-Tbrowse Class          tbrow.ngo
-Terminal               Terminal.ngo
+Object Manipulation        obj.ngo
+Operating System Specific  opersyst.ngo
+Parameter Checks           parame.ngo
+Run-Time Library, Strings  runtime.ngo
+String                     string.ngo
+Strings                    strings.ngo
+Tbrowse Class              tbrow.ngo
+Terminal                   terminal.ngo
 !menu: U-Z
-Unknown                unknown.ngo
-Utility                Utility.ngo
-VARIABLE MANAGEMENT   mv.ngo
-document              doc.ngo 
-!Menu: HARBOUR
-License                license.ngo
-Readme                 readme.ngo
-Tools                  Tools.ngo 
+Unknown                    unknown.ngo
+Utility                    utility.ngo
+Variable management        mv.ngo
+document                   doc.ngo
+!Menu: Harbour
+License                    license.ngo
+Readme                     readme.ngo
+Tools                      tools.ngo
diff --git a/harbour/ngdoc/harbour.lnk b/harbour/ngdoc/harbour.lnk
index 62646942ba..b34ee16e9f 100644
--- a/harbour/ngdoc/harbour.lnk
+++ b/harbour/ngdoc/harbour.lnk
@@ -1,11 +1,13 @@
 !name: Harbour build 31 reference Guide
-!Credits: HARBOUR(c) http://www.harbour-project.org
-          01/15/2000  
+!credits: Harbour (c) http://www.harbour-project.org
+        2000/01/18 build By Luiz Rafael Culik
+        Functions Documented by:
+        Chen Kedem, Luiz Rafael Culik
 !menu: Reference
-Functions A-M   Funcam.ngo
-Functions N-_   Funcn_.ngo
-Command         Comm.ngo     
-!menu: HARBOUR
-READ ME    overview.ngo
-LICENSE    license.ngo
+Functions A-M   funcam.ngo
+Functions N-_   funcn_.ngo
+Command         comm.ngo
+!menu: Harbour
+Readme          overview.ngo
+License         license.ngo
 
diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg
index b0f1aa1226..c05f849e1e 100644
--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -33,6 +33,10 @@
  *
  */
 
+/* NOTE: Don't use SAY/DevOut()/DevPos() for screen output, otherwise
+         the debugger output may interfere with the applications output
+         redirection, and is also slower. [vszel] */
+
 #include "hbclass.ch"
 #include "hbmemvar.ch"
 #include "box.ch"
@@ -261,14 +265,14 @@ METHOD CommandWindowProcessKey( nKey ) CLASS TDebugger
            else
               cResult = "Command error"
            endif
-           @ ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1 SAY ;
-              Space( ::oWndCommand:nRight - ::oWndCommand:nLeft - 1 ) ;
-              COLOR ::oWndCommand:cColor
-           @ ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 3 SAY cResult ;
-              COLOR ::oWndCommand:cColor
+           DispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1,;
+              Space( ::oWndCommand:nRight - ::oWndCommand:nLeft - 1 ),;
+              ::oWndCommand:cColor )
+           DispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 3, cResult,;
+              ::oWndCommand:cColor )
            ::oWndCommand:ScrollUp( 1 )
-           @ ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1 SAY "> " ;
-              COLOR ::oWndCommand:cColor
+           DispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1, "> ",;
+              ::oWndCommand:cColor )
            cCommand = Space( ::oWndCommand:nRight - ::oWndCommand:nLeft - 3 )
            ::oGetListCommand:oGet:VarPut( cCommand )
            ::oGetListCommand:oGet:Buffer = cCommand
@@ -431,9 +435,9 @@ METHOD Show() CLASS TDebugger
    ::oPullDown:Display()
    ::oWndCode:Show( .t. )
    ::oWndCommand:Show()
-   @ ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1 SAY ">"
+   DispOutAt( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 1, ">" )
 
-   SET COLOR TO "N/BG"
+   SetColor( "N/BG" )
    @ MaxRow(), 0 CLEAR TO MaxRow(), MaxCol()
 
    DispOutAt( MaxRow(),  0, "F1-Help F2-Zoom F3-Repeat F4-User F5-Go F6-WA F7-Here F8-Step F9-BkPt F10-Trace", "N/BG" )
@@ -507,11 +511,13 @@ return nil
 
 METHOD ShowVars() CLASS TDebugger
 
-   local n := 1
+   local n
    local nWidth
-   local nCount, i, xValue, cName
 
    if ::oWndVars == nil
+
+      n := 1
+
       ::oWndCode:nTop += 5
       ::oBrwText:nTop += 5
       ::oBrwText:RefreshAll()
@@ -708,7 +714,7 @@ METHOD ViewSets() CLASS TDebugger
                                  oWndSets:nBottom - 1, oWndSets:nRight - 1 )
    local n := 1
    local nWidth := oWndSets:nRight - oWndSets:nLeft - 1
-   local oCol, cSet
+   local oCol
 
    oBrwSets:ColorSpec = "N/W, W+/W, N/BG"
    oBrwSets:GoTopBlock = { || n := 1 }
@@ -863,7 +869,7 @@ METHOD ScrollUp( nLines ) CLASS TDbWindow
 
    DEFAULT nLines TO 1
 
-   SET COLOR TO ::cColor
+   SetColor( ::cColor )
    Scroll( ::nTop + 1, ::nLeft + 1, ::nBottom - 1, ::nRight - 1, nLines )
 
 return nil
@@ -895,7 +901,7 @@ METHOD SetFocus( lOnOff ) CLASS TDbWindow
    @ ::nTop, ::nLeft, ::nBottom, ::nRight BOX If( lOnOff, B_DOUBLE, B_SINGLE ) ;
       COLOR ::cColor
 
-   @ ::nTop, ::nLeft + 1 SAY "[" + Chr( 254 ) + "]" COLOR ::cColor
+   DispOutAt( ::nTop, ::nLeft + 1, "[" + Chr( 254 ) + "]", ::cColor )
 
    if ! Empty( ::cCaption )
       ::SetCaption( ::cCaption )
@@ -1137,7 +1143,6 @@ return nil
 METHOD ClosePopup( nPopup ) CLASS TDbMenu
 
    local oPopup
-   local nAt
 
    if nPopup != 0
       oPopup = ::aItems[ nPopup ]:bAction
@@ -1159,7 +1164,7 @@ return nil
 
 METHOD Display() CLASS TDbMenu
 
-   local n, nAt
+   local n
 
    SetColor( ::cClrPopup )
 
@@ -1285,8 +1290,6 @@ return nil
 
 METHOD ShowPopup( nPopup ) CLASS TDbMenu
 
-   local nAt, oMenuItem
-
    ::aItems[ nPopup ]:Display( ::cClrHilite, ::cClrHotFocus )
    ::nOpenPopup = nPopup
 
@@ -1525,4 +1528,5 @@ static function ValToStr( uVal )
            cResult = "Class " + uVal:ClassName() + " object"
    endcase
 
-return cResult
\ No newline at end of file
+return cResult
+
diff --git a/harbour/source/rtl/harbinit.prg b/harbour/source/rtl/harbinit.prg
index ac6db76b14..9995889522 100644
--- a/harbour/source/rtl/harbinit.prg
+++ b/harbour/source/rtl/harbinit.prg
@@ -51,9 +51,15 @@ ANNOUNCE SysInit
 
 /* NOTE: For complete compatibility */
 PROCEDURE CLIPPER520
-RETURN
+   RETURN
+
+#ifdef HB_COMPAT_C53
+
+/* NOTE: For complete compatibility */
 PROCEDURE CLIPPER530
-RETURN
+   RETURN
+
+#endif
 
 /*  $DOC$
  *  $FUNCNAME$
diff --git a/harbour/source/rtl/oemansi.c b/harbour/source/rtl/oemansi.c
index c045b6853a..fa6a04e639 100644
--- a/harbour/source/rtl/oemansi.c
+++ b/harbour/source/rtl/oemansi.c
@@ -42,6 +42,7 @@
 
 #include "extend.h"
 #include "itemapi.h"
+
 /*  $DOC$
  *  $FUNCNAME$
  *      HB_ANSITOOEM()
@@ -99,6 +100,7 @@ HARBOUR HB_HB_ANSITOOEM( void )
    else
       hb_retc( "" );
 }
+
 /*  $DOC$
  *  $FUNCNAME$
  *      HB_OEMTOANSI()
diff --git a/harbour/source/rtl/pvalue.c b/harbour/source/rtl/pvalue.c
index de388f0a5e..c28ced75a9 100644
--- a/harbour/source/rtl/pvalue.c
+++ b/harbour/source/rtl/pvalue.c
@@ -61,7 +61,7 @@
  *            ? hb_PValue( 2 ), cString
  *         endif
  *      return nil
-  *  $STATUS$
+ *  $STATUS$
  *      R
  *  $COMPLIANCE$
  *      HB_PVALUE() is a new function and hence not CA-Clipper compliant.
diff --git a/harbour/source/tools/ha.lnk b/harbour/source/tools/ha.lnk
deleted file mode 100644
index ad9bb8d599..0000000000
--- a/harbour/source/tools/ha.lnk
+++ /dev/null
@@ -1,45 +0,0 @@
-!name: Harbour Build 31 Reference Guide
-!credits:
-Release : 01/01/2000
-        Build By Luiz Rafael Culik
-        Functions Documented by:
-        Victor Szel
-        Chen   Luiz  Rafael Culik
-!Menu: Commands
-Command     Comm.ngo
-!menu: A-F
-Array                   array.ngo
-Code Block              codeblo.ngo
-Console Input           consimpu.ngo
-Conversion              Conv.ngo 
-Data base               Database.ngo
-Data Input And Output    datai.ngo
-Dos                     dos.ngo
-!menu:E-N
-HARBOUR TOOLS  ha.ngo
-Error Recovery          error.ngo
-Enviroment   Envirom.ngo
-Events        Event.ngo  
-File Management         FILEMANa.ngo
-Internal                Internal.ngo
-Gt                      Gt.ngo
-Low Level               lowlevel.ngo
-Misc                    Misc.ngo
-
-!menu: N-T
-Nation                  Nation.ngo
-Object Manipulation     obj.ngo
-Operating System Specific        opersyst.ngo
-Parameter Checks              Parame.ngo
-Run-Time Library, Strings    runtime.ngo
-String                Strings.ngo
-!menu: T-Z
-Tbrowse Class          tbrow.ngo
-Terminal               Terminal.ngo
-Unknown                unknown.ngo
-Utility                Utility.ngo
-Variable Management   mv.ngo
-!Menu: HARBOUR
-License                license.ngo
-Readme                 readme.ngo
-Tools                  Tools.ngo 
diff --git a/harbour/source/tools/html.prg b/harbour/source/tools/html.prg
index 8c5da4f6c8..d665000ce1 100644
--- a/harbour/source/tools/html.prg
+++ b/harbour/source/tools/html.prg
@@ -1,4 +1,3 @@
-
 /*
  * $Id$
  */
@@ -111,7 +110,6 @@ METHOD WriteLink( cLink ) CLASS THTML
 
 RETURN Self
 
-*+ EOF: HTML.PRG
 /*  $DOC$
  *  $FUNCNAME$
  *     THtml()
diff --git a/harbour/source/tools/ng.prg b/harbour/source/tools/ng.prg
index 11ed82b944..34eb15d445 100644
--- a/harbour/source/tools/ng.prg
+++ b/harbour/source/tools/ng.prg
@@ -55,6 +55,7 @@ CLASS TNortonGuide
    METHOD WriteParBold( cPar )
    METHOD WriteTitle(  cTopic , cTitle )
 ENDCLASS
+
 METHOD NEW( cFile ) CLASS TNortonGuide
 
    IF VALTYPE( cFile ) <> NIL .AND. VALTYPE( cFile ) == "C"
@@ -102,7 +103,6 @@ METHOD WriteLink( cLink ) CLASS TNortonGuide
 
 RETURN Self
 
-*+ EOF: NG.PRG
 /*  $DOC$
  *  $FUNCNAME$
  *     TNortonGuide()
diff --git a/harbour/source/tools/os2.prg b/harbour/source/tools/os2.prg
index e77b57b1c6..7cd2b69460 100644
--- a/harbour/source/tools/os2.prg
+++ b/harbour/source/tools/os2.prg
@@ -43,6 +43,7 @@
 *+
 *+北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北
 *+
+
 CLASS TOs2
    DATA cFile
    DATA nHandle
@@ -57,7 +58,8 @@ CLASS TOs2
    METHOD WriteTitle(cTopic, cTitle )
    METHOD DostoOs2Text(cText)
 ENDCLASS
-   METHOD New( cFile ) CLASS TOs2
+
+METHOD New( cFile ) CLASS TOs2
 
    IF Self:aLinkRef==NIL
       Self:aLinkRef:={}
@@ -125,8 +127,7 @@ METHOD CLOSE() CLASS TOs2
 RETURN Self
 
 METHOD WriteLink( cLink ) CLASS TOs2
-LOCAL nItem
-
+   LOCAL nItem
    
    if  Self:Scanlink(cLink) ==0
          nItem:=ASCAN(Self:aLinkRef,{|a| a[1]==cLink})  // Again.
@@ -160,17 +161,14 @@ METHOD ScanLink(cLink) CLASS TOs2
 RETURN nItem
 
 METHOD DosToOs2Text(cText) CLASS TOs2
-LOCAL cReturn
+   LOCAL cReturn
 
-cReturn:=STRTRAN(cText,'"',"&cdq.")
-
-cReturn:=STRTRAN(cReturn,':',"&colon.")
-
-cReturn:=STRTRAN(cReturn,',',"&comma.")
+   cReturn := STRTRAN(cText,'"',"&cdq.")
+   cReturn := STRTRAN(cReturn,':',"&colon.")
+   cReturn := STRTRAN(cReturn,',',"&comma.")
 
 Return cReturn
 
-
 /*  $DOC$
  *  $FUNCNAME$
  *     TOs2()
diff --git a/harbour/source/tools/rtf.prg b/harbour/source/tools/rtf.prg
index e99c94fca0..816dcce5b9 100644
--- a/harbour/source/tools/rtf.prg
+++ b/harbour/source/tools/rtf.prg
@@ -1,4 +1,3 @@
-
 /*
  * $Id$
  */
@@ -57,8 +56,8 @@ CLASS TRTF
    METHOD WriteTitle( cTitle, cTopic )
    METHOD EndPar()
 ENDCLASS
-METHOD NEW( cFile ) CLASS TRTF
 
+METHOD NEW( cFile ) CLASS TRTF
    IF VALTYPE( cFile ) <> NIL .AND. VALTYPE( cFile ) == "C"
       Self:cFile   := LOWER( cFile )
       Self:nHandle := FCREATE( Self:cFile )
@@ -117,9 +116,7 @@ METHOD WritePar( cPar ) CLASS TRTF
 RETURN Self
 
 METHOD EndPar() CLASS TRTF
-
    FWRITE( Self:nHandle, ' }\par' + CRLF )
-
 RETURN Self
 
 METHOD WriteParBold( cPar ) CLASS TRTF
@@ -174,7 +171,6 @@ METHOD WriteLink( cLink ) CLASS TRTF
 
 RETURN Self
 
-*+ EOF: RTF.PRG
 /*  $DOC$
  *  $FUNCNAME$
  *     TRtf()
diff --git a/harbour/source/tools/troff.prg b/harbour/source/tools/troff.prg
index 967bb420bd..24c16cba42 100644
--- a/harbour/source/tools/troff.prg
+++ b/harbour/source/tools/troff.prg
@@ -43,8 +43,8 @@
 *+
 *+北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北北
 *+
-CLASS TTROFF
 
+CLASS TTROFF
    DATA cFile
    DATA nHandle
    METHOD New( cFile )
@@ -55,13 +55,14 @@ CLASS TTROFF
    METHOD WriteTitle( cTitle, cTopic )
    METHOD WriteText( cText )
 ENDCLASS
-METHOD NEW( cFile ) CLASS TTROFF
 
+METHOD NEW( cFile ) CLASS TTROFF
    IF VALTYPE( cFile ) <> NIL .AND. VALTYPE( cFile ) == "C"
       Self:cFile   := LOWER( cFile )
       Self:nHandle := FCREATE( Self:cFile )
    ENDIF
 RETURN Self
+
 METHOD WriteTitle( cTopic, cTitle ) CLASS TTROFF
 
    LOCAL cWriteTitle := '.br' + CRLF + ;
@@ -108,15 +109,14 @@ METHOD WriteTitle( cTopic, cTitle ) CLASS TTROFF
 RETURN Self
 
 METHOD WriteText( cText ) CLASS TTROFF
-
    FWRITE( Self:nHandle, cText + CRLF )
 RETURN Self
-METHOD WritePar( cPar ) CLASS TTROFF
 
+METHOD WritePar( cPar ) CLASS TTROFF
    FWRITE( Self:nHandle, ALLTRIM( STRTRAN( cPar, ".", "\." ) ) + CRLF )
 RETURN Self
-METHOD WriteParBold( cPar ) CLASS TTROFF
 
+METHOD WriteParBold( cPar ) CLASS TTROFF
    LOCAL cWriteBold := '.sp' + CRLF + ;
       '.in 0.08i' + CRLF + ;
       '\fB' + cPar + CRLF + ;
@@ -136,8 +136,6 @@ METHOD WriteLink( cLink ) CLASS TTROFF
 
 RETURN Self
 
-*+ EOF: TROFF.PRG
-*+ EOF: RTF.PRG
 /*  $DOC$
  *  $FUNCNAME$
  *     TTroff()
diff --git a/harbour/source/vm/maindll.c b/harbour/source/vm/maindll.c
index df5f491c63..2b352a66d0 100644
--- a/harbour/source/vm/maindll.c
+++ b/harbour/source/vm/maindll.c
@@ -1,5 +1,5 @@
 /*
- * $Id:
+ * $Id$
  */
 
 /*
@@ -49,4 +49,5 @@ BOOL WINAPI _export DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason,
    hb_vmInit( FALSE );  /* Don't execute first linked symbol */
 
    return TRUE;
-}
\ No newline at end of file
+}
+
diff --git a/harbour/tests/regress/rt_main.ch b/harbour/tests/regress/rt_main.ch
index faf78643bd..e664c22dc5 100644
--- a/harbour/tests/regress/rt_main.ch
+++ b/harbour/tests/regress/rt_main.ch
@@ -126,7 +126,7 @@ INIT PROCEDURE RT_InitStatics()
    snLongN   := -100000
    snDoubleN := -10.567 /* Use different number of decimals than the default */
    snDoubleI := 0   // Log( 0 )
-   sdDate    := SToD( "19800101" )
+   sdDate    := SToD( "19840325" )
    sdDateE   := SToD( "" )
    slFalse   := .F.
    slTrue    := .T.