diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 46ccaabe2c..1d3fdfaeae 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,29 @@
+20000327-21:35 GMT+1 Victor Szakats <info@szelvesz.hu>
+
+   ! Trash in harbour CVS root directory removed by SourceForge staff.
+   ! File permission error corrected for CONTRIB/RDD_ADS/ dir 
+     by SourceForge staff.
+
+   * utils/hbextern/hbextern.prg
+     ! Fixed handling of HB_FUNC().
+   * source/rtl/console.c
+     ! hb_consoleRelease() now calls hb_mouseExit().
+   * source/vm/debug.c
+     ! Oops, one StackLen() converted to hb_stackLen()
+   * source/rtl/natmsg/msgru866.c
+     ! Fixed country.
+   * source/rtl/tone.c
+     - Removed local ChangeLog
+
+   * source/pp/stdalone/hbpp.c
+   * source/pp/ppcore.c
+   * source/pp/ppcomp.c
+   * source/rtl/gtwin/gtwin.c
+   * source/rtl/gtcrs/gtcrs.c
+   * source/rtl/setcolor.c
+     ! TRACE call fixes. Thanks go to Tom Sobota.
+     + #include "inkey.ch" added for gtcrs.c
+
 20000327-01:24 GMT+1 Victor Szakats <info@szelvesz.hu>
 
    - doc/cvshowto.txt
diff --git a/harbour/source/pp/ppcomp.c b/harbour/source/pp/ppcomp.c
index 58a8ebb0bf..41db587db9 100644
--- a/harbour/source/pp/ppcomp.c
+++ b/harbour/source/pp/ppcomp.c
@@ -60,7 +60,7 @@ int hb_pp_Internal( FILE * handl_o, char * sOut )
   int lens, rdlen;
   int lLine = 0, i;
 
-  HB_TRACE(HB_TR_DEBUG, ("PreProcess(%p, %p, %s)", handl_o, sOut));
+  HB_TRACE(HB_TR_DEBUG, ("hb_pp_Internal(%p, %s)", handl_o, sOut));
 
   hb_pp_nEmptyStrings = 0;
   while( TRUE )
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index 222137c37f..3047d88041 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -580,7 +580,7 @@ static void ParseCommand( char * sLine, BOOL com_or_xcom, BOOL com_or_tra )
   int mlen,rlen;
   int ipos;
 
-  HB_TRACE(HB_TR_DEBUG, ("ParseCommand(%s, $d, $d)", sLine, com_or_xcom, com_or_tra));
+  HB_TRACE(HB_TR_DEBUG, ("ParseCommand(%s, %d, %d)", sLine, com_or_xcom, com_or_tra));
 
   NextWord( &sLine, cmdname, FALSE );
   hb_strupr( cmdname );
@@ -625,7 +625,7 @@ static void ConvertPatterns( char * mpatt, int mlen, char * rpatt, int rlen )
   char lastchar = '@', exptype;
   char * ptr;
 
-  HB_TRACE(HB_TR_DEBUG, ("ConvertPatterns(%s, $d, %s, $d)", mpatt, mlen, rpatt, rlen));
+  HB_TRACE(HB_TR_DEBUG, ("ConvertPatterns(%s, %d, %s, %d)", mpatt, mlen, rpatt, rlen));
 
   while( *(mpatt+i) != '\0' )
     {
diff --git a/harbour/source/pp/stdalone/hbpp.c b/harbour/source/pp/stdalone/hbpp.c
index 55feb96a4e..40199924d8 100644
--- a/harbour/source/pp/stdalone/hbpp.c
+++ b/harbour/source/pp/stdalone/hbpp.c
@@ -236,7 +236,7 @@ int hb_pp_Parse( FILE * handl_o )
   int lens, rdlen;
   int lLine = 0, i;
 
-  HB_TRACE(HB_TR_DEBUG, ("PreProcess(%p, %p, %s)", handl_o, sOut));
+  HB_TRACE(HB_TR_DEBUG, ("hb_pp_Parse(%p)", handl_o));
 
   hb_pp_nEmptyStrings = 0;
   while( TRUE )
diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c
index 061a09a7e0..bf33d078d7 100644
--- a/harbour/source/rtl/console.c
+++ b/harbour/source/rtl/console.c
@@ -133,6 +133,7 @@ void hb_consoleRelease( void )
    s_szCrLf[ 1 ] = '\0';
 
    hb_gtExit();
+   hb_mouseExit();
 
    s_bInit = FALSE;
 }
diff --git a/harbour/source/rtl/gtcrs/gtcrs.c b/harbour/source/rtl/gtcrs/gtcrs.c
index 2dda5f7d36..07c2ac099c 100644
--- a/harbour/source/rtl/gtcrs/gtcrs.c
+++ b/harbour/source/rtl/gtcrs/gtcrs.c
@@ -38,6 +38,8 @@
 #include "hbapigt.h"
 #include "hbinit.h"
 
+#include "inkey.ch"
+
 static USHORT s_uiDispCount;
 
 static void gt_GetMaxRC(int* r, int* c);
@@ -153,7 +155,7 @@ int hb_gt_ReadKey( HB_inkey_enum eventmask )
 {
    int ch;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_gt_ReadKey(%d)", (int) event_mask));
+   HB_TRACE(HB_TR_DEBUG, ("hb_gt_ReadKey(%d)", (int) eventmask));
 
    HB_SYMBOL_UNUSED( eventmask );
 
diff --git a/harbour/source/rtl/gtwin/gtwin.c b/harbour/source/rtl/gtwin/gtwin.c
index 96fe981039..c0949fe118 100644
--- a/harbour/source/rtl/gtwin/gtwin.c
+++ b/harbour/source/rtl/gtwin/gtwin.c
@@ -261,7 +261,7 @@ int hb_gt_ReadKey( HB_inkey_enum eventmask )
 {
    int ch = 0;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_gt_ReadKey(%d)", (int) event_mask));
+   HB_TRACE(HB_TR_DEBUG, ("hb_gt_ReadKey(%d)", (int) eventmask));
 
    /* First check for Ctrl+Break, which is handled by gt/gtwin.c */
    if( s_bBreak )
diff --git a/harbour/source/rtl/natmsg/msgru866.c b/harbour/source/rtl/natmsg/msgru866.c
index 1cf3ebc0cb..dee1a53449 100644
--- a/harbour/source/rtl/natmsg/msgru866.c
+++ b/harbour/source/rtl/natmsg/msgru866.c
@@ -4,8 +4,8 @@
 
 /* Language Support Module */
 
-/* Language name: Portugese */
-/* ISO language code (2 chars): PT */
+/* Language name: Russian */
+/* ISO language code (2 chars): RU */
 /* Codepage: 866 */
 
 #include "hbdefs.h"
diff --git a/harbour/source/rtl/setcolor.c b/harbour/source/rtl/setcolor.c
index 5d0be52495..cfebaace54 100644
--- a/harbour/source/rtl/setcolor.c
+++ b/harbour/source/rtl/setcolor.c
@@ -39,7 +39,7 @@
 
 char * hb_setColor( char * szColor )
 {
-   HB_TRACE(HB_TR_DEBUG, ("hb_setColor(%s)", sColor));
+   HB_TRACE(HB_TR_DEBUG, ("hb_setColor(%s)", szColor));
 
    hb_gtGetColorStr( hb_set.HB_SET_COLOR );
 
diff --git a/harbour/source/rtl/tone.c b/harbour/source/rtl/tone.c
index 4327f6da52..584742cb52 100644
--- a/harbour/source/rtl/tone.c
+++ b/harbour/source/rtl/tone.c
@@ -33,30 +33,6 @@
  *
  */
 
-/*
- * ChangeLog:
- *
- * V 1.10   David G. Holm               Added __MINGW32__ support
- * V 1.8    David G. Holm               Added '&& ! defined(_Windows)'
- *                                      check to all __BORLANDC__ checks.
- * V 1.6    David G. Holm               Added Win32 Beep(), thanks to
- *                                      Chen Kedem.
- * V 1.4    David G. Holm               Upper limit for frequency for OS/2
- *                                      DosBeep() is 32767. The CA-Clipper
- *                                      Tone() function does not have an
- *                                      upper limit on the duration, so I
- *                                      had to add an inner loop to deal
- *                                      with very long durations. There are
- *                                      actually 18.2 Clipper (PC) timer
- *                                      ticks per second.
- * V 1.2    David G. Holm               Added OS/2 GCC/EMX support.
- * V 1.1    David G. Holm               Split machine dependent code into
- *                                      hb_tone() function for internal use
- *                                      by other Harbour C functions.
- * V 1.0    Chen Kedem                  Initial version (only OS/2 support).
- *
- */
-
 #include "hbapi.h"
 #include "hbapigt.h"
 
diff --git a/harbour/source/vm/debug.c b/harbour/source/vm/debug.c
index f942eac113..0a813e890f 100644
--- a/harbour/source/vm/debug.c
+++ b/harbour/source/vm/debug.c
@@ -144,7 +144,7 @@ HB_FUNC( __VMSTKLLIST )
    PHB_ITEM pItem;
    PHB_ITEM pBase = hb_stack.pItems + hb_stack.pBase->item.asSymbol.stackbase;
 
-   USHORT uiLen = StackLen();
+   USHORT uiLen = hb_stackLen();
    USHORT uiPos = 1;
 
    pReturn = hb_itemArrayNew( uiLen );           /* Create a transfer array  */
diff --git a/harbour/utils/hbextern/hbextern.prg b/harbour/utils/hbextern/hbextern.prg
index adfdb19ff3..87152e730e 100644
--- a/harbour/utils/hbextern/hbextern.prg
+++ b/harbour/utils/hbextern/hbextern.prg
@@ -126,16 +126,14 @@ PROCEDURE ProcessLine( nOut, cLine )
 
    nPos =AT( "HB_FUNC(", cLine )
    IF nPos > 0
-      cLine = LTRIM( SUBSTR( cLine, nPos+7 ) )
-      IF AT( "HB_", cLine ) == 1
-         nPos =AT( ")", cLine )
-         IF nPos > 0
-            cLine :=ALLTRIM( SUBSTR( cLine, 4, nPos-4 ) )
-            ? cLine
-            IF (ISALPHA(cLine) .OR. cLine="_") .AND. ASCAN( aNames, {|c|c==cLine} ) == 0
-               AADD( aNames, cLine )
-               FWRITE( nOut, "EXTERNAL " +cLine + hb_OSNewLine() )
-            ENDIF
+      cLine = LTRIM( SUBSTR( cLine, nPos + Len("HB_FUNC(") ) )
+      nPos =AT( ")", cLine )
+      IF nPos > 0
+         cLine :=ALLTRIM( Left( cLine, nPos - 1 ) )
+         ? cLine
+         IF (ISALPHA(cLine) .OR. cLine="_") .AND. ASCAN( aNames, {|c|c==cLine} ) == 0
+            AADD( aNames, cLine )
+            FWRITE( nOut, "EXTERNAL " +cLine + hb_OSNewLine() )
          ENDIF
       ENDIF
    ELSE