diff --git a/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp b/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp
index 298bde484..8d68a2641 100644
--- a/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp
+++ b/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp
@@ -459,7 +459,7 @@ class AdvancedTrading
 		};
 		class RscText_AT_InfoLabel: ZSC_RscText
 		{
-		    idc = -1;
+		    idc = 7488;
 		    text = $STR_EPOCH_TRADE_DETAILS;
 		    x = 0.60 * safezoneW + safezoneX;
 		    y = 0.38 * safezoneH + safezoneY;
diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_allowBuying.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_allowBuying.sqf
index 3b9c0617b..b2d5eba7b 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_allowBuying.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_allowBuying.sqf
@@ -236,12 +236,12 @@ if(_selection == 0) then{ //backpack
 	if( _allowedWeapons >= _toBuyWeaps)then{
 		_check1 = true;
 	} else {
-		systemChat format[localize "STR_EPOCH_TRADE_BAG_WEPS", _allowedMags];
+		systemChat format[localize "STR_EPOCH_TRADE_BAG_WEPS", _allowedWeapons];
 	};
 	if( _allowedMags >= _toBuyMags)then{
 		_check2 = true;
 	} else {
-		systemChat format[localize "STR_EPOCH_TRADE_BAG_MAGS", _allowedWeapons];
+		systemChat format[localize "STR_EPOCH_TRADE_BAG_MAGS", _allowedMags];
 	};
 	if( _allowedBackpacks >= _toBuyBags)then{
 		_check3 = true;
diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf
index 7adc23cc7..a1f37309b 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf
@@ -47,7 +47,7 @@ _formattedText = format [
 "<t color='#33BFFF'>%12: </t><t color='#ffffff'>%5 %7</t><br />" +
 "<t color='#33BFFF'>%13: </t><t color='#ffffff'>%6 %4</t><br />" +
 "<t color='#33BFFF'>%14: </t><t color='#ffffff'>%8</t><br />" +
-"<t color='#33BFFF'>%15:</t><t color='#ffffff'>%9</t><br />"
+"<t color='#33BFFF'>%15: </t><t color='#ffffff'>%9</t><br />"
 , _picture, _display, _class, _buyCurrency , _sellPrice, _buyPrice, _sellCurrency, _transportMaxWeapons,_transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_MAGS", localize "STR_EPOCH_WEPS"
 ];
 
diff --git a/SQF/dayz_code/actions/AdvancedTrading/init.sqf b/SQF/dayz_code/actions/AdvancedTrading/init.sqf
index b058cd964..115ff70b0 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/init.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/init.sqf
@@ -106,5 +106,6 @@ createDialog "AdvancedTrading";
 (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEALLSELLITEMBUTTON) ctrlSetText " << ";
 (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEBUYITEMBUTTON) ctrlSetText " < ";
 (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEALLBUYITEMBUTTON) ctrlSetText " << ";
+(findDisplay Z_AT_DIALOGWINDOW displayCtrl 7488) ctrlSetText "   " + localize "STR_EPOCH_TRADE_DETAILS";
 
 call Z_ChangeBuySell;
diff --git a/SQF/dayz_code/compile/fn_damageActions.sqf b/SQF/dayz_code/compile/fn_damageActions.sqf
index 9800fb7ab..72bcfab0f 100644
--- a/SQF/dayz_code/compile/fn_damageActions.sqf
+++ b/SQF/dayz_code/compile/fn_damageActions.sqf
@@ -211,7 +211,7 @@ if (isPlayer cursorTarget) then {
 			};
 			if (_unit isKindOf "Man") then {
 				// should only fire if cursor target is man and not vehicle
-				_charID = _unit getVariable ["CharacterID", 0];
+				_charID = _unit getVariable ["CharacterID","0"];
 				_friendlies = player getVariable ["friendlies", []];
 				if !(_charID in _friendlies) then {
 					r_action = true;
diff --git a/SQF/dayz_code/compile/fn_gearMenuChecks.sqf b/SQF/dayz_code/compile/fn_gearMenuChecks.sqf
index 2c8e7aa18..e17b2f4f7 100644
--- a/SQF/dayz_code/compile/fn_gearMenuChecks.sqf
+++ b/SQF/dayz_code/compile/fn_gearMenuChecks.sqf
@@ -15,7 +15,7 @@ if ((vehicle player) == player) then {
 	if (DZE_BackpackAntiTheft) then {
 		_friendlies	= player getVariable ["friendlies",[]];
 		_rcharID = _cTarget getVariable ["CharacterID","0"];
-		if (!canbuild && {_cTarget isKindOf "Man"} && {alive _cTarget} && {!((typeOf _cTarget) in serverTraders)} && {!(_rcharID in _friendlies)} && {(player distance _cTarget) < 12}) then {
+		if (!canbuild && {_cTarget isKindOf "Man"} && {alive _cTarget} && {isPlayer _cTarget} && {!(_rcharID in _friendlies)} && {(player distance _cTarget) < 12}) then {
 			localize "STR_EPOCH_PLAYER_316" call dayz_rollingMessages;
 			_display closeDisplay 1;
 		};
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 61c67121b..ea1e6424d 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -15651,12 +15651,12 @@
 			<Russian>Нет ничего на продажу</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_DETAILS">
-			<English>   Details</English>
-			<German>   Einzelheiten</German>
-			<Russian>   Детали</Russian>
-			<Spanish>   Detalles</Spanish>
-			<French>   Détails</French>
-			<Czech>   Podrobnosti</Czech>
+			<English>Details</English>
+			<German>Einzelheiten</German>
+			<Russian>Детали</Russian>
+			<Spanish>Detalles</Spanish>
+			<French>Détails</French>
+			<Czech>Podrobnosti</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_TRADE_STUPID">
 			<English>I'm not stupid.</English>
@@ -15818,16 +15818,16 @@
 			<Czech>Třída</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_MAGS">
-			<English>Mags: </English>
-			<Russian>Магазинов: </Russian>
+			<English>Mags</English>
+			<Russian>Магазинов</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WEPS">
-			<English>Weps: </English>
-			<Russian>Оружия: </Russian>
+			<English>Weps</English>
+			<Russian>Оружия</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_BAGS">
-			<English>Bags: </English>
-			<Russian>Рюкзаков: </Russian>
+			<English>Bags</English>
+			<Russian>Рюкзаков</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_YOUR_GEAR">
 			<English>your gear</English>