diff --git a/src/k_kart.c b/src/k_kart.c
index 6debceecf..694425773 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3386,7 +3386,7 @@ fixed_t K_GetNewSpeed(player_t *player)
 
 	if (player->curshield == KSHIELD_TOP)
 	{
-		p_speed = 11 * p_speed / 10;
+		p_speed = 15 * p_speed / 10;
 	}
 
 	if (K_PlayerUsesBotMovement(player) == true && player->botvars.rubberband > 0)
@@ -9873,7 +9873,9 @@ void K_AdjustPlayerFriction(player_t *player)
 		player->mo->friction += ((FRACUNIT - prevfriction) / greasetics) * player->tiregrease;
 	}
 
-	if (player->curshield == KSHIELD_TOP)
+	// Less friction on Top unless grinding
+	if (player->curshield == KSHIELD_TOP &&
+			K_GetForwardMove(player) > 0)
 	{
 		player->mo->friction += 1024;
 	}
diff --git a/src/p_mobj.c b/src/p_mobj.c
index b5bb16c45..778e65263 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1134,7 +1134,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
 
 		if (K_IsHoldingDownTop(mo->player))
 		{
-			gravityadd = (5*gravityadd)/2;
+			gravityadd *= 3;
 		}
 		else if (mo->player->fastfall != 0)
 		{
diff --git a/src/p_user.c b/src/p_user.c
index c00991850..cf9beeb8e 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -2017,14 +2017,15 @@ static void P_3dMovement(player_t *player)
 	if (onground && player->curshield == KSHIELD_TOP && (K_GetKartButtons(player) & BT_DRIFT) != BT_DRIFT && (player->oldcmd.buttons & BT_DRIFT))
 	{
 		const fixed_t gmin = FRACUNIT/4;
-		const fixed_t gmax = 5*FRACUNIT/2;
+		const fixed_t gmax = 3*FRACUNIT;
 
 		const fixed_t grindfactor = (gmax - gmin) / GARDENTOP_MAXGRINDTIME;
 		const fixed_t grindscale = gmin + (player->topdriftheld * grindfactor);
 
 		const fixed_t speed = R_PointToDist2(0, 0, player->mo->momx, player->mo->momy);
+		const fixed_t minspeed = 3 * K_GetKartSpeed(player, false, false) / 5; // 60% top speed
 
-		P_InstaThrust(player->mo, player->mo->angle, FixedMul(speed, grindscale));
+		P_InstaThrust(player->mo, player->mo->angle, FixedMul(max(speed, minspeed), grindscale));
 
 		player->topdriftheld = 0;/* reset after release */
 	}