diff --git a/src/k_hud.cpp b/src/k_hud.cpp
index e7fca52ec..023441453 100644
--- a/src/k_hud.cpp
+++ b/src/k_hud.cpp
@@ -5489,22 +5489,43 @@ static void K_DrawWaypointDebugger(void)
 	if (R_GetViewNumber() != 0) // only for p1
 		return;
 
+	constexpr int kH = 8;
+	using srb2::Draw;
+	Draw::TextElement label;
+	label.font(Draw::Font::kThin);
+	label.flags(V_AQUAMAP);
+	Draw line = Draw(8, 136).font(Draw::Font::kMenu);
+	auto put = [&](const char* label_str, auto&&... args)
+	{
+		constexpr int kTabWidth = 48;
+		label.string(label_str);
+		int x = label.width() + kTabWidth;
+		x -= x % kTabWidth;
+		line.size(x + 4, 2).y(7).fill(31);
+		line.text(label);
+		line.x(x).text(args...);
+		line = line.y(kH);
+	};
+
 	if (netgame)
 	{
-		V_DrawString(8, 136, 0, va("Online griefing: [%u, %u]", stplyr->griefValue/TICRATE, stplyr->griefStrikes));
+		line = line.y(-kH);
+		put("Online griefing:", "[{}, {}]", stplyr->griefValue/TICRATE, stplyr->griefStrikes);
 	}
 
-	V_DrawString(8, 146, 0, va("Current Waypoint ID: %d", K_GetWaypointID(stplyr->currentwaypoint)));
-	V_DrawString(8, 156, 0, va("Next Waypoint ID: %d%s", K_GetWaypointID(stplyr->nextwaypoint), ((stplyr->pflags & PF_WRONGWAY) ? " (WRONG WAY)" : "")));
-	V_DrawString(8, 166, 0, va("Respawn Waypoint ID: %d", K_GetWaypointID(stplyr->respawn.wp)));
-	V_DrawString(8, 176, 0, va("Finishline Distance: %d", stplyr->distancetofinish));
+	put("Current Waypoint ID:", "{}", K_GetWaypointID(stplyr->currentwaypoint));
+	put("Next Waypoint ID:", "{}{}", K_GetWaypointID(stplyr->nextwaypoint), ((stplyr->pflags & PF_WRONGWAY) ? " (WRONG WAY)" : ""));
+	put("Respawn Waypoint ID:", "{}", K_GetWaypointID(stplyr->respawn.wp));
+	put("Finishline Distance:", "{}", stplyr->distancetofinish);
+	put("Last Safe Lap:", "{}", stplyr->lastsafelap);
 
 	if (numcheatchecks > 0)
 	{
 		if (stplyr->cheatchecknum == numcheatchecks)
-			V_DrawString(8, 186, 0, va("Cheat Check: %d / %d (Can finish)", stplyr->cheatchecknum, numcheatchecks));
+			put("Cheat Check:", "{} / {} (Can finish)", stplyr->cheatchecknum, numcheatchecks);
 		else
-			V_DrawString(8, 186, 0, va("Cheat Check: %d / %d", stplyr->cheatchecknum, numcheatchecks));
+			put("Cheat Check:", "{} / {}", stplyr->cheatchecknum, numcheatchecks);
+		put("Last Safe Cheat Check:", "{}", stplyr->lastsafecheatcheck);
 	}
 }
 
diff --git a/src/k_hud_track.cpp b/src/k_hud_track.cpp
index 7b1920ab9..1ab870ea3 100644
--- a/src/k_hud_track.cpp
+++ b/src/k_hud_track.cpp
@@ -28,7 +28,7 @@
 
 using namespace srb2;
 
-extern "C" consvar_t cv_debughudtracker, cv_battleufotest;
+extern "C" consvar_t cv_debughudtracker, cv_battleufotest, cv_kartdebugwaypoints;
 
 namespace
 {
@@ -109,6 +109,7 @@ struct TargetTracking
 		switch (mobj->type)
 		{
 		case MT_SPRAYCAN:
+		case MT_WAYPOINT:
 			return false;
 
 		default:
@@ -230,6 +231,7 @@ private:
 			};
 
 		case MT_BATTLEUFO_SPAWNER:
+		case MT_WAYPOINT:
 			return {};
 
 		default:
@@ -336,6 +338,9 @@ bool is_object_tracking_target(const mobj_t* mobj)
 	case MT_BATTLEUFO_SPAWNER:
 		return cv_battleufotest.value;
 
+	case MT_WAYPOINT:
+		return cv_kartdebugwaypoints.value;
+
 	default:
 		return false;
 	}
@@ -564,14 +569,31 @@ void K_DrawTargetTracking(const TargetTracking& target)
 			);
 		};
 
-		if (target.mobj->type == MT_BATTLEUFO_SPAWNER) // debug
+		using srb2::Draw;
+		auto debug = [&]() -> Draw
 		{
-			using srb2::Draw;
-			Draw(FixedToFloat(result.x), FixedToFloat(result.y))
+			return Draw(FixedToFloat(result.x), FixedToFloat(result.y))
 				.flags(V_SPLITSCREEN)
 				.font(Draw::Font::kThin)
-				.align(Draw::Align::kCenter)
-				.text("BUFO ID: {}", Obj_BattleUFOSpawnerID(target.mobj));
+				.align(Draw::Align::kCenter);
+		};
+
+		switch (target.mobj->type) // debug
+		{
+		case MT_BATTLEUFO_SPAWNER:
+			debug().text("BUFO ID: {}", Obj_BattleUFOSpawnerID(target.mobj));
+			break;
+
+		case MT_WAYPOINT:
+			if (target.camDist < 2048 * mapobjectscale)
+			{
+				bool isNext = stplyr->nextwaypoint && stplyr->nextwaypoint->mobj == target.mobj;
+				debug().flags(isNext ? V_GREENMAP : 0).text("{}", target.mobj->movecount); // waypoint ID
+			}
+			break;
+
+		default:
+			break;
 		}
 	}
 }
diff --git a/src/p_mobj.c b/src/p_mobj.c
index cbe31d5f7..058fa4df5 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -5356,6 +5356,7 @@ static boolean P_IsTrackerType(INT32 type)
 		case MT_BATTLEUFO:
 		case MT_SUPER_FLICKY:
 		case MT_SPRAYCAN:
+		case MT_WAYPOINT: // debug
 			return true;
 
 		default: