diff --git a/BUGS b/BUGS
index 30f36e4..52b7707 100644
--- a/BUGS
+++ b/BUGS
@@ -4,7 +4,6 @@
 - "has_sentry" should be a counter, not a flag (allows a second build if you hack and it gets roasted)
 - there appears to be a window between when a teamkill curse respawn is disabled and when they're killed.  it should be removed.
 - through some combination of respawning, respawn guard, and teleporters (not necesarily needed), it's possible to get stuck on another person
-- hacked forcefields get you teamkills
 - the "speed cheat" checker needs to be ripped out, it's kinda useless
 - sometimes rockets go through armor..
 - crashed alot on prozac :/
diff --git a/army.qc b/army.qc
index 7126c09..56f515b 100644
--- a/army.qc
+++ b/army.qc
@@ -659,11 +659,11 @@ float() TeleSoldier =
 	newmis.custom_speed = 10; // 10
 	newmis.yaw_speed = 55;
 	
-    //#ifdef GRUNTY_EXTRA_WEAPONS
-    //newmis.weapons_carried = WEAP_AXE + WEAP_SHOTGUN + WEAP_NAILGUN + GRUNTY_EXTRA_WEAPONS;
-    //#else
-    newmis.weapons_carried = WEAP_AXE + WEAP_SHOTGUN + WEAP_NAILGUN;
-    //#endif
+    #ifdef GRUNTY_EXTRA_WEAPONS
+    newmis.weapons_carried = WEAP_AXE | WEAP_SHOTGUN | WEAP_NAILGUN | GRUNTY_EXTRA_WEAPONS;
+    #else
+    newmis.weapons_carried = WEAP_AXE | WEAP_SHOTGUN | WEAP_NAILGUN;
+    #endif
     
     newmis.tf_items = 0;
 	newmis.view_ofs = '0 0 22';
diff --git a/defs.qc b/defs.qc
index c1976b1..132b9e0 100644
--- a/defs.qc
+++ b/defs.qc
@@ -446,7 +446,7 @@ void(string e) error				= #10;
 void(string e) objerror				= #11;
 float(vector v) vlen				= #12;
 float(vector v) vectoyaw			= #13;
-entity() spawn					= #14;
+entity() real_spawn					= #14;
 void(entity e) remove				= #15;
 
 // sets trace_* globals
diff --git a/defs.qh b/defs.qh
index fedd1a0..f0a1485 100644
--- a/defs.qh
+++ b/defs.qh
@@ -1,4 +1,5 @@
 #include "options.qh"
+#include "spawn.qh"
 
 // because I want a boolean type :)
 #define boolean integer
diff --git a/progs.src b/progs.src
index 3296848..5d57588 100644
--- a/progs.src
+++ b/progs.src
@@ -80,3 +80,4 @@ spectate.qc
 ofnents.qc
 
 waypoint.qc
+spawn.qc
diff --git a/spawn.qc b/spawn.qc
new file mode 100644
index 0000000..53248ad
--- /dev/null
+++ b/spawn.qc
@@ -0,0 +1,10 @@
+entity () real_spawn;
+
+entity () spawn =
+{
+	local entity ent;
+
+	ent = real_spawn ();
+
+	return ent;
+};
diff --git a/spawn.qh b/spawn.qh
new file mode 100644
index 0000000..7f36238
--- /dev/null
+++ b/spawn.qh
@@ -0,0 +1 @@
+entity () spawn;
diff --git a/warlock.qc b/warlock.qc
index ecf3e4b..9747773 100644
--- a/warlock.qc
+++ b/warlock.qc
@@ -79,7 +79,7 @@ void() Menu_Demon =
                   
 
 
-        CenterPrint6(self, st,st2,st3,"\n\n’.. Îïôèéîç                  \n\nËîéæå Ëéììó: ", str1,"¯MAX_KNIFE_BLOOD");
+        CenterPrint6(self, st,st2,st3,"\n\n’.. Îïôèéîç                  \n\nËîéæå Ëéììó: ", str1,"\^/" + ftos (MAX_KNIFE_BLOOD));
 
     }