diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 818eeb659..e4bf0e5df 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3650,7 +3650,6 @@ static void Got_AddBot(UINT8 **p, INT32 playernum)
 	players[newplayernum].splitscreenindex = 0;
 	players[newplayernum].bot = true;
 	players[newplayernum].botvars.difficulty = difficulty;
-	CONS_Printf("%d == %d\n", difficulty, players[newplayernum].botvars.difficulty);
 
 	players[newplayernum].skincolor = skins[skinnum].prefcolor;
 	sprintf(player_names[newplayernum], "%s", skins[skinnum].realname);
diff --git a/src/k_bot.c b/src/k_bot.c
index 093c43976..3612cf97f 100644
--- a/src/k_bot.c
+++ b/src/k_bot.c
@@ -60,19 +60,40 @@ void K_AddBots(SINT8 numbots)
 
 		// test skins
 		if (numbots == 6)
+		{
+			difficulty = MAXBOTDIFFICULTY;
 			WRITEUINT8(buf_p, 1);
+		}
 		else if (numbots == 5)
+		{
+			difficulty = MAXBOTDIFFICULTY;
 			WRITEUINT8(buf_p, 0);
+		}
 		else if (numbots == 4)
+		{
+			difficulty = MAXBOTDIFFICULTY-1;
 			WRITEUINT8(buf_p, 2);
+		}
 		else if (numbots == 3)
+		{
+			difficulty = MAXBOTDIFFICULTY-2;
 			WRITEUINT8(buf_p, 3);
+		}
 		else if (numbots == 2)
+		{
+			difficulty = MAXBOTDIFFICULTY-4;
 			WRITEUINT8(buf_p, 5);
+		}
 		else if (numbots == 1)
+		{
+			difficulty = MAXBOTDIFFICULTY-4;
 			WRITEUINT8(buf_p, 9);
+		}
 		else
+		{
+			difficulty = MAXBOTDIFFICULTY-2;
 			WRITEUINT8(buf_p, 10);
+		}
 
 		WRITEUINT8(buf_p, difficulty);
 
@@ -114,6 +135,11 @@ fixed_t K_BotRubberband(player_t *player)
 	player_t *firstplace = NULL;
 	UINT8 i;
 
+	if (player->exiting)
+	{
+		return FRACUNIT;
+	}
+
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i] || players[i].spectator || players[i].exiting)
@@ -134,7 +160,7 @@ fixed_t K_BotRubberband(player_t *player)
 
 	if (firstplace != NULL)
 	{
-		const UINT32 spacing = 1024;
+		const UINT32 spacing = 2048;
 		UINT32 easiness = (MAXBOTDIFFICULTY - player->botvars.difficulty);
 		UINT32 wanteddist = firstplace->distancetofinish + (spacing * easiness);
 
@@ -143,11 +169,6 @@ fixed_t K_BotRubberband(player_t *player)
 			// Catch up to 1st!
 			rubberband = FRACUNIT + (player->botvars.difficulty * (player->distancetofinish - wanteddist));
 		}
-
-		if (P_IsDisplayPlayer(player))
-		{ 
-			CONS_Printf("difficulty: %d, easiness: %d, wanted: %d, rubberband: %d\n", player->botvars.difficulty, easiness, wanteddist, rubberband);
-		}
 	}
 
 	if (rubberband > 2*FRACUNIT)