diff --git a/ServerExt/Classes/ExtPlayerReplicationInfo.uc b/ServerExt/Classes/ExtPlayerReplicationInfo.uc
index 8a7c6a4..b457582 100644
--- a/ServerExt/Classes/ExtPlayerReplicationInfo.uc
+++ b/ServerExt/Classes/ExtPlayerReplicationInfo.uc
@@ -257,6 +257,7 @@ simulated static final function KFGFxObject_TraderItems CreateNewList()
 simulated static final function SetWeaponInfo( bool bDedicated, int Index, FCustomTraderItem Item, KFGFxObject_TraderItems List )
 {
 	local array<STraderItemWeaponStats> S;
+	local int i;
 
 	if( List.SaleItems.Length<=Index )
 		List.SaleItems.Length = Index+1;
@@ -268,16 +269,24 @@ simulated static final function SetWeaponInfo( bool bDedicated, int Index, FCust
 	else List.SaleItems[Index].SingleClassName = '';
 	List.SaleItems[Index].DualClassName = Item.WeaponClass.Default.DualClass!=None ? Item.WeaponClass.Default.DualClass.Name : '';
 	List.SaleItems[Index].AssociatedPerkClasses = Item.WeaponClass.Static.GetAssociatedPerkClasses();
+	List.SaleItems[Index].MaxSpareAmmo = Item.WeaponClass.Default.SpareAmmoCapacity[0];
 	List.SaleItems[Index].MagazineCapacity = Item.WeaponClass.Default.MagazineCapacity[0];
 	List.SaleItems[Index].InitialSpareMags = Item.WeaponClass.Default.InitialSpareMags[0];
-	List.SaleItems[Index].MaxSpareAmmo = Item.WeaponClass.Default.SpareAmmoCapacity[0];
 	List.SaleItems[Index].MaxSecondaryAmmo = Item.WeaponClass.Default.MagazineCapacity[1] * Item.WeaponClass.Default.SpareAmmoCapacity[1];
 	List.SaleItems[Index].BlocksRequired = Item.WeaponClass.Default.InventorySize;
 	List.SaleItems[Index].ItemID = Index;
-	
+
+	List.SaleItems[Index].InitialSecondaryAmmo = Item.WeaponClass.Default.InitialSpareMags[1];
+	List.SaleItems[Index].WeaponUpgradeDmgMultiplier[0] = 1.0;
+	for(i = 0;i<Min(Item.WeaponClass.Default.WeaponUpgrades.Length, 5);i++)
+	{
+		List.SaleItems[Index].WeaponUpgradeWeight[i+1] = Item.WeaponClass.Static.GetUpgradeStatAdd(EWUS_Weight, i+1);
+		List.SaleItems[Index].WeaponUpgradeDmgMultiplier[i+1] = Item.WeaponClass.Static.GetUpgradeStatScale(EWUS_Damage0, i+1);
+	}
+
 	if( !bDedicated )
 	{
-		List.SaleItems[Index].SecondaryAmmoImagePath = Item.WeaponClass.Default.SecondaryAmmoTexture!=None ? "img://"$PathName(Item.WeaponClass.Default.SecondaryAmmoTexture) : "";
+		List.SaleItems[Index].SecondaryAmmoImagePath = Item.WeaponClass.Default.SecondaryAmmoTexture!=None ? PathName(Item.WeaponClass.Default.SecondaryAmmoTexture) : "UI_SecondaryAmmo_TEX.GasTank";
 		List.SaleItems[Index].TraderFilter = Item.WeaponClass.Static.GetTraderFilter();
 		List.SaleItems[Index].InventoryGroup = Item.WeaponClass.Default.InventoryGroup;
 		List.SaleItems[Index].GroupPriority = Item.WeaponClass.Default.GroupPriority;
@@ -296,8 +305,12 @@ simulated function RecheckGRI()
 	{
 		KFGameReplicationInfo(WorldInfo.GRI).TraderItems = CustomList;
 		foreach LocalPlayerControllers(class'ExtPlayerController',PC)
+		{
 			if( PC.PurchaseHelper!=None )
+			{
 				PC.PurchaseHelper.TraderItems = CustomList;
+			}
+		}
 	}
 }
 
diff --git a/ServerExt/Classes/ExtWeap_Pistol_MedicS.uc b/ServerExt/Classes/ExtWeap_Pistol_MedicS.uc
index 758c8f8..2cafaf6 100644
--- a/ServerExt/Classes/ExtWeap_Pistol_MedicS.uc
+++ b/ServerExt/Classes/ExtWeap_Pistol_MedicS.uc
@@ -12,6 +12,11 @@ defaultproperties
 	InventorySize=0
 	
 	InstantHitDamageTypes(DEFAULT_FIREMODE)=class'ExtDT_Ballistic_Pistol_Medic'
+
+	WeaponUpgrades[1]=(Stats=((Stat=EWUS_Damage0, Scale=1.7f), (Stat=EWUS_HealFullRecharge, Scale=0.9f)))
+	WeaponUpgrades[2]=(Stats=((Stat=EWUS_Damage0, Scale=2.0f), (Stat=EWUS_HealFullRecharge, Scale=0.8f)))
+	WeaponUpgrades[3]=(Stats=((Stat=EWUS_Damage0, Scale=2.55f), (Stat=EWUS_HealFullRecharge, Scale=0.7f)))
+	WeaponUpgrades[4]=(Stats=((Stat=EWUS_Damage0, Scale=3.0f), (Stat=EWUS_HealFullRecharge, Scale=0.6f)))
 }
 
 simulated static function bool AllowedForAllPerks()
diff --git a/ServerExt/Classes/Ext_PerkBase.uc b/ServerExt/Classes/Ext_PerkBase.uc
index d979b8a..117c637 100644
--- a/ServerExt/Classes/Ext_PerkBase.uc
+++ b/ServerExt/Classes/Ext_PerkBase.uc
@@ -34,7 +34,8 @@ var config int FirstLevelExp, // How much EXP needed for first level.
 				StarPointsPerLevel,
 				MinLevelForPrestige, // Minimum level required for perk prestige.
 				PrestigeSPIncrease, // Starpoint increase per prestige levelup.
-				MaxPrestige; // Maximum prestige level.
+				MaxPrestige,
+				MinimalDataLevel; // Maximum prestige level.
 var config float PrestigeXPReduce; // Amount of XP cost is reduced for each prestige.
 var config array<string> TraitClasses;
 
@@ -405,6 +406,12 @@ function LoadData( ExtSaveDataBase Data )
 	local string S;
 
 	CurrentEXP = Data.ReadInt(3);
+	// if(MinimalDataLevel > 0)
+	// {
+	// 	i = GetNeededExp(MinimalDataLevel-1)
+	// 	if(i > CurrentEXP)
+	// 		CurrentEXP = i
+	// }
 	
 	if( Data.GetArVer()>=1 )
 		CurrentPrestige = Data.ReadInt(3);
@@ -465,6 +472,13 @@ function SetInitialLevel()
 	local int i,a,b;
 	local byte MT,j;
 
+	if(MinimalDataLevel > 0)
+	{
+		i = GetNeededExp(MinimalDataLevel-1);
+		if(i > CurrentEXP)
+			CurrentEXP = i;
+	}
+
 	// Set to initial level player is on after configures has loaded.
 	CurrentLevel = CalcLevelForExp(CurrentEXP);
 	CurrentSP = CurrentLevel*(StarPointsPerLevel+CurrentPrestige*PrestigeSPIncrease);
@@ -605,6 +619,7 @@ static function UpdateConfigs( int OldVer )
 		Default.MinLevelForPrestige = 140;
 		Default.PrestigeSPIncrease = 1;
 		Default.MaxPrestige = 20;
+		Default.MinimalDataLevel = 0;
 		Default.PrestigeXPReduce = 0.05;
 		
 		Default.PerkStats.Length = 0;
@@ -707,6 +722,8 @@ static function string GetValue( name PropName, int ElementIndex )
 		return string(Default.MinLevelForPrestige);
 	case 'PrestigeSPIncrease':
 		return string(Default.PrestigeSPIncrease);
+	case 'MinimalDataLevel':
+		return string(Default.MinimalDataLevel);
 	case 'MaxPrestige':
 		return string(Default.MaxPrestige);
 	case 'PrestigeXPReduce':
@@ -721,6 +738,8 @@ static function ApplyValue( name PropName, int ElementIndex, string Value )
 		Default.FirstLevelExp = int(Value);		break;
 	case 'LevelUpExpCost':
 		Default.LevelUpExpCost = int(Value);	break;
+	case 'MinimalDataLevel':
+		Default.MinimalDataLevel = int(Value);	break;
 	case 'LevelUpIncCost':
 		Default.LevelUpIncCost = int(Value);	break;
 	case 'MinimumLevel':
@@ -1418,6 +1437,7 @@ defaultproperties
 	WebConfigs.Add((PropType=0,PropName="PrestigeSPIncrease",UIName="Prestige SP Increase",UIDesc="Star points increase per level for every prestige"))
 	WebConfigs.Add((PropType=0,PropName="MaxPrestige",UIName="Max Prestige",UIDesc="Maximum prestige level"))
 	WebConfigs.Add((PropType=0,PropName="PrestigeXPReduce",UIName="Prestige XP Reduce",UIDesc="Percent amount of XP cost is reduced for each prestige (1.0 = 1/2, or 50 % of XP)"))
+	// WebConfigs.Add((PropType=0,PropName="MinimalDataLevel",UIName="Minimal Real Level",UIDesc="Minimal level for new players or who loads from saves"))
 	
 	DefPerkStats(0)=(MaxValue=50,CostPerValue=1,StatType="Speed",UIName="Movement Speed (+&%)",Progress=0.4)
 	DefPerkStats(1)=(MaxValue=1000,CostPerValue=1,StatType="Damage",UIName="Perk Damage (+&%)",Progress=0.5)
@@ -1459,6 +1479,7 @@ defaultproperties
 	Modifiers.Add(1.f)
 	Modifiers.Add(1.f)
 	Modifiers.Add(1.f)
+	Modifiers.Add(0.f)
 	
 	EnemyDistDraw.Add(500)
 	EnemyDistDraw.Add(700)
diff --git a/ServerExtMut/Classes/ServerExtMut.uc b/ServerExtMut/Classes/ServerExtMut.uc
index fb34fe7..696be4f 100644
--- a/ServerExtMut/Classes/ServerExtMut.uc
+++ b/ServerExtMut/Classes/ServerExtMut.uc
@@ -273,7 +273,6 @@ function EditTraiderItems()
 	// local STraderItem SI;
 	// var config bool bDLCWeaponsForFree;
 	// var config bool bDontUseOriginalWeaponry;
-
 	if(!bDontUseOriginalWeaponry)
 	{
 		Trad = KFGameReplicationInfo(WorldInfo.GRI).TraderItems;