diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index d11cb67a..03c804be 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -3079,20 +3079,20 @@ int glestMain(int argc, char** argv) {
 		printf("%s %s",extractFileFromDirectoryPath(argv[0]).c_str(),getNetworkPlatformFreeVersionString().c_str());
 		printf("\nCompiled using: %s on: %s platform: %s endianness: %s",getCompilerNameString().c_str(),getCompileDateTime().c_str(),getPlatformNameString().c_str(),(Shared::PlatformByteOrder::isBigEndian() == true ? "big" : "little"));
 
-		printf("\n\nData type sizes int8 = %zu int16 = %zu int32 = %zu int64 = %zu\n\n",sizeof(int8),sizeof(int16),sizeof(int32),sizeof(int64));
-
-		Config::getInstance().setBool("DebugNetworkPackets",true,true);
-		NetworkMessageIntro data(424336, "mg_version_x","player_x", 3, nmgstOk,444444, 555555, "english");
-		unsigned char *buf = data.packMessage();
-		printf("\nSend packet size = %u\n%s\n",data.getPackedSize(),data.toString().c_str());
-		data.dump_packet("Send data", buf, data.getPackedSize());
-		//delete [] buf;
-
-		NetworkMessageIntro data2;
-		data2.unpackMessage(buf);
-		printf("\nReceive packet size = %u\n%s\n",data2.getPackedSize(),data2.toString().c_str());
-		data2.dump_packet("nReceive data", buf, data2.getPackedSize());
-		delete [] buf;
+//		printf("\n\nData type sizes int8 = %zu int16 = %zu int32 = %zu int64 = %zu\n\n",sizeof(int8),sizeof(int16),sizeof(int32),sizeof(int64));
+//
+//		Config::getInstance().setBool("DebugNetworkPackets",true,true);
+//		NetworkMessageIntro data(424336, "mg_version_x","player_x", 3, nmgstOk,444444, 555555, "english");
+//		unsigned char *buf = data.packMessage();
+//		printf("\nSend packet size = %u\n%s\n",data.getPackedSize(),data.toString().c_str());
+//		data.dump_packet("Send data", buf, data.getPackedSize());
+//		//delete [] buf;
+//
+//		NetworkMessageIntro data2;
+//		data2.unpackMessage(buf);
+//		printf("\nReceive packet size = %u\n%s\n",data2.getPackedSize(),data2.toString().c_str());
+//		data2.dump_packet("nReceive data", buf, data2.getPackedSize());
+//		delete [] buf;
 
 //		SwitchSetupRequest data("factionname", 3,-1,2,"softcoder",10, 11,"eng");
 //
diff --git a/source/glest_game/network/network_message.cpp b/source/glest_game/network/network_message.cpp
index 3864076d..a8af380f 100644
--- a/source/glest_game/network/network_message.cpp
+++ b/source/glest_game/network/network_message.cpp
@@ -154,7 +154,7 @@ unsigned int NetworkMessageIntro::getPackedSize() {
 	return result;
 }
 void NetworkMessageIntro::unpackMessage(unsigned char *buf) {
-	printf("\nIn [%s] about to unpack...\n",__FUNCTION__);
+	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\nIn [%s] about to unpack...\n",__FUNCTION__);
 	unpack(buf, getPackedMessageFormat(),
 			&data.messageType,
 			&data.sessionId,
@@ -165,13 +165,13 @@ void NetworkMessageIntro::unpackMessage(unsigned char *buf) {
 			&data.externalIp,
 			&data.ftpPort,
 			data.language.getBuffer());
-	printf("In [%s] unpacked data:\n%s\n",__FUNCTION__,this->toString().c_str());
+	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s] unpacked data:\n%s\n",__FUNCTION__,this->toString().c_str());
 }
 
 unsigned char * NetworkMessageIntro::packMessage() {
 	unsigned char *buf = new unsigned char[getPackedSize()+1];
 
-	printf("\nIn [%s] about to pack...\n",__FUNCTION__);
+	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\nIn [%s] about to pack...\n",__FUNCTION__);
 	pack(buf, getPackedMessageFormat(),
 			data.messageType,
 			data.sessionId,
diff --git a/source/glest_game/network/network_protocol.cpp b/source/glest_game/network/network_protocol.cpp
index 0600bb26..cb4ed517 100644
--- a/source/glest_game/network/network_protocol.cpp
+++ b/source/glest_game/network/network_protocol.cpp
@@ -14,9 +14,11 @@
 #include <ctype.h>
 #include <stdio.h>
 #include "data_types.h"
+#include "util.h"
 #include "leak_dumper.h"
 
 using namespace Shared::Platform;
+using namespace Shared::Util;
 
 namespace Glest{ namespace Game{
 
@@ -133,7 +135,7 @@ int16 unpacki16(unsigned char *buf)
 	}
 	else {
 		i = -1 - (uint16)(0xffffu - i2);
-		printf("IN [%s] [%d] [%d] [%d] [%u]\n",__FUNCTION__,buf[0],buf[1],i,i2);
+		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("IN [%s] [%d] [%d] [%d] [%u]\n",__FUNCTION__,buf[0],buf[1],i,i2);
 	}
 
 	return i;
@@ -164,7 +166,7 @@ int32 unpacki32(unsigned char *buf)
 	}
 	else {
 		i = -1 - (int32)(0xffffffffu - i2);
-		printf("IN [%s] [%d] [%d] [%d] [%d] [%d] [%u]\n",__FUNCTION__,buf[0],buf[1],buf[2],buf[3],i,i2);
+		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("IN [%s] [%d] [%d] [%d] [%d] [%d] [%u]\n",__FUNCTION__,buf[0],buf[1],buf[2],buf[3],i,i2);
 	}
 
 	return i;
@@ -202,7 +204,7 @@ int64 unpacki64(unsigned char *buf)
 	}
 	else {
 		i = -1 -(int64)(0xffffffffffffffffu - i2);
-		printf("IN [%s] [%d] [%d] [%d] [%d] [%d] [%d] [%d] [%d] [%ld] [%lu]\n",__FUNCTION__,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7],i,i2);
+		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("IN [%s] [%d] [%d] [%d] [%d] [%d] [%d] [%d] [%d] [%ld] [%lu]\n",__FUNCTION__,buf[0],buf[1],buf[2],buf[3],buf[4],buf[5],buf[6],buf[7],i,i2);
 	}
 
 	return i;
@@ -275,7 +277,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) {
 			c = (int8)va_arg(ap, int); // promoted
 			*buf++ = (unsigned char)c;
 
-			printf("pack int8 = %d [%X] c = %d [%X] buf pos = %d\n",*(buf-1),*(buf-1),c,c,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("pack int8 = %d [%X] c = %d [%X] buf pos = %ld\n",*(buf-1),*(buf-1),c,c,(buf - bufStart));
 			break;
 
 		case 'C': // 8-bit unsigned
@@ -283,7 +285,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) {
 			C = (uint8)va_arg(ap, unsigned int); // promoted
 			*buf++ = (unsigned char)C;
 
-			printf("pack uint8 = %u [%X] C = %u [%X] buf pos = %d\n",*(buf-1),*(buf-1),C,C,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("pack uint8 = %u [%X] C = %u [%X] buf pos = %ld\n",*(buf-1),*(buf-1),C,C,(buf - bufStart));
 			break;
 
 		case 'h': // 16-bit
@@ -292,7 +294,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) {
 			packi16(buf, h);
 			buf += 2;
 
-			printf("pack int16 = %d [%X] h = %d [%X] buf pos = %d\n",*(buf-2),*(buf-2),h,h,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("pack int16 = %d [%X] h = %d [%X] buf pos = %ld\n",*(buf-2),*(buf-2),h,h,(buf - bufStart));
 			break;
 
 		case 'H': // 16-bit unsigned
@@ -301,7 +303,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) {
 			packi16(buf, H);
 			buf += 2;
 
-			printf("pack uint16 = %u [%X] H = %u [%X] buf pos = %d\n",*(buf-2),*(buf-2),H,H,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("pack uint16 = %u [%X] H = %u [%X] buf pos = %ld\n",*(buf-2),*(buf-2),H,H,(buf - bufStart));
 			break;
 
 		case 'l': // 32-bit
@@ -310,7 +312,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) {
 			packi32(buf, l);
 			buf += 4;
 
-			printf("pack int32 = %d [%X] l = %d [%X] buf pos = %d\n",*(buf-4),*(buf-4),l,l,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("pack int32 = %d [%X] l = %d [%X] buf pos = %ld\n",*(buf-4),*(buf-4),l,l,(buf - bufStart));
 			break;
 
 		case 'L': // 32-bit unsigned
@@ -319,7 +321,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) {
 			packi32(buf, L);
 			buf += 4;
 
-			printf("pack uint32 = %u [%X] L = %u [%X] buf pos = %d\n",*(buf-4),*(buf-4),L,L,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("pack uint32 = %u [%X] L = %u [%X] buf pos = %ld\n",*(buf-4),*(buf-4),L,L,(buf - bufStart));
 			break;
 
 		case 'q': // 64-bit
@@ -328,7 +330,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) {
 			packi64(buf, q);
 			buf += 8;
 
-			printf("pack int64 = %ld [%X] q = %ld [%lX] buf pos = %d\n",*(buf-8),*(buf-8),q,q,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("pack int64 = %ld [%X] q = %ld [%lX] buf pos = %ld\n",(int64)*(buf-8),*(buf-8),q,q,(buf - bufStart));
 			break;
 
 		case 'Q': // 64-bit unsigned
@@ -337,7 +339,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) {
 			packi64(buf, Q);
 			buf += 8;
 
-			printf("pack uint64 = %lu [%X] Q = %lu [%X] buf pos = %d\n",*(buf-8),*(buf-8),Q,Q,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("pack uint64 = %lu [%X] Q = %lu buf pos = %ld\n",(uint64)*(buf-8),*(buf-8),Q,(buf - bufStart));
 			break;
 
 		case 'f': // float-16
@@ -375,7 +377,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) {
 			buf += 2;
 
 			memcpy(buf, s, len);
-			printf("pack string size = %d [%X] len = %d str [%s] buf pos = %d\n",*(buf-2),*(buf-2),len,s,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("pack string size = %d [%X] len = %d str [%s] buf pos = %ld\n",*(buf-2),*(buf-2),len,s,(buf - bufStart));
 
 			buf += len;
 			break;
@@ -452,7 +454,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) {
 			*c = (int8)*buf++;
 			size += 1;
 
-			printf("unpack int8 = %d [%X] c = %d [%X] buf pos = %d\n",*(buf-1),*(buf-1),*c,*c,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("unpack int8 = %d [%X] c = %d [%X] buf pos = %ld\n",*(buf-1),*(buf-1),*c,*c,(buf - bufStart));
 			break;
 
 		case 'C': // 8-bit unsigned
@@ -460,7 +462,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) {
 			*C = (uint8)*buf++;
 			size += 1;
 
-			printf("unpack uint8 = %u [%X] C = %u [%X] buf pos = %d\n",*(buf-1),*(buf-1),*C,*C,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("unpack uint8 = %u [%X] C = %u [%X] buf pos = %ld\n",*(buf-1),*(buf-1),*C,*C,(buf - bufStart));
 			break;
 
 		case 'h': // 16-bit
@@ -469,7 +471,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) {
 			buf += 2;
 			size += 2;
 
-			printf("unpack int16 = %d [%X] h = %d [%X] buf pos = %d\n",*(buf-2),*(buf-2),*h,*h,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("unpack int16 = %d [%X] h = %d [%X] buf pos = %ld\n",*(buf-2),*(buf-2),*h,*h,(buf - bufStart));
 			break;
 
 		case 'H': // 16-bit unsigned
@@ -478,7 +480,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) {
 			buf += 2;
 			size += 2;
 
-			printf("unpack uint16 = %u [%X] H = %u [%X] buf pos = %d\n",*(buf-2),*(buf-2),*H,*H,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("unpack uint16 = %u [%X] H = %u [%X] buf pos = %ld\n",*(buf-2),*(buf-2),*H,*H,(buf - bufStart));
 			break;
 
 		case 'l': // 32-bit
@@ -487,7 +489,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) {
 			buf += 4;
 			size += 4;
 
-			printf("unpack int32 = %d [%X] l = %d [%X] buf pos = %d\n",*(buf-4),*(buf-4),*l,*l,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("unpack int32 = %d [%X] l = %d [%X] buf pos = %ld\n",*(buf-4),*(buf-4),*l,*l,(buf - bufStart));
 			break;
 
 		case 'L': // 32-bit unsigned
@@ -496,7 +498,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) {
 			buf += 4;
 			size += 4;
 
-			printf("unpack uint32 = %u [%X] L = %u [%X] buf pos = %d\n",*(buf-4),*(buf-4),*L,*L,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("unpack uint32 = %u [%X] L = %u [%X] buf pos = %ld\n",*(buf-4),*(buf-4),*L,*L,(buf - bufStart));
 			break;
 
 		case 'q': // 64-bit
@@ -505,7 +507,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) {
 			buf += 8;
 			size += 8;
 
-			printf("unpack int64 = %ld [%X] q = %ld [%X] buf pos = %d\n",*(buf-8),*(buf-8),*q,*q,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("unpack int64 = %ld [%X] q = %ld buf pos = %ld\n",(int64)*(buf-8),*(buf-8),*q,(buf - bufStart));
 			break;
 
 		case 'Q': // 64-bit unsigned
@@ -514,7 +516,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) {
 			buf += 8;
 			size += 8;
 
-			printf("unpack uint64 = %lu [%X] Q = %lu [%X] buf pos = %d\n",*(buf-8),*(buf-8),*Q,*Q,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("unpack uint64 = %lu [%X] Q = %lu buf pos = %ld\n",(uint64)*(buf-8),*(buf-8),*Q,(buf - bufStart));
 			break;
 
 		case 'f': // float
@@ -552,7 +554,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) {
 
 			memcpy(s, buf, count);
 			s[count] = '\0';
-			printf("unpack string size = %d [%X] count = %d len = %d str [%s] buf pos = %d\n",*(buf-2),*(buf-2),count,len,s,(buf - bufStart));
+			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("unpack string size = %d [%X] count = %d len = %d str [%s] buf pos = %ld\n",*(buf-2),*(buf-2),count,len,s,(buf - bufStart));
 
 			buf += len;
 			size += len;