diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cf44ad9e1f..f5117af0cb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-11-06 07:32 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbtip/tests/loadhtml.prg
+  * contrib/hbwin/tests/testax.prg
+  * doc/gtapi.txt
+  * src/rtl/mod.c
+  * tests/wvtext.prg
+    * minor cleanups
+
 2012-11-06 05:54 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbexpat/hbexpat.hbx
   * contrib/hbwin/hbwin.hbx
diff --git a/harbour/contrib/hbtip/tests/loadhtml.prg b/harbour/contrib/hbtip/tests/loadhtml.prg
index 2931ad4d98..e739b886b0 100644
--- a/harbour/contrib/hbtip/tests/loadhtml.prg
+++ b/harbour/contrib/hbtip/tests/loadhtml.prg
@@ -8,7 +8,7 @@
 
 #require "hbtip"
 
-PROCEDURE Main
+PROCEDURE Main()
 
    LOCAL oHttp, cHtml, hQuery, aLink, oNode, oDoc
 
diff --git a/harbour/contrib/hbwin/tests/testax.prg b/harbour/contrib/hbwin/tests/testax.prg
index 5f0e8fa481..807bb26cff 100644
--- a/harbour/contrib/hbwin/tests/testax.prg
+++ b/harbour/contrib/hbwin/tests/testax.prg
@@ -16,7 +16,7 @@ PROCEDURE Main()
 
    LOCAL oMSCAL
 
-#if defined( __PLATFORM__WINDOWS ) .AND. defined( __HBSCRIPT__HBSHELL )
+#if ! defined( __HBSCRIPT__HBSHELL ) .AND. defined( __PLATFORM__WINDOWS )
    hbshell_gtSelect( "GTWVT" )
 #endif
 
@@ -32,10 +32,10 @@ CREATE CLASS HActiveX
 
    VAR oOLE
    VAR hWnd
-   METHOD Init
-   METHOD Event
-   ERROR HANDLER OnError
-   DESTRUCTOR Close
+   METHOD Init( hWnd, cProgId, nTop, nLeft, nWidth, nHeight, cID )
+   METHOD Event( ... )
+   ERROR HANDLER OnError()
+   DESTRUCTOR Close()
 
 ENDCLASS
 
@@ -45,7 +45,9 @@ METHOD Init( hWnd, cProgId, nTop, nLeft, nWidth, nHeight, cID ) CLASS HActiveX
 
    win_axInit()
    ::hWnd := wapi_CreateWindowEx( 0, "AtlAxWin", cProgId, nStyle, nLeft, nTop, nWidth, nHeight, hWnd, 0 )
-   /* WAPI_SetWindowPos( ::hWnd, WIN_HWND_TOPMOST, 0, 0, 1, 1, hb_bitOr( WIN_SWP_NOSIZE, WIN_SWP_DRAWFRAME ) ) */
+#if 0
+   wapi_SetWindowPos( ::hWnd, WIN_HWND_TOPMOST, 0, 0, 1, 1, hb_bitOr( WIN_SWP_NOSIZE, WIN_SWP_DRAWFRAME ) )
+#endif
    ::oOLE := win_axGetControl( ::hWnd, {| event, ... | ::Event( event, ... ) }, cID )
 
    RETURN self
diff --git a/harbour/doc/gtapi.txt b/harbour/doc/gtapi.txt
index de346d1775..7bac4e73f2 100644
--- a/harbour/doc/gtapi.txt
+++ b/harbour/doc/gtapi.txt
@@ -138,7 +138,7 @@ before the one in core code). So it's enough to write something like:
 
     ANNOUNCE RDDSYS
 or:
-    PROC RDDSYS; RETURN
+    PROCEDURE RDDSYS(); RETURN
 
 Both gives the same effect, and default RDD (DBFNTX) will not be linked.
 Exactly the same I've done in GT subsystem. HB_GTSYS() makes exactly
@@ -157,7 +157,7 @@ the same as for RDD and add to your code:
 
     ANNOUNCE HB_GTSYS
 or:
-    PROC HB_GTSYS; RETURN
+    PROCEDURE HB_GTSYS(); RETURN
 
 In such case your final application will not have any GT driver. If you
 want to use GTNUL as base, you should add:
@@ -175,19 +175,19 @@ For example, compile this code:
     /*** t.prg ***/
     REQUEST HB_GT_WIN
     REQUEST HB_GT_WVT
-    PROC MAIN()
-       ? HB_GTVERSION(), HB_GTVERSION(1)
-       TONE( 200, 3 )
-       TONE( 300, 3 )
-       TONE( 500, 3 )
-       INKEY( 0 )
-    RETURN
+    PROCEDURE Main()
+       ? hb_gtVersion(), hb_gtVersion( 1 )
+       Tone( 200, 3 )
+       Tone( 300, 3 )
+       Tone( 500, 3 )
+       Inkey( 0 )
+       RETURN
 
 and link it as Windows GUI application. Then simply execute:
 
-    t //GTWIN
+    t --hb:gtwin
 and:
-    t //GTWVT
+    t --hb:gtwvt
 
 Most of Windows linkers execute startup initialization code in the
 order of linked modules, so the first linked GT driver will be the
@@ -204,12 +204,12 @@ activated but GTNUL.
 
 It could be intentional, because if your application is linked with more
 GTs, then you can also set the default one when you start your
-application using //GT<name> switch, or HB_GT environment variable. So
-you can create GUI application which will set the default GT driver to
-NUL and will not activate GTWIN, and when you'll want to enable debug
+application using --hb:gt<name> switch, or HB_GT environment variable.
+So you can create GUI application which will set the default GT driver
+to NUL and will not activate GTWIN, and when you'll want to enable debug
 messages, you simply run:
 
-    myprog //GTWIN
+    myprog --hb:gtwin
 
 and debug messages will use the GTWIN console window. You can think of
 other situations when it could be useful to have full functional GT
diff --git a/harbour/src/rtl/mod.c b/harbour/src/rtl/mod.c
index 971cc375aa..20f4c31d85 100644
--- a/harbour/src/rtl/mod.c
+++ b/harbour/src/rtl/mod.c
@@ -93,7 +93,7 @@ HB_FUNC( MOD )
           * decimal places, it can be seen in code like:
           *    proc main()
           *       set fixed on
-          *       ? transform(mod( 12345, 0 ),"")
+          *       ? transform( mod( 12345, 0 ),"" )
           *    return
           *
           * [druzus]
diff --git a/harbour/tests/wvtext.prg b/harbour/tests/wvtext.prg
index d1232c652c..ca57980b64 100644
--- a/harbour/tests/wvtext.prg
+++ b/harbour/tests/wvtext.prg
@@ -338,7 +338,7 @@ STATIC PROCEDURE DispScreen()
 
 //
 
-#if defined( __PLATFORM__WINDOWS ) .AND. ! defined( __HBSCRIPT__HBSHELL )
+#if ! defined( __HBSCRIPT__HBSHELL ) .AND. defined( __PLATFORM__WINDOWS )
 
 PROCEDURE HB_GTSYS()