diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d11eb5f599..68f6bb87fd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,20 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-08 00:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/common/hbverdsp.c
+    + Instead of adding "(UNICODE)" marker in build info for UNICODE
+      builds, now it will add "(WINANSI)" for non-UNICODE builds.
+
+  * contrib/hbnetio/utils/hbnetio/netiosrv.prg
+    * Using more hb_StrFormat()
+
+  * contrib/hbnetio/utils/hbnetio/netiocon.prg
+    * Tweak to one cmd help.
+
+  * utils/hbrun/hbrun.prg
+    * Formatting.
+
 2011-02-08 00:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbnetio/utils/hbnetio/netiosrv.prg
   * contrib/hbnetio/utils/hbnetio/netiocon.prg
diff --git a/harbour/contrib/hbnetio/utils/hbnetio/netiocon.prg b/harbour/contrib/hbnetio/utils/hbnetio/netiocon.prg
index f13c82f10b..0ebf6eae86 100644
--- a/harbour/contrib/hbnetio/utils/hbnetio/netiocon.prg
+++ b/harbour/contrib/hbnetio/utils/hbnetio/netiocon.prg
@@ -80,7 +80,7 @@ PROCEDURE hbnetiocon_cmdUI( cIP, nPort, cPassword )
       "clear"         => { ""               , "Clear screen."                                  , {|| Scroll(), SetPos( 0, 0 ) } },;
       "connect"       => { "[<ip[:port>]]"  , "Connect."                                       , {| cCommand | cmdConnect( cCommand, @pConnection, @cIP, @nPort, @nStreamID ) } },;
       "disconnect"    => { ""               , "Disconnect."                                    , {|| cmdDisconnect( @pConnection ) } },;
-      "sysinfo"       => { ""               , "Show system/build information."                 , {|| cmdSysInfo( pConnection ) } },;
+      "sysinfo"       => { ""               , "Show server system/build information."          , {|| cmdSysInfo( pConnection ) } },;
       "showconf"      => { ""               , "Show server configuration."                     , {|| cmdServerConfig( pConnection ) } },;
       "show"          => { ""               , "Show list of connections."                      , {|| cmdConnInfo( pConnection, .F. ) } },;
       "showadmin"     => { ""               , "Show list of management connections."           , {|| cmdConnInfo( pConnection, .T. ) } },;
@@ -288,10 +288,12 @@ STATIC FUNCTION GetPassword()
 
 /* Adjusted the positioning of cursor on navigate through history. [vailtom] */
 STATIC PROCEDURE ManageCursor( cCommand )
+
    hb_keyPut( K_HOME )
    IF ! Empty( cCommand )
       hb_keyPut( K_END )
    ENDIF
+
    RETURN
 
 /* Complete the command line, based on the first characters that the user typed. [vailtom] */
diff --git a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
index e238127f15..b13c120140 100644
--- a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
+++ b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
@@ -352,14 +352,14 @@ STATIC FUNCTION netiosrv_ConfLoad( netiosrv, netiomgm )
 
 STATIC FUNCTION netiosrv_config( netiosrv, netiomgm )
    LOCAL aArray := {;
-      "Listening on: "      + netiosrv[ _NETIOSRV_cIFAddr ] + ":" + hb_ntos( netiosrv[ _NETIOSRV_nPort ] ),;
-      "Root filesystem: "   + netiosrv[ _NETIOSRV_cRootDir ],;
-      "RPC support: "       + iif( netiosrv[ _NETIOSRV_lRPC ], "enabled", "disabled" ),;
-      "Encryption: "        + iif( netiosrv[ _NETIOSRV_lEncryption ], "enabled", "disabled" ),;
-      "RPC filter module: " + iif( Empty( netiosrv[ _NETIOSRV_hRPCFHRB ] ), iif( netiosrv[ _NETIOSRV_lRPC ], "not set (WARNING: unsafe open server)", "not set" ), netiosrv[ _NETIOSRV_cRPCFFileName ] ) }
+      hb_StrFormat( "Listening on: %1$s:%2$d" , netiosrv[ _NETIOSRV_cIFAddr ], netiosrv[ _NETIOSRV_nPort] ),;
+      hb_StrFormat( "Root filesystem: %1$s"   , netiosrv[ _NETIOSRV_cRootDir ] ),;
+      hb_StrFormat( "RPC support: %1$s"       , iif( netiosrv[ _NETIOSRV_lRPC ], "enabled", "disabled" ) ),;
+      hb_StrFormat( "Encryption: %1$s"        , iif( netiosrv[ _NETIOSRV_lEncryption ], "enabled", "disabled" ) ),;
+      hb_StrFormat( "RPC filter module: %1$s" , iif( Empty( netiosrv[ _NETIOSRV_hRPCFHRB ] ), iif( netiosrv[ _NETIOSRV_lRPC ], "not set (WARNING: unsafe open server)", "not set" ), netiosrv[ _NETIOSRV_cRPCFFileName ] ) ) }
 
    IF ! Empty( netiomgm[ _NETIOSRV_pListenSocket ] )
-      AAdd( aArray, "Management iface: "  + netiomgm[ _NETIOSRV_cIFAddr ] + ":" + hb_ntos( netiomgm[ _NETIOSRV_nPort ] ) )
+      AAdd( aArray, hb_StrFormat( "Management iface: %1$s:%2$d", netiomgm[ _NETIOSRV_cIFAddr ], netiomgm[ _NETIOSRV_nPort ] ) )
    ENDIF
 
    RETURN aArray
@@ -556,10 +556,10 @@ STATIC FUNCTION netiomgm_rpc_setclientinfo( netiosrv, hInfo )
 
 STATIC FUNCTION netiomgm_rpc_sysinfo()
    RETURN {;
-      "OS: "          + OS()                   ,;
-      "Harbour: "     + Version()              ,;
-      "C Compiler: "  + hb_Compiler()          ,;
-      "Memory (KB): " + hb_ntos( Memory( 0 ) ) }
+      hb_StrFormat( "OS: %1$s"          , OS() )                  ,;
+      hb_StrFormat( "Harbour: %1$s"     , Version() )             ,;
+      hb_StrFormat( "C Compiler: %1$s"  , hb_Compiler() )         ,;
+      hb_StrFormat( "Memory (KB): %1$d" , Memory( 0 ) )           }
 
 STATIC FUNCTION netiomgm_rpc_serverconfig( netiosrv, netiomgm )
    RETURN netiosrv_config( netiosrv, netiomgm )
diff --git a/harbour/src/common/hbverdsp.c b/harbour/src/common/hbverdsp.c
index 07c897e1ed..a8e948eb9e 100644
--- a/harbour/src/common/hbverdsp.c
+++ b/harbour/src/common/hbverdsp.c
@@ -158,8 +158,8 @@ void hb_verBuildInfo( void )
 #if defined( HB_CLP_STRICT )
    hb_conOutErr( "(Clipper 5.x strict) ", 0 );
 #endif
-#if defined( HB_OS_WIN ) && defined( UNICODE )
-   hb_conOutErr( "(UNICODE) ", 0 );
+#if defined( HB_OS_WIN ) && ! defined( UNICODE )
+   hb_conOutErr( "(WINANSI) ", 0 );
 #endif
    hb_conOutErr( hb_conNewLine(), 0 );
 
diff --git a/harbour/utils/hbrun/hbrun.prg b/harbour/utils/hbrun/hbrun.prg
index 5ae16989be..2b802e3d6d 100644
--- a/harbour/utils/hbrun/hbrun.prg
+++ b/harbour/utils/hbrun/hbrun.prg
@@ -359,16 +359,16 @@ STATIC PROCEDURE hbrun_Prompt( cCommand )
       @ nMaxRow, Col() GET cLine ;
                        PICTURE "@KS" + hb_NToS( nMaxCol - Col() + 1 )
 
-      SetCursor( IIF( ReadInsert(), SC_INSERT, SC_NORMAL ) )
+      SetCursor( iif( ReadInsert(), SC_INSERT, SC_NORMAL ) )
 
       bKeyIns  := SetKey( K_INS, ;
-         {|| SetCursor( IIF( ReadInsert( !ReadInsert() ), ;
+         {|| SetCursor( iif( ReadInsert( !ReadInsert() ), ;
                           SC_NORMAL, SC_INSERT ) ) } )
       bKeyUp   := SetKey( K_UP, ;
-         {|| IIF( nHistIndex > 1, ;
+         {|| iif( nHistIndex > 1, ;
                   cLine := s_aHistory[ --nHistIndex ], ) } )
       bKeyDown := SetKey( K_DOWN, ;
-         {|| cLine := IIF( nHistIndex < LEN( s_aHistory ), ;
+         {|| cLine := iif( nHistIndex < LEN( s_aHistory ), ;
              s_aHistory[ ++nHistIndex ], ;
              ( nHistIndex := LEN( s_aHistory ) + 1, Space( HB_LINE_LEN ) ) ) } )
       bKeyResize := SetKey( HB_K_RESIZE,;