diff --git a/userraw/maps/mp/bots/_bot_utility.gsc b/userraw/maps/mp/bots/_bot_utility.gsc
index 493e674..bf353d8 100644
--- a/userraw/maps/mp/bots/_bot_utility.gsc
+++ b/userraw/maps/mp/bots/_bot_utility.gsc
@@ -722,6 +722,8 @@ load_waypoints()
 		level.waypoints[i].bots = [];
 		level.waypoints[i].bots["allies"] = 1;
 		level.waypoints[i].bots["axis"] = 1;
+
+		level.waypoints[i].childCount = level.waypoints[i].children.size;
 	}
 	
 	level.waypointsKDTree = WaypointsToKDTree();
diff --git a/userraw/maps/mp/bots/_wp_editor.gsc b/userraw/maps/mp/bots/_wp_editor.gsc
index 082c2ab..5b0c3a5 100644
--- a/userraw/maps/mp/bots/_wp_editor.gsc
+++ b/userraw/maps/mp/bots/_wp_editor.gsc
@@ -36,10 +36,11 @@ init()
     setDvar("bots_main_debug_drawThrough", false);
 
 	setDvar("player_sustainAmmo", 1);
+
+	level.waypoints = [];
+	level.waypointCount = 0;
   
   level waittill( "connected", player);
-  
-  DeleteAllWaypoints();
   player thread onPlayerSpawned();
 }
 
@@ -63,7 +64,7 @@ StartDev()
 	self.nearest = -1;
 	
 	self takeAllWeapons();
-	self giveWeapon("usp_tactical_mp");//to knife windows
+	self giveWeapon("m16_gl_mp");//to knife windows
 	self giveWeapon("javelin_mp");//to mark jav spots
 	self SetOffhandPrimaryClass( "other" );
 	self giveWeapon("semtex_mp");