diff --git a/src/command.c b/src/command.c
index 305a5eeeb..a159ebcd7 100644
--- a/src/command.c
+++ b/src/command.c
@@ -63,9 +63,9 @@ CV_PossibleValue_t CV_Unsigned[] = {{0, "MIN"}, {999999999, "MAX"}, {0, NULL}};
 CV_PossibleValue_t CV_Natural[] = {{1, "MIN"}, {999999999, "MAX"}, {0, NULL}};
 
 //SRB2kart
-CV_PossibleValue_t karthud_cons_t[] = {
-	{0, "Off"}, {1, "Default"}, {2, "SNES"}, {3, "MK64"},
-	{0, NULL}};
+/*CV_PossibleValue_t karthud_cons_t[] = {
+	{0, "Off"}, {1, "Default"}, {2, "SMK"}, {3, "MK64"},
+	{0, NULL}};*/
 CV_PossibleValue_t kartspeed_cons_t[] = {
 	{0, "Easy"}, {1, "Normal"}, {2, "Hard"},
 	{0, NULL}};
diff --git a/src/command.h b/src/command.h
index 513883d4e..0c2ef9120 100644
--- a/src/command.h
+++ b/src/command.h
@@ -127,7 +127,7 @@ extern CV_PossibleValue_t CV_Unsigned[];
 extern CV_PossibleValue_t CV_Natural[];
 
 // SRB2kart
-extern CV_PossibleValue_t karthud_cons_t[];
+//extern CV_PossibleValue_t karthud_cons_t[];
 extern CV_PossibleValue_t kartspeed_cons_t[];
 
 // register a variable for use at the console
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index c9343b07a..1ea9d6568 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -344,7 +344,7 @@ consvar_t cv_tripleorbinaut = 		{"tripleorbinaut", 		"On", CV_NETVAR|CV_CHEAT, C
 consvar_t cv_quadorbinaut = 		{"quadorbinaut", 		"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_dualjawz = 			{"dualjawz", 			"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_karthud = {"karthud", "Default", CV_SAVE|CV_CALL, karthud_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+//consvar_t cv_karthud = {"karthud", "Default", CV_SAVE|CV_CALL, karthud_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 static CV_PossibleValue_t kartminimap_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
 consvar_t cv_kartminimap = {"kartminimap", "4", CV_SAVE, kartminimap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_kartcheck = {"kartcheck", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 97dac8a96..4d6373c0c 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -117,7 +117,7 @@ extern consvar_t cv_thundershield, cv_hyudoro, cv_pogospring, cv_kitchensink;
 extern consvar_t cv_triplesneaker, cv_triplebanana, cv_decabanana;
 extern consvar_t cv_tripleorbinaut, cv_quadorbinaut, cv_dualjawz;
 
-extern consvar_t cv_karthud;
+//extern consvar_t cv_karthud;
 extern consvar_t cv_kartminimap;
 extern consvar_t cv_kartcheck;
 extern consvar_t cv_kartinvinsfx;
diff --git a/src/p_user.c b/src/p_user.c
index 8c05c629a..7c7253f6f 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8395,7 +8395,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	if (player->kartstuff[k_drift] != 0)
 	{
 		fixed_t panmax = (camdist/5);
-		pan = min(player->kartstuff[k_driftcharge]/2, K_GetKartDriftSparkValue(player)) * panmax / K_GetKartDriftSparkValue(player);
+		pan = min(player->kartstuff[k_driftcharge], K_GetKartDriftSparkValue(player)) * panmax / K_GetKartDriftSparkValue(player);
 		if (pan > panmax)
 			pan = panmax;
 		if (player->kartstuff[k_drift] < 0)
diff --git a/src/w_wad.c b/src/w_wad.c
index 3a8285593..9df2065fa 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -769,6 +769,24 @@ static size_t W_RawReadLumpHeader(UINT16 wad, UINT16 lump, void *dest, size_t si
 	fseek(handle, (long)(l->position + offset), SEEK_SET);
 	bytesread = fread(dest, 1, size, handle);
 
+#if 1 // we're fucking sick of this
+    if (bytesread < 67) // http://garethrees.org/2007/11/14/pngcrush/
+        return bytesread;
+
+#define sigcheck ((UINT8 *)dest)
+    if (sigcheck[0] == 0x89
+    && sigcheck[1] == 0x50
+    && sigcheck[2] == 0x4e
+    && sigcheck[3] == 0x47
+    && sigcheck[4] == 0x0d
+    && sigcheck[5] == 0x0a
+    && sigcheck[6] == 0x1a
+    && sigcheck[7] == 0x0a)
+        I_Error("W_Wad: Tried to cache a .PNG - have you tried converting to Doom or Flat (raw) image formats?");
+#undef sigcheck
+
+#endif
+
 	return bytesread;
 }