diff --git a/xtrn/tw2/messages.js b/xtrn/tw2/messages.js
index 94d11f04cdd955d49eb811141441dcd8ad92ce21..f348bc35c209cce2703a897cd525c7b3d17e5cd6 100644
--- a/xtrn/tw2/messages.js
+++ b/xtrn/tw2/messages.js
@@ -65,6 +65,7 @@ function ReadPMsg()
 
 		if(msg.To==player.Record && !msg.Read) {
 			count++;
+log("Found message #"+count);
 			if(msg.From==-98)
 				msgstr += "A deleted player destroyed "+msg.Destroyed+" fighters.\r\n";
 			else if(msg.From==-1) {
@@ -81,6 +82,7 @@ function ReadPMsg()
 	}
 	db.write(Settings.DB,'updates',updates);
 	db.unlock(Settings.DB,'updates');
+log('count='+count+', msgstr='+msgstr);
 	if(count==0)
 		console.writeln("Nothing");
 	else
diff --git a/xtrn/tw2/players.js b/xtrn/tw2/players.js
index 9bee83df7b9e88f7b982680ec24e581dc21f0b72..747c31e1f97b7eac47932bd4d343977728b31883 100644
--- a/xtrn/tw2/players.js
+++ b/xtrn/tw2/players.js
@@ -198,7 +198,7 @@ function AttackPlayer()
 	var holds=new Array(Commodities.length+1);
 	for(i=0; i<holds.length; i++)
 		holds[i]=0;
-	for(i=0; i<otherplayer.Holds; i++) {
+	for(i=0; i<salvaged; i++) {
 		var limit=0;
 		var r=random(otherplayer.Holds)+1;
 		for(j=0; j<Commodities.length; j++) {
@@ -206,11 +206,11 @@ function AttackPlayer()
 			if(r<limit) {
 				otherplayer.Commodities[j]--;
 				holds[j]++;
-				r=0;
+				r=-1;
 				break;
 			}
 		}
-		if(r==0)
+		if(r!=-1)
 			holds[Commodities.length]++;
 	}
 	if(holds[Commodities.length]>0) {
@@ -300,7 +300,7 @@ function PlayerInfo(num)
 
 function KilledBy(killed, killer, notify)	/* 15300 */
 {
-	var i;
+	var i,j;
 
 	killed.KilledBy=killer.Record;
 	killed.Put();
@@ -308,6 +308,14 @@ function KilledBy(killed, killer, notify)	/* 15300 */
 	var sectors=db.read(Settings.DB,'sectors');
 	/* Destroy all deployed fighters */
 	for(i=1; i<sectors.length; i++) {
+		if(i==killed.Sector) {
+			for(j=0; j<sectors[i].Ships.length; j++) {
+				if(sectors[i].Ships[j]==killed.Record) {
+					sectors[i].Ships.splice(j,1);
+					j--;
+				}
+			}
+		}
 		if(sectors[i].FighterOwner==killed.Record) {
 			sectors[i].Fighters=0;
 			sectors[i].FighterOwner=0;