diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index c73ee04ec..0ca8eb2b8 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3785,7 +3785,8 @@ boolean SV_SpawnServer(void)
 			CL_ConnectToServer(false);
 		else doomcom->numslots = 1;
 
-		K_AddBots(7); // test
+		// TEST
+		K_AddBots(7);
 	}
 
 	return SV_AddWaitingPlayers();
diff --git a/src/k_bot.c b/src/k_bot.c
index 583c6c9a2..445b4d250 100644
--- a/src/k_bot.c
+++ b/src/k_bot.c
@@ -59,9 +59,9 @@ void K_AddBots(SINT8 numbots)
 
 		// test skins
 		if (numbots == 6)
-			WRITEUINT8(buf_p, 0);
-		else if (numbots == 5)
 			WRITEUINT8(buf_p, 1);
+		else if (numbots == 5)
+			WRITEUINT8(buf_p, 0);
 		else if (numbots == 4)
 			WRITEUINT8(buf_p, 2);
 		else if (numbots == 3)
@@ -128,12 +128,7 @@ fixed_t K_BotRubberband(player_t *player)
 	{
 		UINT32 wanteddist = besthumanplayer->distancetofinish; // TODO: Add difficulty here
 
-		if (wanteddist > player->distancetofinish)
-		{
-			// When ahead, they will rubberband much less than when behind
-			rubberband = FRACUNIT + (player->distancetofinish - wanteddist);
-		}
-		else
+		if (wanteddist < player->distancetofinish)
 		{
 			// Catch up to 1st!
 			rubberband = FRACUNIT + (8 * (player->distancetofinish - wanteddist));
@@ -144,10 +139,6 @@ fixed_t K_BotRubberband(player_t *player)
 	{
 		rubberband = 2*FRACUNIT;
 	}
-	else if (rubberband < 2*FRACUNIT/3)
-	{
-		rubberband = 2*FRACUNIT/3;
-	}
 
 	return rubberband;
 }
@@ -373,8 +364,8 @@ static INT16 K_BotSteerFromWalls(player_t *player, botprediction_t *predict)
 	botmo = player->mo;
 	distancetocheck = player->mo->radius * 8;
 
-	tmx = player->mo->x + P_ReturnThrustX(NULL, player->mo->angle, player->speed);
-	tmy = player->mo->y + P_ReturnThrustY(NULL, player->mo->angle, player->speed);
+	tmx = player->mo->x;
+	tmy = player->mo->y;
 
 	predictx = predict->x;
 	predicty = predict->y;