diff --git a/src/doomdef.h b/src/doomdef.h
index 4cfdf29c4..ffec260ef 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -540,7 +540,7 @@ typedef enum
 	DBG_PLAYER			= 0x00000004,
 	DBG_RENDER			= 0x00000008,
 	DBG_MUSIC			= 0x00000010,
-	//DBG_NIGHTS		= 0x00000020, // free
+	DBG_PWRLV			= 0x00000020,
 	DBG_POLYOBJ			= 0x00000040,
 	DBG_GAMELOGIC		= 0x00000080,
 	DBG_NETPLAY			= 0x00000100,
diff --git a/src/k_grandprix.c b/src/k_grandprix.c
index 7ede8533c..5b45c8176 100644
--- a/src/k_grandprix.c
+++ b/src/k_grandprix.c
@@ -845,7 +845,7 @@ void K_PlayerLoseLife(player_t *player)
 		return;
 	}
 
-	if (player->spectator || (player->exiting && !(player->pflags & PF_NOCONTEST)) || player->bot || player->lives <= 0 || (player->pflags & PF_LOSTLIFE))
+	if (player->spectator || player->bot || player->lives <= 0 || (player->pflags & PF_LOSTLIFE))
 	{
 		return;
 	}
diff --git a/src/k_pwrlv.c b/src/k_pwrlv.c
index 4d7bc80e4..12f9e1a2b 100644
--- a/src/k_pwrlv.c
+++ b/src/k_pwrlv.c
@@ -144,7 +144,7 @@ INT16 K_CalculatePowerLevelAvg(void)
 
 	if (!netgame || !cv_kartusepwrlv.value)
 	{
-		CONS_Debug(DBG_GAMELOGIC, "Not in a netgame, or not using power levels -- no average.\n");
+		CONS_Debug(DBG_PWRLV, "Not in a netgame, or not using power levels -- no average.\n");
 		return 0; // No average.
 	}
 
@@ -155,7 +155,7 @@ INT16 K_CalculatePowerLevelAvg(void)
 
 	if (t == PWRLV_DISABLED)
 	{
-		CONS_Debug(DBG_GAMELOGIC, "Could not set a power level type -- no average.\n");
+		CONS_Debug(DBG_PWRLV, "Could not set a power level type -- no average.\n");
 		return 0; // Hmm?!
 	}
 
@@ -171,7 +171,7 @@ INT16 K_CalculatePowerLevelAvg(void)
 
 	if (!div)
 	{
-		CONS_Debug(DBG_GAMELOGIC, "Found no players -- no average.\n");
+		CONS_Debug(DBG_PWRLV, "Found no players -- no average.\n");
 		return 0; // No average.
 	}
 
@@ -207,9 +207,9 @@ void K_UpdatePowerLevels(player_t *player, UINT8 lap, boolean forfeit)
 		return;
 	}
 
-	//CONS_Printf("\n========\n");
-	//CONS_Printf("* Power Level change for player %s (LAP %d) *\n", player_names[playerNum], lap);
-	//CONS_Printf("========\n");
+	CONS_Debug(DBG_PWRLV, "\n========\n");
+	CONS_Debug(DBG_PWRLV, "* Power Level change for player %s (LAP %d) *\n", player_names[playerNum], lap);
+	CONS_Debug(DBG_PWRLV, "========\n");
 
 	yourPower = clientpowerlevels[playerNum][powerType];
 	if (yourPower == 0)
@@ -218,12 +218,12 @@ void K_UpdatePowerLevels(player_t *player, UINT8 lap, boolean forfeit)
 		return;
 	}
 
-	//CONS_Printf("%s's PWR.LV: %d\n", player_names[playerNum], yourPower);
+	CONS_Debug(DBG_PWRLV, "%s's PWR.LV: %d\n", player_names[playerNum], yourPower);
 
 	yourScore = K_PowerLevelPlacementScore(player);
-	//CONS_Printf("%s's gametype score: %d\n", player_names[playerNum], yourScore);
+	CONS_Debug(DBG_PWRLV, "%s's gametype score: %d\n", player_names[playerNum], yourScore);
 
-	//CONS_Printf("========\n");
+	CONS_Debug(DBG_PWRLV, "========\n");
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		UINT16 theirScore = 0;
@@ -244,7 +244,7 @@ void K_UpdatePowerLevels(player_t *player, UINT8 lap, boolean forfeit)
 			continue;
 		}
 
-		//CONS_Printf("%s VS %s:\n", player_names[playerNum], player_names[i]);
+		CONS_Debug(DBG_PWRLV, "%s VS %s:\n", player_names[playerNum], player_names[i]);
 
 		theirPower = clientpowerlevels[i][powerType];
 		if (theirPower == 0)
@@ -253,30 +253,39 @@ void K_UpdatePowerLevels(player_t *player, UINT8 lap, boolean forfeit)
 			continue;
 		}
 
-		//CONS_Printf("%s's PWR.LV: %d\n", player_names[i], theirPower);
+		CONS_Debug(DBG_PWRLV, "%s's PWR.LV: %d\n", player_names[i], theirPower);
 
-		theirScore = K_PowerLevelPlacementScore(&players[i]);
-		//CONS_Printf("%s's gametype score: %d\n", player_names[i], theirScore);
-
-		if (yourScore == theirScore && forfeit == false) // Tie -- neither get any points for this match up.
-		{
-			//CONS_Printf("TIE, no change.\n");
-			continue;
-		}
-
-		won = (yourScore > theirScore);
-
-		if (won == true && forfeit == false) // This player won!
-		{
-			diff = theirPower - yourPower;
-			inc += K_CalculatePowerLevelInc(diff);
-			//CONS_Printf("WON! Diff is %d, increment is %d\n", diff, inc);
-		}
-		else // This player lost...
+		if (forfeit == true)
 		{
 			diff = yourPower - theirPower;
 			inc -= K_CalculatePowerLevelInc(diff);
-			//CONS_Printf("LOST... Diff is %d, increment is %d\n", diff, inc);
+			CONS_Debug(DBG_PWRLV, "FORFEIT! Diff is %d, increment is %d\n", diff, inc);
+		}
+		else
+		{
+			theirScore = K_PowerLevelPlacementScore(&players[i]);
+			CONS_Debug(DBG_PWRLV, "%s's gametype score: %d\n", player_names[i], theirScore);
+
+			if (yourScore == theirScore && forfeit == false) // Tie -- neither get any points for this match up.
+			{
+				CONS_Debug(DBG_PWRLV, "TIE, no change.\n");
+				continue;
+			}
+
+			won = (yourScore > theirScore);
+
+			if (won == true && forfeit == false) // This player won!
+			{
+				diff = theirPower - yourPower;
+				inc += K_CalculatePowerLevelInc(diff);
+				CONS_Debug(DBG_PWRLV, "WON! Diff is %d, increment is %d\n", diff, inc);
+			}
+			else // This player lost...
+			{
+				diff = yourPower - theirPower;
+				inc -= K_CalculatePowerLevelInc(diff);
+				CONS_Debug(DBG_PWRLV, "LOST... Diff is %d, increment is %d\n", diff, inc);
+			}
 		}
 
 		if (exitBonus == false)
@@ -297,35 +306,36 @@ void K_UpdatePowerLevels(player_t *player, UINT8 lap, boolean forfeit)
 				}
 			}
 
-			//CONS_Printf("Reduced (%d / %d = %d) because it's not the end of the race\n", prevInc, numlaps, inc);
+			CONS_Debug(DBG_PWRLV, "Reduced (%d / %d = %d) because it's not the end of the race\n", prevInc, numlaps, inc);
 		}
 
-		//CONS_Printf("========\n");
+		CONS_Debug(DBG_PWRLV, "========\n");
 
 		if (inc == 0)
 		{
-			// CONS_Printf("Total Result: No increment, no change.\n");
+			CONS_Debug(DBG_PWRLV, "Total Result: No increment, no change.\n");
 			continue;
 		}
 
-		//CONS_Printf("Total Result:\n");
-		//CONS_Printf("Increment: %d\n", inc);
+		CONS_Debug(DBG_PWRLV, "Total Result:\n");
+		CONS_Debug(DBG_PWRLV, "Increment: %d\n", inc);
 
-		//CONS_Printf("%s current: %d\n", player_names[playerNum], clientPowerAdd[playerNum]);
+		CONS_Debug(DBG_PWRLV, "%s current: %d\n", player_names[playerNum], clientPowerAdd[playerNum]);
 		clientPowerAdd[playerNum] += inc;
-		//CONS_Printf("%s final: %d\n", player_names[playerNum], clientPowerAdd[playerNum]);
+		CONS_Debug(DBG_PWRLV, "%s final: %d\n", player_names[playerNum], clientPowerAdd[playerNum]);
 
-		//CONS_Printf("%s current: %d\n", player_names[i], clientPowerAdd[i]);
+		CONS_Debug(DBG_PWRLV, "%s current: %d\n", player_names[i], clientPowerAdd[i]);
 		clientPowerAdd[i] -= inc;
-		//CONS_Printf("%s final: %d\n", player_names[i], clientPowerAdd[i]);
+		CONS_Debug(DBG_PWRLV, "%s final: %d\n", player_names[i], clientPowerAdd[i]);
 
-		//CONS_Printf("========\n");
+		CONS_Debug(DBG_PWRLV, "========\n");
 	}
 }
 
-void K_UpdatePowerLevelsOnFailure(player_t *player)
+void K_UpdatePowerLevelsFinalize(player_t *player, boolean onForfeit)
 {
-	// Update upon spectate / quit / NO CONTEST
+	// Finalize power level increments for any laps not yet calculated.
+	// For spectate / quit / NO CONTEST
 	INT16 lapsLeft = 0;
 	UINT8 i;
 
@@ -333,12 +343,13 @@ void K_UpdatePowerLevelsOnFailure(player_t *player)
 
 	if (lapsLeft <= 0)
 	{
+		// We've done every lap already.
 		return;
 	}
 
 	for (i = 0; i < lapsLeft; i++)
 	{
-		K_UpdatePowerLevels(player, player->latestlap + (i + 1), true);
+		K_UpdatePowerLevels(player, player->latestlap + (i + 1), onForfeit);
 	}
 
 	player->latestlap = numlaps+1;
@@ -356,6 +367,7 @@ INT16 K_FinalPowerIncrement(player_t *player, INT16 yourPower, INT16 baseInc)
 		return 0;
 	}
 
+	SINT8 powerType = K_UsingPowerLevels();
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i] || players[i].spectator)
@@ -363,12 +375,19 @@ INT16 K_FinalPowerIncrement(player_t *player, INT16 yourPower, INT16 baseInc)
 			continue;
 		}
 
+		INT16 theirPower = clientpowerlevels[i][powerType];
+		if (theirPower == 0)
+		{
+			// Don't count guests or bots.
+			continue;
+		}
+
 		numPlayers++;
 	}
 
 	if (inc <= 0)
 	{
-		if (player->position == 1)
+		if (player->position == 1 && numPlayers > 1)
 		{
 			// Won the whole match?
 			// Get at least one point.
@@ -414,9 +433,9 @@ void K_CashInPowerLevels(void)
 	SINT8 powerType = K_UsingPowerLevels();
 	UINT8 i;
 
-	//CONS_Printf("\n========\n");
-	//CONS_Printf("Cashing in power level changes...\n");
-	//CONS_Printf("========\n");
+	CONS_Debug(DBG_PWRLV, "\n========\n");
+	CONS_Debug(DBG_PWRLV, "Cashing in power level changes...\n");
+	CONS_Debug(DBG_PWRLV, "========\n");
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
@@ -426,7 +445,7 @@ void K_CashInPowerLevels(void)
 
 			clientpowerlevels[i][powerType] += inc;
 
-			//CONS_Printf("%s: %d -> %d (%d)\n", player_names[i], clientpowerlevels[i][powerType] - inc, clientpowerlevels[i][powerType], inc);
+			CONS_Debug(DBG_PWRLV, "%s: %d -> %d (%d)\n", player_names[i], clientpowerlevels[i][powerType] - inc, clientpowerlevels[i][powerType], inc);
 		}
 
 		clientPowerAdd[i] = 0;
@@ -434,7 +453,7 @@ void K_CashInPowerLevels(void)
 
 	SV_UpdateStats();
 
-	//CONS_Printf("========\n");
+	CONS_Debug(DBG_PWRLV, "========\n");
 }
 
 void K_SetPowerLevelScrambles(SINT8 powertype)
@@ -627,7 +646,7 @@ void K_PlayerForfeit(UINT8 playerNum, boolean pointLoss)
 		return;
 	}
 
-	K_UpdatePowerLevelsOnFailure(&players[playerNum]);
+	K_UpdatePowerLevelsFinalize(&players[playerNum], true);
 	inc = K_FinalPowerIncrement(&players[playerNum], yourPower, clientPowerAdd[playerNum]);
 
 	if (inc == 0)
diff --git a/src/k_pwrlv.h b/src/k_pwrlv.h
index 9469fe3b7..be8d32d76 100644
--- a/src/k_pwrlv.h
+++ b/src/k_pwrlv.h
@@ -48,7 +48,7 @@ INT16 K_CalculatePowerLevelInc(INT16 diff);
 INT16 K_PowerLevelPlacementScore(player_t *player);
 INT16 K_CalculatePowerLevelAvg(void);
 void K_UpdatePowerLevels(player_t *player, UINT8 lap, boolean forfeit);
-void K_UpdatePowerLevelsOnFailure(player_t *player);
+void K_UpdatePowerLevelsFinalize(player_t *player, boolean onForfeit);
 INT16 K_FinalPowerIncrement(player_t *player, INT16 yourPower, INT16 increment);
 void K_CashInPowerLevels(void);
 void K_SetPowerLevelScrambles(SINT8 powertype);
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 12b921d56..f9eb97cd8 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -603,6 +603,8 @@ struct debugFlagNames_s const debug_flag_names[] =
 	{"RNG", DBG_RNG},
 	{"Randomizer", DBG_RNG}, // alt name
 	{"Music", DBG_MUSIC},
+	{"PwrLv", DBG_PWRLV},
+	{"PowerLevel", DBG_PWRLV}, // alt name
 	{NULL, 0}
 };
 
diff --git a/src/p_user.c b/src/p_user.c
index 3a649503e..e5bdfd520 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1271,9 +1271,6 @@ void P_DoPlayerExit(player_t *player, pflags_t flags)
 
 	player->pflags |= flags;
 
-	const boolean losing = K_IsPlayerLosing(player);
-	const boolean specialout = (specialstageinfo.valid == true && losing == true);
-
 	if (P_IsLocalPlayer(player) && (!player->spectator && !demo.playback))
 	{
 		legitimateexit = true;
@@ -1281,6 +1278,32 @@ void P_DoPlayerExit(player_t *player, pflags_t flags)
 		gamedata->deferredconditioncheck = true;
 	}
 
+	player->exiting = 1;
+
+	if (!player->spectator)
+	{
+		ClearFakePlayerSkin(player);
+
+		if ((gametyperules & GTR_CIRCUIT)) // Special Race-like handling
+		{
+			K_UpdateAllPlayerPositions();
+
+			if (P_CheckRacers() && !exitcountdown)
+			{
+				G_BeginLevelExit();
+			}
+		}
+		else if (!exitcountdown) // All other gametypes
+		{
+			G_BeginLevelExit();
+		}
+	}
+
+	const boolean losing = K_IsPlayerLosing(player); // HEY!!!! Set it AFTER K_UpdateAllPlayerPositions!!!!
+	const boolean specialout = (specialstageinfo.valid == true && losing == true);
+
+	K_UpdatePowerLevelsFinalize(player, false);
+
 	if (G_GametypeUsesLives() && losing)
 	{
 		// Remove a life from the losing player
@@ -1293,12 +1316,8 @@ void P_DoPlayerExit(player_t *player, pflags_t flags)
 		musiccountdown = MUSIC_COUNTDOWN_MAX;
 	}
 
-	player->exiting = 1;
-
 	if (!player->spectator)
 	{
-		ClearFakePlayerSkin(player);
-
 		if (!(gametyperules & GTR_SPHERES))
 		{
 			player->hudrings = RINGTOTAL(player);
@@ -1321,20 +1340,6 @@ void P_DoPlayerExit(player_t *player, pflags_t flags)
 			}
 		}
 
-		if ((gametyperules & GTR_CIRCUIT)) // Special Race-like handling
-		{
-			K_UpdateAllPlayerPositions();
-
-			if (P_CheckRacers() && !exitcountdown)
-			{
-				G_BeginLevelExit();
-			}
-		}
-		else if (!exitcountdown) // All other gametypes
-		{
-			G_BeginLevelExit();
-		}
-
 		if (specialstageinfo.valid == true && losing == false && P_MobjWasRemoved(player->mo) == false)
 		{
 			K_MakeObjectReappear(player->mo);
@@ -1392,6 +1397,7 @@ void P_DoAllPlayersExit(pflags_t flags, boolean trygivelife)
 		{
 			continue;
 		}
+
 		if (players[i].exiting)
 		{
 			continue;
@@ -3816,7 +3822,7 @@ void P_DoTimeOver(player_t *player)
 	}
 
 	player->pflags |= PF_NOCONTEST;
-	K_UpdatePowerLevelsOnFailure(player);
+	K_UpdatePowerLevelsFinalize(player, false);
 
 	if (G_GametypeUsesLives())
 	{