diff --git a/BUGS b/BUGS
index a35c81b..5bf8bec 100644
--- a/BUGS
+++ b/BUGS
@@ -18,3 +18,5 @@
 - sometimes ID doesn't work.  this may be because impulses are unreliable though :/
 - minp/maxp are broken.  possibly compiler !string bug
 - rockets explode on observers
+- scuba gear doesn't set the rad suit anymore
+- I think getting a rad suit clears your scuba gear when it expires
diff --git a/custom.qc b/custom.qc
index 955ce59..496b8ba 100644
--- a/custom.qc
+++ b/custom.qc
@@ -331,7 +331,7 @@ void() DropFromCustomClassGen =
 	//spawn_tdeath (spot.origin, self);
 
 	self.observer_list = spot;
-	self.origin = spot.origin + '0 0 1';
+	setorigin (self, spot.origin + '0 0 1');
 	self.angles = spot.angles;
 	self.fixangle = TRUE;		// turn this way immediately
 
diff --git a/tfort.qc b/tfort.qc
index a4e03b9..c729f28 100644
--- a/tfort.qc
+++ b/tfort.qc
@@ -279,11 +279,14 @@ void() TeamFortress_ChangeClass =
 
 	self.view_ofs = '0 0 22';
 	player_stand1 ();
-	if (deathmatch || coop)
+/*	if (deathmatch || coop)
 	{
 		makevectors(self.angles);
 		spawn_tfog (self.origin + v_forward*20);
-	}
+	}*/
+	makevectors (self.angles);
+	spawn_tfog (self.origin + v_forward * 20);
+	spawn_tdeath (self.origin, self);
 
 	// Display chosen class
 	if ( self.playerclass == PC_RANDOM )
diff --git a/triggers.qc b/triggers.qc
index f700d41..9546e25 100644
--- a/triggers.qc
+++ b/triggers.qc
@@ -371,8 +371,13 @@ void() tdeath_touch =
 // frag anyone who teleports in on top of an invincible player
 	if (other.classname == "player")
 	{
-		if (other.invincible_finished > time)
+		if (other.invincible_finished > time) {
 			self.classname = "teledeath2";
+			self.owner.invincible_finished = 0;
+			if (self.owner.health > 0)
+				TF_T_Damage (self.owner, self, self, self.owner.health + 5000,
+							 TF_TD_IGNOREARMOUR, TF_TD_OTHER);
+		}
 
 		if (self.owner.classname != "player")
 		{