diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c
index 6276ef357a..8b4bd3aa84 100644
--- a/harbour/source/rtl/filesys.c
+++ b/harbour/source/rtl/filesys.c
@@ -2007,23 +2007,24 @@ static HANDLE DostoWinHandle( FHANDLE fHandle)
 #endif
 
 BYTE HB_EXPORT * hb_fileNameConv(char *str) {
-   // Convert file and dir case. The allowed SET options are:
-   // LOWER - Convert all caracters of file to lower
-   // UPPER - Convert all caracters of file to upper
-   // MIXED - Leave as is
-
-   // The allowed environment options are:
-   // FILECASE - define the case of file
-   // DIRCASE - define the case of path
-   // DIRSEPARATOR - define separator of path (Ex. "/")
+/*
+    Convert file and dir case. The allowed SET options are:
+    LOWER - Convert all caracters of file to lower
+    UPPER - Convert all caracters of file to upper
+    MIXED - Leave as is
 
+    The allowed environment options are:
+    FILECASE - define the case of file
+    DIRCASE - define the case of path
+    DIRSEPARATOR - define separator of path (Ex. "/")
+*/
    size_t a;
    char *filename;
    char *dirname=str;
    size_t dirlen;
    /* char * szFileTrim =str; */
 
-   // Look for filename (Last "\" or DIRSEPARATOR)
+   /* Look for filename (Last "\" or DIRSEPARATOR) */
    if( hb_set.HB_SET_DIRSEPARATOR != '\\' ) {
       for(a=0;a<strlen(str);a++)
          if( str[a] == '\\' )
@@ -2035,13 +2036,13 @@ BYTE HB_EXPORT * hb_fileNameConv(char *str) {
       filename=str;
    dirlen=filename-str;
 
-   // FILECASE
+   /* FILECASE */
    if( hb_set.HB_SET_FILECASE == HB_SET_CASE_LOWER )
       hb_strLower( filename, strlen(filename) );
    else if( hb_set.HB_SET_FILECASE == HB_SET_CASE_UPPER )
       hb_strUpper( filename, strlen(filename) );
 
-   // DIRCASE
+   /* DIRCASE */
    if( hb_set.HB_SET_DIRCASE == HB_SET_CASE_LOWER )
       hb_strLower(dirname,dirlen);
    else if( hb_set.HB_SET_DIRCASE == HB_SET_CASE_UPPER )
diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c
index 2c6a73932f..3325fb3542 100644
--- a/harbour/source/rtl/inkey.c
+++ b/harbour/source/rtl/inkey.c
@@ -204,12 +204,13 @@ int hb_inkeyNext( HB_inkey_enum event_mask )      /* Return the next key without
 
 void hb_inkeyPoll( void )     /* Poll the console keyboard to stuff the Harbour buffer */
 {
-//   static double dbLast;
+/*   static double dbLast; */
 
    HB_TRACE(HB_TR_DEBUG, ("hb_inkeyPoll()"));
 
-//   if( dbLast != hb_dateSeconds() )
-//   {
+/*   if( dbLast != hb_dateSeconds() )
+ *   {
+*/
       if( hb_set.HB_SET_TYPEAHEAD || s_inkeyPoll )
       {
          int ch = hb_gt_ReadKey( s_eventmask );
@@ -238,8 +239,9 @@ void hb_inkeyPoll( void )     /* Poll the console keyboard to stuff the Harbour
 
          hb_inkeyPut( ch );
       }
-//      dbLast = hb_dateSeconds();
-//   }
+/*      dbLast = hb_dateSeconds();
+ *   }
+*/
 }
 
 void hb_inkeyReset( BOOL allocate )     /* Reset the keyboard buffer */
diff --git a/harbour/source/rtl/isprint.c b/harbour/source/rtl/isprint.c
index 850737474b..de852c1eda 100644
--- a/harbour/source/rtl/isprint.c
+++ b/harbour/source/rtl/isprint.c
@@ -69,7 +69,7 @@
 #if defined(HB_OS_WIN_32) && !defined(__RSXNT__)
 
    #include <stdio.h>
-///   #include <malloc.h>
+/*   #include <malloc.h> */
    #include <winspool.h>
 
    static BOOL IsPrinterError(HANDLE hPrinter);
diff --git a/harbour/source/rtl/math.c b/harbour/source/rtl/math.c
index ad91714fd0..04e7e38021 100644
--- a/harbour/source/rtl/math.c
+++ b/harbour/source/rtl/math.c
@@ -173,7 +173,7 @@ int matherr (struct exception * err)
       }; break;
    }
 
-   s_hb_exc.funcname = (char *)err->name;  // (char *) Avoid warning in DJGPP
+   s_hb_exc.funcname = (char *)err->name;  /* (char *) Avoid warning in DJGPP */
    s_hb_exc.arg1 = err->arg1;
    s_hb_exc.arg2 = err->arg2;
    s_hb_exc.retval = err->retval;
diff --git a/harbour/source/rtl/philes.c b/harbour/source/rtl/philes.c
index 62c2cd806d..495aec8674 100644
--- a/harbour/source/rtl/philes.c
+++ b/harbour/source/rtl/philes.c
@@ -98,8 +98,10 @@ HB_FUNC( FREAD )
 
       if( pItem->item.asString.bStatic ||
           ( * pItem->item.asString.u.pulHolders ) > 1 )
-         // Warning: Don't use hb_itemPutC() here, as it fails if 1 byte buffer used
-         // cause 1 byte length strings optimization
+         /*
+          * Warning: Don't use hb_itemPutC() here, as it fails if 1 byte buffer used
+          * cause 1 byte length strings optimization
+         */
          hb_itemPutCPtr( pItem, hb_strdup( hb_parc( 2 ) ), hb_parclen( 2 ) );
 
       ulRead = hb_parnl( 3 );
diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg
index 2e9f72b9b8..e637799697 100644
--- a/harbour/source/rtl/tget.prg
+++ b/harbour/source/rtl/tget.prg
@@ -369,7 +369,7 @@ METHOD Display( lForced ) CLASS Get
       ::picture := ::cPicture
    endif
 
-   xBuffer := ::PutMask( ::VarGet(), .f. )
+   xBuffer := ::buffer     //::PutMask( ::VarGet(), .f. )
 
    if ! ::lMinusPrinted .and. ! Empty( ::DecPos ) .and. ::minus .and. substr( xBuffer, ::DecPos-1, 1 ) == "0"
       xBuffer := substr( xBuffer, 1, ::DecPos - 2 ) + "-." + substr( xBuffer, ::DecPos + 1 )
diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c
index e65650249d..c076b64de7 100644
--- a/harbour/source/vm/classes.c
+++ b/harbour/source/vm/classes.c
@@ -1611,7 +1611,7 @@ static PHB_ITEM hb_clsInst( USHORT uiClass )
             HB_ITEM init;
             PHB_ITEM pInit;
 
-            ( &init )->type = HB_IT_NIL; // hb_itemInit( &init );
+            ( &init )->type = HB_IT_NIL; /* hb_itemInit( &init ); */
 
             hb_arrayGet( pClass->pClassDatas, pMeth->uiData, &init );
 
@@ -1925,7 +1925,7 @@ HB_FUNC( __CLSINSTSUPER )
          hb_vmPushNil();
          hb_vmFunction( 0 );                         /* Execute super class      */
 
-         if( HB_IS_OBJECT( hb_stackItemFromTop( -1 ) ) )  // &hb_stack.Return
+         if( HB_IS_OBJECT( hb_stackItemFromTop( -1 ) ) )  /* &hb_stack.Return */
          {
             for( uiClass = 0; ! bFound && uiClass < s_uiClasses; uiClass++ )
             {                                      /* Locate the entry         */
@@ -2322,7 +2322,7 @@ static HARBOUR hb___msgEvalInline( void )
    USHORT uiParam;
    USHORT uiPCount=hb_pcount();
 
-   ( &block )->type = HB_IT_NIL; // hb_itemInit( &block );
+   ( &block )->type = HB_IT_NIL; /* hb_itemInit( &block ); */
 
    hb_arrayGet( s_pClasses[ uiClass - 1 ].pInlines, s_pMethod->uiData, &block );
 
@@ -2369,20 +2369,22 @@ static HARBOUR hb___msgEval( void )
  *
  * Internal function to return a superobject
  */
-//static HARBOUR hb___msgSuper( void )
-//{
-//   PHB_ITEM pObject = hb_stackSelfItem();
-//
-//   pObject->item.asArray.value->uiPrevCls  = pObject->item.asArray.value->uiClass; /* backup of actual handel */
-//   pObject->item.asArray.value->uiClass    = s_pMethod->uiSprClass;                /* superclass handel casting */
-//
-//   hb_itemReturn( pObject );
-//}
+/*
+static HARBOUR hb___msgSuper( void )
+{
+   PHB_ITEM pObject = hb_stackSelfItem();
+
+   pObject->item.asArray.value->uiPrevCls  = pObject->item.asArray.value->uiClass; / * backup of actual handel * /
+   pObject->item.asArray.value->uiClass    = s_pMethod->uiSprClass;                / * superclass handel casting * /
+
+   hb_itemReturn( pObject );
+}
+*/
 
 static HARBOUR hb___msgSuper( void )
 {
    PHB_ITEM pObject = hb_stackSelfItem();
-   //ULONG ulLen = pObject->item.asArray.value->ulLen;
+   /*ULONG ulLen = pObject->item.asArray.value->ulLen; */
    PHB_ITEM pCopy = hb_itemArrayNew(1);
 
    /* Now save the Self object as the 1st elem. */
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index de825c64a5..542029bac8 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -3327,7 +3327,7 @@ void HB_EXPORT hb_vmDo( USHORT uiParams )
               uiClass=pSelfBase->uiClass;
 
               pRealSelf = hb_itemNew( NULL ) ;
-              hb_itemCopy(pRealSelf ,pSelf->item.asArray.value->pItems) ;  // hb_arrayGetItemPtr(pSelf,1) ;
+              hb_itemCopy(pRealSelf ,pSelf->item.asArray.value->pItems) ;  /* hb_arrayGetItemPtr(pSelf,1) ; */
               /* and take back the good pSelfBase */
               pSelfBase = pRealSelf->item.asArray.value;
               /* Now I should exchnage it with the current stacked value */
@@ -3494,7 +3494,7 @@ void HB_EXPORT hb_vmSend( USHORT uiParams )
    bDebugPrevState = s_bDebugging;
    s_bDebugging = FALSE;
 
-   //printf( "Symbol: '%s'\n", pSym->szName );
+   /* printf( "Symbol: '%s'\n", pSym->szName ); */
 
    if( HB_IS_NIL( pSelf ) ) /* are we sending a message ? */
    {
@@ -3583,7 +3583,7 @@ void HB_EXPORT hb_vmSend( USHORT uiParams )
             uiClass = pSelfBase->uiClass;
 
             pRealSelf = hb_itemNew( NULL ) ;
-            hb_itemCopy( pRealSelf, pSelf->item.asArray.value->pItems ) ;  // hb_arrayGetItemPtr(pSelf,1) ;
+            hb_itemCopy( pRealSelf, pSelf->item.asArray.value->pItems ) ;  /* hb_arrayGetItemPtr(pSelf,1) ; */
             /* and take back the good pSelfBase */
             pSelfBase = pRealSelf->item.asArray.value;
             /* Now I should exchnage it with the current stacked value */