diff --git a/GameVersion.cpp b/GameVersion.cpp
index b58dfec71..ae454f23d 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -13,7 +13,7 @@
 #ifdef JA2BETAVERSION
 
 //BETA/TEST BUILD VERSION
-INT16		zVersionLabel[256]		= { L"Map Editor v1.13.590" }; 
+INT16		zVersionLabel[256]		= { L"Map Editor v1.13.579" }; 
 
 #elif defined CRIPPLED_VERSION
 
@@ -23,12 +23,12 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION 
-	INT16		zVersionLabel[256]		= { L"Release v1.13.590" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.592" };
 
 
 #endif
 
-INT8		czVersionNumber[16]	= { "Build 06.10.04" };
+INT8		czVersionNumber[16]	= { "Build 06.10.05" };
 INT16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/JA2.suo b/JA2.suo
index 43805c9b4..840fcce2e 100644
Binary files a/JA2.suo and b/JA2.suo differ
diff --git a/JA2.vcproj b/JA2.vcproj
index 25a035d4f..23db1d90d 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 DE\ja2_debug_v1.13.502_2006_09_01.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.502_2006_09_01.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 DE\ja2_release_v1.13.502_2006_09_01.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.502_2006_09_01.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Language Defines.h b/Language Defines.h
index ed4e9cead..5c95c2406 100644
--- a/Language Defines.h	
+++ b/Language Defines.h	
@@ -3,8 +3,8 @@
 
 //ONLY ONE OF THESE CAN BE DEFINED AT A TIME!
 
-//#define ENGLISH
-#define GERMAN
+#define ENGLISH
+//#define GERMAN
 //#define RUSSIAN
 //#define DUTCH
 //#define POLISH
diff --git a/Laptop/email.cpp b/Laptop/email.cpp
index 2bd19e4a2..8989067b2 100644
--- a/Laptop/email.cpp
+++ b/Laptop/email.cpp
@@ -3944,34 +3944,34 @@ void HandleIMPCharProfileResultsMessage( void)
 		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == ONROOF )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == ONROOF ) )
 		{
 			// WANNE: No entry in the Impass.edt for rooftop, so add any static text here
-      		// read one record from email file
-			//LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_ONROOF ), MAIL_STRING_SIZE );
+      	// read one record from email file
+		  //LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_ONROOF ), MAIL_STRING_SIZE );
 		 
 			#ifdef GERMAN
-			wcscpy(pString, L"Dach-Treffer Bonus: <Noch keine Beschreibung vorhanden>");
+				wcscpy(pString, L"Dach-Treffer Bonus: <Noch keine Beschreibung vorhanden>");
 			#else
 			wcscpy(pString, L"Rooftop Sniping: <No description yet>");
 			#endif
 
-			// add to list
-			AddEmailRecordToList( pString );
+		  // add to list
+		  AddEmailRecordToList( pString );
 		}
 
 		// camouflage
 		if( ( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait == CAMOUFLAGED )||( gMercProfiles[ iCurrentIMPSlot ].bSkillTrait2 == CAMOUFLAGED ) )
 		{
 			// WANNE: No entry in the Impass.edt for camouflage, so add any static text here
-      		// read one record from email file
-			//LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_CAMOUFLAGED ), MAIL_STRING_SIZE );
+      	// read one record from email file
+		  //LoadEncryptedDataFromFile( "BINARYDATA\\Impass.edt", pString, MAIL_STRING_SIZE * ( IMP_SKILLS_SPECIAL_CAMOUFLAGED ), MAIL_STRING_SIZE );
 		 
 			#ifdef GERMAN
-			wcscpy(pString, L"Getarnt: <Noch keine Beschreibung vorhanden>");
+				wcscpy(pString, L"Getarnt: <Noch keine Beschreibung vorhanden>");
 			#else
 			wcscpy(pString, L"Camouflage: <No description yet>");
 			#endif
 
-			// add to list
-			AddEmailRecordToList( pString );
+		  // add to list
+		  AddEmailRecordToList( pString );
 		}
 
 		// now the physical
diff --git a/Laptop/personnel.cpp b/Laptop/personnel.cpp
index b498915c8..a6898bb4f 100644
--- a/Laptop/personnel.cpp
+++ b/Laptop/personnel.cpp
@@ -3751,80 +3751,80 @@ INT32 GetAvgStatOfCurrentTeamStat( INT32 iStat )
 		// Only count stats of merc (not vehicles)
 		if ( !( pTeamSoldier->uiStatusFlags & SOLDIER_VEHICLE ) )
 		{
-			if(( pTeamSoldier->bActive)&&( pTeamSoldier->bLife > 0 ) && !AM_A_ROBOT( pTeamSoldier ) )
-			{
-				switch( iStat )
-				{
-					case 0:
-				// health
+		 if(( pTeamSoldier->bActive)&&( pTeamSoldier->bLife > 0 ) && !AM_A_ROBOT( pTeamSoldier ) )
+		 {
+			 switch( iStat )
+			 {
+				 case 0:
+			   // health
 
-							//if this is a pow, dont count his stats
-							if( pTeamSoldier->bAssignment == ASSIGNMENT_POW )
-							{
-								bNumberOfPows++;
-								continue;
-							}
+						//if this is a pow, dont count his stats
+						if( pTeamSoldier->bAssignment == ASSIGNMENT_POW )
+						{
+							bNumberOfPows++;
+							continue;
+						}
 
-						iTotalStatValue += pTeamSoldier -> bLifeMax;
-						 
-					break;
-					case 1:
-						// agility
-						iTotalStatValue +=pTeamSoldier -> bAgility;
+					  iTotalStatValue += pTeamSoldier -> bLifeMax;
+					 
+				   break;
+				 case 1:
+					 // agility
+					 iTotalStatValue +=pTeamSoldier -> bAgility;
 
-						break;
-					case 2:
-						// dexterity
-						iTotalStatValue +=  pTeamSoldier -> bDexterity;
-
-						break;
-					case 3:
-					// strength
-					iTotalStatValue +=  pTeamSoldier -> bStrength;
+					 break;
+				 case 2:
+					// dexterity
+					 iTotalStatValue +=  pTeamSoldier -> bDexterity;
 
 					break;
-					case 4:
-						// leadership
-						iTotalStatValue +=  pTeamSoldier -> bLeadership;
+				 case 3:
+				 // strength
+				 iTotalStatValue +=  pTeamSoldier -> bStrength;
 
-					break;
-					case 5:
-						// wisdom
-						
-						iTotalStatValue += pTeamSoldier -> bWisdom;
-					break;
-					case 6:
-						// exper
-	           
-						iTotalStatValue +=  pTeamSoldier -> bExpLevel;
+				 break;
+				 case 4:
+					// leadership
+					 iTotalStatValue +=  pTeamSoldier -> bLeadership;
 
-					break;
-					case 7:
-						//mrkmanship
-						 
-						iTotalStatValue +=  pTeamSoldier -> bMarksmanship;
-	       			 
-					break;
-					case 8:
-						// mech
-						 
-						iTotalStatValue +=  pTeamSoldier -> bMechanical;
-					break;
-					case 9:
-						// exp
-						 
-						iTotalStatValue +=  pTeamSoldier ->bExplosive;
-					break;
-					case 10:
-						// med
-						 
-						iTotalStatValue +=  pTeamSoldier -> bMedical;
-					break;
-				}
+				 break;
+				 case 5:
+					// wisdom
+					
+					 iTotalStatValue += pTeamSoldier -> bWisdom;
+				 break;
+				 case 6:
+					// exper
+           
+					 iTotalStatValue +=  pTeamSoldier -> bExpLevel;
 
-				ubNumberOfMercsInCalculation++;
-			}
-		}
+				 break;
+				 case 7:
+					 //mrkmanship
+					 
+					 iTotalStatValue +=  pTeamSoldier -> bMarksmanship;
+       			 
+				 break;
+				 case 8:
+					// mech
+					 
+					 iTotalStatValue +=  pTeamSoldier -> bMechanical;
+				 break;
+				 case 9:
+					// exp
+					 
+					 iTotalStatValue +=  pTeamSoldier ->bExplosive;
+				 break;
+				 case 10:
+					 // med
+					 
+					 iTotalStatValue +=  pTeamSoldier -> bMedical;
+				 break;
+			 }
+
+			 ubNumberOfMercsInCalculation++;
+		 }
+	}	
 	}	
 
 
diff --git a/Tactical/XML_AmmoStrings.cpp b/Tactical/XML_AmmoStrings.cpp
index 291db791f..9f40e9136 100644
--- a/Tactical/XML_AmmoStrings.cpp
+++ b/Tactical/XML_AmmoStrings.cpp
@@ -130,13 +130,7 @@ ammoEndElementHandle(void *userData, const char *name)
 			{
 				for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++)
 				{
-					// WANNE: TODO with ReplaceGermanSpecificCharacters() Method
-					#ifdef GERMAN
 					temp = pData->szCharData[i];
-					#else
-					temp = pData->szCharData[i];
-					#endif
-
 					AmmoCaliber[pData->curIndex][i] = temp;
 				}
 			}
@@ -149,13 +143,7 @@ ammoEndElementHandle(void *userData, const char *name)
 			{
 				for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++)
 				{
-					// WANNE: TODO with ReplaceGermanSpecificCharacters() Method
-					#ifdef GERMAN
 					temp = pData->szCharData[i];
-					#else
-					temp = pData->szCharData[i];
-					#endif
-
 					BobbyRayAmmoCaliber[pData->curIndex][i] = temp;
 				}
 			}
diff --git a/Utils/Text Utils.cpp b/Utils/Text Utils.cpp
index 394d93a60..0b037ef69 100644
--- a/Utils/Text Utils.cpp	
+++ b/Utils/Text Utils.cpp	
@@ -8,32 +8,62 @@
 
 BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
 {
+	int j = 0;
+
 	if (pNameString != NULL)
 	{
+		j = -1;
 		for (int i=0;i<80;i++)
 		{
-			if ( i<(int)strlen(Item[ubIndex].szLongItemName ))
+			j++;
+			if ( j<(int)strlen(Item[ubIndex].szLongItemName ))
 			{
-				pNameString[i] =  Item[ubIndex].szLongItemName  [i];
+				pNameString[i] =  Item[ubIndex].szLongItemName  [j];
 
-				// WANNE: German specific characters
 				#ifdef GERMAN
-				switch( pNameString[ i ] )
+				// We have a german special character
+				if (Item[ubIndex].szLongItemName [j] == -61)
 				{
-					// ü
-					case 65532:	pNameString[i] = 252; break;
-					// Ü
-					case 65500:	pNameString[i] = 220; break;
-					// ä
-					case 65508:	pNameString[i] = 228; break;
-					// Ä
-					case 65476:	pNameString[i] = 196; break;
-					// ö
-					case 65526:	pNameString[i] = 246; break;
-					// Ö
-					case 65494:	pNameString[i] = 214; break;
-					// ß
-					case 65503:	pNameString[i] = 223; break;
+					// This character determines the special character
+					switch (Item[ubIndex].szLongItemName [j + 1])
+					{
+						// ü
+						case -68:	
+							pNameString[i] = 252;
+							// Skip next character, because "umlaute" have 2 chars
+							j++;
+							break;
+						// Ü
+						case -100:	
+							pNameString[i] = 220;
+							j++;
+							break;
+						// ä
+						case -92:	
+							pNameString[i] = 228; 
+							j++;
+							break;
+						// Ä
+						case -124:	
+							pNameString[i] = 196; 
+							j++;
+							break;
+						// ö
+						case -74:	
+							pNameString[i] = 246; 
+							j++;
+							break;
+						// Ö
+						case -106:	
+							pNameString[i] = 214; 
+							j++;
+							break;
+						// ß
+						case -97:	
+							pNameString[i] = 223; 
+							j++;
+							break;
+					}
 				}
 				#endif
 
@@ -72,36 +102,63 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
 
 	if(pInfoString != NULL)
 	{
-		// WANNE: CHANGE THIS
+		j = -1;
 		for (int i=0;i<400;i++)
 		{
-			if ( i<(int)strlen(Item[ubIndex].szItemDesc ))
+			j++;
+			if ( j<(int)strlen(Item[ubIndex].szItemDesc ))
 			{
-				pInfoString[i] =  Item[ubIndex].szItemDesc  [i];
+				pInfoString[i] =  Item[ubIndex].szItemDesc  [j];
 
-				// WANNE: German specific characters
 				#ifdef GERMAN
-				switch( pInfoString[ i ] )
+				// We have a german special character
+				if (Item[ubIndex].szItemDesc [j] == -61)
 				{
-					// ü
-					case 65532:	pInfoString[i] = 252; break;
-					// Ü
-					case 65500:	pInfoString[i] = 220; break;
-					// ä
-					case 65508:	pInfoString[i] = 228; break;
-					// Ä
-					case 65476:	pInfoString[i] = 196; break;
-					// ö
-					case 65526:	pInfoString[i] = 246; break;
-					// Ö
-					case 65494:	pInfoString[i] = 214; break;
-					// ß
-					case 65503:	pInfoString[i] = 223; break;
+					// This character determines the special character
+					switch (Item[ubIndex].szItemDesc [j + 1])
+					{
+						// ü
+						case -68:	
+							pInfoString[i] = 252;
+							// Skip next character, because "umlaute" have 2 chars
+							j++;
+							break;
+						// Ü
+						case -100:	
+							pInfoString[i] = 220;
+							j++;
+							break;
+						// ä
+						case -92:	
+							pInfoString[i] = 228; 
+							j++;
+							break;
+						// Ä
+						case -124:	
+							pInfoString[i] = 196; 
+							j++;
+							break;
+						// ö
+						case -74:	
+							pInfoString[i] = 246; 
+							j++;
+							break;
+						// Ö
+						case -106:	
+							pInfoString[i] = 214; 
+							j++;
+							break;
+						// ß
+						case -97:	
+							pInfoString[i] = 223; 
+							j++;
+							break;
+					}
 				}
 				#endif
 
-				#ifdef POLISH
-				switch( pNameString[ i ] )
+		#ifdef POLISH
+			switch( pNameString[ i ] )
 				{
 					case 260:		pInfoString[ i ] = 165;		break;
 					case 262:		pInfoString[ i ] = 198;		break;
@@ -124,8 +181,8 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
 					case 380:		pInfoString[ i ] = 191;		break;
 					case 378:		pInfoString[ i ] = 376;		break;
 				}
-				#endif
-			}
+			#endif
+		}
 			else
 			{
 				pInfoString[i] ='\0';
@@ -140,30 +197,59 @@ BOOLEAN LoadBRName(UINT16 ubIndex, STR16 pNameString )
 {
 	if (pNameString != NULL)
 	{
+		int j = -1;
+
 		for (int i=0;i<80;i++)
 		{
-			if ( i<(int)strlen(Item[ubIndex].szBRName))
+			j++;
+			if ( j<(int)strlen(Item[ubIndex].szBRName))
 			{
-				pNameString[i] =  Item[ubIndex].szBRName [i];
+				pNameString[i] =  Item[ubIndex].szBRName [j];
 
-				// WANNE: German specific characters
 				#ifdef GERMAN
-				switch( pNameString[ i ] )
+				// We have a german special character
+				if (Item[ubIndex].szBRName [j] == -61)
 				{
-					// ü
-					case 65532:	pNameString[i] = 252; break;
-					// Ü
-					case 65500:	pNameString[i] = 220; break;
-					// ä
-					case 65508:	pNameString[i] = 228; break;
-					// Ä
-					case 65476:	pNameString[i] = 196; break;
-					// ö
-					case 65526:	pNameString[i] = 246; break;
-					// Ö
-					case 65494:	pNameString[i] = 214; break;
-					// ß
-					case 65503:	pNameString[i] = 223; break;
+					// This character determines the special character
+					switch (Item[ubIndex].szBRName [j + 1])
+					{
+						// ü
+						case -68:	
+							pNameString[i] = 252;
+							// Skip next character, because "umlaute" have 2 chars
+							j++;
+							break;
+						// Ü
+						case -100:	
+							pNameString[i] = 220;
+							j++;
+							break;
+						// ä
+						case -92:	
+							pNameString[i] = 228; 
+							j++;
+							break;
+						// Ä
+						case -124:	
+							pNameString[i] = 196; 
+							j++;
+							break;
+						// ö
+						case -74:	
+							pNameString[i] = 246; 
+							j++;
+							break;
+						// Ö
+						case -106:	
+							pNameString[i] = 214; 
+							j++;
+							break;
+						// ß
+						case -97:	
+							pNameString[i] = 223; 
+							j++;
+							break;
+					}
 				}
 				#endif
 
@@ -193,10 +279,10 @@ BOOLEAN LoadBRName(UINT16 ubIndex, STR16 pNameString )
 				}
 				#endif
 			}
-			else
+		else
 			{
-				pNameString[i] ='\0';
-			}
+			pNameString[i] ='\0';
+	}
 		}
 	}
 	return TRUE;
@@ -206,30 +292,60 @@ BOOLEAN LoadBRDesc(UINT16 ubIndex, STR16 pDescString )
 {
 	if (pDescString != NULL)
 	{
+		int j = -1;
+
 		for (int i=0;i<400;i++)
 		{
-			if ( i<(int)strlen(Item[ubIndex].szBRDesc))
+			j++;
+			if ( j<(int)strlen(Item[ubIndex].szBRDesc))
 			{
-				pDescString[i] =  Item[ubIndex].szBRDesc [i];
+				pDescString[i] =  Item[ubIndex].szBRDesc [j];
 
 				// WANNE: German specific characters
 				#ifdef GERMAN
-				switch( pDescString[ i ] )
+				// We have a german special character
+				if (Item[ubIndex].szBRDesc [j] == -61)
 				{
-					// ü
-					case 65532:	pDescString[i] = 252; break;
-					// Ü
-					case 65500:	pDescString[i] = 220; break;
-					// ä
-					case 65508:	pDescString[i] = 228; break;
-					// Ä
-					case 65476:	pDescString[i] = 196; break;
-					// ö
-					case 65526:	pDescString[i] = 246; break;
-					// Ö
-					case 65494:	pDescString[i] = 214; break;
-					// ß
-					case 65503:	pDescString[i] = 223; break;
+					// This character determines the special character
+					switch (Item[ubIndex].szBRDesc [j + 1])
+					{
+						// ü
+						case -68:	
+							pDescString[i] = 252;
+							// Skip next character, because "umlaute" have 2 chars
+							j++;
+							break;
+						// Ü
+						case -100:	
+							pDescString[i] = 220;
+							j++;
+							break;
+						// ä
+						case -92:	
+							pDescString[i] = 228; 
+							j++;
+							break;
+						// Ä
+						case -124:	
+							pDescString[i] = 196; 
+							j++;
+							break;
+						// ö
+						case -74:	
+							pDescString[i] = 246; 
+							j++;
+							break;
+						// Ö
+						case -106:	
+							pDescString[i] = 214; 
+							j++;
+							break;
+						// ß
+						case -97:	
+							pDescString[i] = 223; 
+							j++;
+							break;
+					}
 				}
 				#endif
 
@@ -274,11 +390,11 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
 	if(pNameString != NULL)
 	{
 		// WANNE:
-		for (int i=0;i<80;i++)
-		{
-			if ( i<(int)strlen(Item[ubIndex].szItemName))
+	for (int i=0;i<80;i++)
+	{
+		if ( i<(int)strlen(Item[ubIndex].szItemName))
 			{
-				pNameString[i] =  Item[ubIndex].szItemName [i];
+			pNameString[i] =  Item[ubIndex].szItemName [i];
 
 				// WANNE: German specific characters
 				#ifdef GERMAN
@@ -301,32 +417,32 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
 				}
 				#endif
 
-				#ifdef POLISH
-				switch( pNameString[ i ] )
-				{
-					case 260:		pNameString[ i ] = 165;		break;
-					case 262:		pNameString[ i ] = 198;		break;
-					case 280:		pNameString[ i ] = 202;		break;
-					case 321:		pNameString[ i ] = 163;		break;
-					case 323:		pNameString[ i ] = 209;		break;
-					case 211:		pNameString[ i ] = 211;		break;
+		#ifdef POLISH
+			switch( pNameString[ i ] )
+			{
+				case 260:		pNameString[ i ] = 165;		break;
+				case 262:		pNameString[ i ] = 198;		break;
+				case 280:		pNameString[ i ] = 202;		break;
+				case 321:		pNameString[ i ] = 163;		break;
+				case 323:		pNameString[ i ] = 209;		break;
+				case 211:		pNameString[ i ] = 211;		break;
 
-					case 346:		pNameString[ i ] = 338;		break;
-					case 379:		pNameString[ i ] = 175;		break;
-					case 377:		pNameString[ i ] = 143;		break;
-					case 261:		pNameString[ i ] = 185;		break;
-					case 263:		pNameString[ i ] = 230;		break;
-					case 281:		pNameString[ i ] = 234;		break;
+				case 346:		pNameString[ i ] = 338;		break;
+				case 379:		pNameString[ i ] = 175;		break;
+				case 377:		pNameString[ i ] = 143;		break;
+				case 261:		pNameString[ i ] = 185;		break;
+				case 263:		pNameString[ i ] = 230;		break;
+				case 281:		pNameString[ i ] = 234;		break;
 
-					case 322:		pNameString[ i ] = 179;		break;
-					case 324:		pNameString[ i ] = 241;		break;
-					case 243:		pNameString[ i ] = 243;		break;
-					case 347:		pNameString[ i ] = 339;		break;
-					case 380:		pNameString[ i ] = 191;		break;
-					case 378:		pNameString[ i ] = 376;		break;
-				}
-				#endif
+				case 322:		pNameString[ i ] = 179;		break;
+				case 324:		pNameString[ i ] = 241;		break;
+				case 243:		pNameString[ i ] = 243;		break;
+				case 347:		pNameString[ i ] = 339;		break;
+				case 380:		pNameString[ i ] = 191;		break;
+				case 378:		pNameString[ i ] = 376;		break;
 			}
+		#endif
+	}
 			else
 			{
 				pNameString[i] ='\0';
diff --git a/Utils/Utilities.cpp b/Utils/Utilities.cpp
index df0a9a3c1..4c74cb0a6 100644
--- a/Utils/Utilities.cpp
+++ b/Utils/Utilities.cpp
@@ -29,72 +29,72 @@ BOOLEAN PerformTimeLimitedCheck();
  * Modified this routine to eliminate recursion and to avoid infinite
  * expansion of string when newpiece contains oldpiece.  --Byron
 */ 
-char *Replace(char *string, char *oldpiece, char *newpiece) { 
-
-   int str_index, newstr_index, oldpiece_index, end, 
-
-      new_len, old_len, cpy_len; 
-   char *c; 
-   static char newstring[MAXLINE]; 
-
-   if ((c = (char *) strstr(string, oldpiece)) == NULL) 
-
-      return string; 
-
-   new_len        = strlen(newpiece);
-   old_len        = strlen(oldpiece);
-   end            = strlen(string)   - old_len;
-   oldpiece_index = c - string;
-
-
-   newstr_index = 0; 
-   str_index = 0; 
-   while(str_index <= end && c != NULL) 
-   { 
-
-      /* Copy characters from the left of matched pattern occurence */
-      cpy_len = oldpiece_index-str_index;
-      strncpy(newstring+newstr_index, string+str_index, cpy_len);
-      newstr_index += cpy_len;
-      str_index    += cpy_len;
-
-      /* Copy replacement characters instead of matched pattern */
-      strcpy(newstring+newstr_index, newpiece);
-      newstr_index += new_len;
-      str_index    += old_len;
-
-      /* Check for another pattern match */
-      if((c = (char *) strstr(string+str_index, oldpiece)) != NULL)
-         oldpiece_index = c - string;
-
-
-   } 
-   /* Copy remaining characters from the right of last matched pattern */    
-   strcpy(newstring+newstr_index, string+str_index); 
-   
-   return newstring; 
-} 
+//char *Replace(char *string, char *oldpiece, char *newpiece) 
+//{ 
+//   int str_index, newstr_index, oldpiece_index, end, 
+//
+//      new_len, old_len, cpy_len; 
+//   char *c; 
+//   static char newstring[MAXLINE]; 
+//
+//   if ((c = (char *) strstr(string, oldpiece)) == NULL) 
+//
+//      return string; 
+//
+//   new_len        = strlen(newpiece);
+//   old_len        = strlen(oldpiece);
+//   end            = strlen(string)   - old_len;
+//   oldpiece_index = c - string;
+//
+//
+//   newstr_index = 0; 
+//   str_index = 0; 
+//   while(str_index <= end && c != NULL) 
+//   { 
+//
+//      //Copy characters from the left of matched pattern occurence
+//      cpy_len = oldpiece_index-str_index;
+//      strncpy(newstring+newstr_index, string+str_index, cpy_len);
+//      newstr_index += cpy_len;
+//      str_index    += cpy_len;
+//
+//      //Copy replacement characters instead of matched pattern 
+//      strcpy(newstring+newstr_index, newpiece);
+//      newstr_index += new_len;
+//      str_index    += old_len;
+//
+//      //Check for another pattern match
+//      if((c = (char *) strstr(string+str_index, oldpiece)) != NULL)
+//         oldpiece_index = c - string;
+//
+//
+//   } 
+//   // Copy remaining characters from the right of last matched pattern     
+//   strcpy(newstring+newstr_index, string+str_index); 
+//
+//   return newstring; 
+//} 
 
 // WANNE: Replaces german  specific characters
-char *ReplaceGermanSpecialCharacters(char *text)
-{
-    // ä
-    text = Replace(text, "ä", "ä");
-    // Ä
-    text = Replace(text, "Ä", "Ä");
-    // ö
-    text = Replace(text, "ö", "ö"); 
-    // Ö
-    text = Replace(text, "Ö", "Ö"); 
-    // ü
-    text = Replace(text, "ü", "ü");
-    // Ü
-    text = Replace(text, "Ãœ", "Ü");
-    // ß
-    text = Replace(text, "ß", "ß"); 
-
-    return text;
-}
+//char *ReplaceGermanSpecialCharacters(char *text)
+//{
+//    // ä
+//    text = Replace(text, "ä", "ä");
+//    // Ä
+//    text = Replace(text, "Ä", "Ä");
+//    // ö
+//    text = Replace(text, "ö", "ö"); 
+//    // Ö
+//    text = Replace(text, "Ö", "Ö"); 
+//    // ü
+//    text = Replace(text, "ü", "ü");
+//    // Ü
+//    text = Replace(text, "Ãœ", "Ü");
+//    // ß
+//    text = Replace(text, "ß", "ß"); 
+//
+//    return text;
+//}
 
 
 
diff --git a/Utils/Utilities.h b/Utils/Utilities.h
index 8146eb791..02fbff7c0 100644
--- a/Utils/Utilities.h
+++ b/Utils/Utilities.h
@@ -27,8 +27,10 @@ BOOLEAN HandleJA2CDCheckTwo( );
 
 // WANNE: This method replaces characters in a given text with new characters
 char *Replace(char *string, char *oldpiece, char *newpiece);
+
 // WANNE: This method calls the replace method and replaces all german specific characters
-char *ReplaceGermanSpecialCharacters(char *text);
+// WANNE: Not used!
+//char *ReplaceGermanSpecialCharacters(char *text);
 
 
 // Snap: integer division that rounds the result to the nearest integer
diff --git a/Utils/XML_Items.cpp b/Utils/XML_Items.cpp
index 63e32844a..532505641 100644
--- a/Utils/XML_Items.cpp
+++ b/Utils/XML_Items.cpp
@@ -261,20 +261,11 @@ itemEndElementHandle(void *userData, const char *name)
 					pData->curArray[pData->curItem.uiIndex] = pData->curItem; //write the item into the table
 				else if ( sizeof(pData->curItem.szItemName)>0 && localizedTextOnly )
 				{
-					// WANNE: Replace	 specific characters (ö, ä, ...)
-					#ifdef GERMAN
-					strcpy((char *)pData->curArray[pData->curItem.uiIndex].szItemName, (char *)ReplaceGermanSpecialCharacters((char *)pData->curItem.szItemName));
-					strcpy((char *)pData->curArray[pData->curItem.uiIndex].szLongItemName, (char *)ReplaceGermanSpecialCharacters((char *)pData->curItem.szLongItemName));
-					strcpy((char *)pData->curArray[pData->curItem.uiIndex].szBRName, (char *)ReplaceGermanSpecialCharacters((char *)pData->curItem.szBRName));
-					strcpy((char *)pData->curArray[pData->curItem.uiIndex].szItemDesc, (char *)ReplaceGermanSpecialCharacters((char *)pData->curItem.szItemDesc));
-					strcpy((char *)pData->curArray[pData->curItem.uiIndex].szBRDesc, (char *)ReplaceGermanSpecialCharacters((char *)pData->curItem.szBRDesc));
-					#else
 					strcpy(pData->curArray[pData->curItem.uiIndex].szItemName,pData->curItem.szItemName);
 					strcpy(pData->curArray[pData->curItem.uiIndex].szLongItemName,pData->curItem.szLongItemName);
 					strcpy(pData->curArray[pData->curItem.uiIndex].szBRName,pData->curItem.szBRName);
 					strcpy(pData->curArray[pData->curItem.uiIndex].szItemDesc,pData->curItem.szItemDesc);
 					strcpy(pData->curArray[pData->curItem.uiIndex].szBRDesc,pData->curItem.szBRDesc);
-					#endif
 				}
 			}
 		}
@@ -1011,7 +1002,7 @@ BOOLEAN ReadInItemStats(STR fileName, BOOLEAN localizedVersion )
 	itemParseData pData;
 	
 	localizedTextOnly = localizedVersion;
-
+	
 	DebugMsg(TOPIC_JA2, DBG_LEVEL_3, "Loading Items.xml" );
 
 	// Open items file
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index 8fdd6495e..9544d7633 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -3443,7 +3443,6 @@ STR16		zOptionsToggleText[] =
 	L"Tracer effect for single shot",
 	L"Rain noises",
 	L"Random I.M.P personality",
-	L"Auto save",
 };
 
 //This is the help text associated with the above toggles.
@@ -3520,7 +3519,6 @@ STR16	zOptionsScreenHelpText[] =
 	L"When ON, tracer effect will be shown for single shots.",
 	L"When ON, you will hear rain noises when it is raining.",
 	L"When ON, I.M.P characters will get random personality and attitude.",
-	L"When ON, game will be saved in tactical after each players turn.",
 };
 
 
diff --git a/jascreens.cpp b/jascreens.cpp
index e90acbee1..9400ac81a 100644
--- a/jascreens.cpp
+++ b/jascreens.cpp
@@ -265,11 +265,9 @@ UINT32 ErrorScreenHandle(void)
 {
   InputAtom  InputEvent;
 	static BOOLEAN	fFirstTime = FALSE;
-/*
 #ifdef JA2BETAVERSION
 	UINT16 str[256];
 #endif
-*/
 
 	// For quick setting of new video stuff / to be changed
 	StartFrameBufferRender( );