diff --git a/Assets/Sprites/Players/Luigi/CharacterInfo.json b/Assets/Sprites/Players/Luigi/CharacterInfo.json
index fb01fce..180498f 100644
--- a/Assets/Sprites/Players/Luigi/CharacterInfo.json
+++ b/Assets/Sprites/Players/Luigi/CharacterInfo.json
@@ -1,23 +1,38 @@
 {
 	"name": "CHAR_LUIGI",
 	"physics": {
-		"AIR_ACCEL": 3.0,
-		"AIR_SKID": 1.5,
-		"DECEL": 3.0,
-		"FALL_GRAVITY": 25.0,
-		"GROUND_RUN_ACCEL": 1.25,
-		"GROUND_WALK_ACCEL": 4.0,
 		"JUMP_GRAVITY": 11.0,
 		"JUMP_HEIGHT": 300.0,
 		"JUMP_INCR": 8.0,
-		"SWIM_GRAVITY": 2.5,
-		"SWIM_SPEED": 95.0,
-		"MAX_FALL_SPEED": 280,
-		"MAX_SWIM_FALL_SPEED": 200,
-		"RUN_SKID": 8.0,
-		"RUN_SPEED": 160,
+		"JUMP_CANCEL_DIVIDE": 1.5,
+		"JUMP_HOLD_SPEED_THRESHOLD": 0.0,
+
+		"BOUNCE_HEIGHT": 200.0,
+		"BOUNCE_JUMP_HEIGHT": 300.0,
+
+		"FALL_GRAVITY": 25.0,
+		"MAX_FALL_SPEED": 280.0,
+		"CEILING_BUMP_SPEED": 45.0,
+
+		"WALK_SPEED": 96.0,
+		"GROUND_WALK_ACCEL": 4.0,
 		"WALK_SKID": 8.0,
-		"WALK_SPEED": 90.0
+
+		"RUN_SPEED": 160.0,
+		"GROUND_RUN_ACCEL": 1.25,
+		"RUN_SKID": 8.0,
+
+		"DECEL": 3.0,
+		"AIR_ACCEL": 3.0,
+		"AIR_SKID": 1.5,
+
+		"SWIM_SPEED": 95.0,
+		"SWIM_GROUND_SPEED": 45.0,
+		"SWIM_HEIGHT": 100.0,
+		"SWIM_GRAVITY": 2.5,
+		"MAX_SWIM_FALL_SPEED": 200.0,
+
+		"DEATH_JUMP_HEIGHT": 300.0
 	},
 	"small_hitbox_scale": [1.0, 1.0],
 	"big_hitbox_scale": [1.0, 1.0]
diff --git a/Assets/Sprites/Players/Mario/CharacterInfo.json b/Assets/Sprites/Players/Mario/CharacterInfo.json
index 2fe4e10..a689b01 100644
--- a/Assets/Sprites/Players/Mario/CharacterInfo.json
+++ b/Assets/Sprites/Players/Mario/CharacterInfo.json
@@ -1,23 +1,38 @@
 {
 	"name": "CHAR_MARIO",
 	"physics": {
-		"AIR_ACCEL": 3.0,
-		"AIR_SKID": 1.5,
-		"DECEL": 3.0,
-		"FALL_GRAVITY": 25.0,
-		"GROUND_RUN_ACCEL": 1.25,
-		"GROUND_WALK_ACCEL": 4.0,
 		"JUMP_GRAVITY": 11.0,
 		"JUMP_HEIGHT": 300.0,
 		"JUMP_INCR": 8.0,
-		"SWIM_GRAVITY": 2.5,
-		"SWIM_SPEED": 95.0,
-		"MAX_FALL_SPEED": 280,
-		"MAX_SWIM_FALL_SPEED": 200,
-		"RUN_SKID": 8.0,
-		"RUN_SPEED": 160,
+		"JUMP_CANCEL_DIVIDE": 1.5,
+		"JUMP_HOLD_SPEED_THRESHOLD": 0.0,
+
+		"BOUNCE_HEIGHT": 200.0,
+		"BOUNCE_JUMP_HEIGHT": 300.0,
+
+		"FALL_GRAVITY": 25.0,
+		"MAX_FALL_SPEED": 280.0,
+		"CEILING_BUMP_SPEED": 45.0,
+
+		"WALK_SPEED": 96.0,
+		"GROUND_WALK_ACCEL": 4.0,
 		"WALK_SKID": 8.0,
-		"WALK_SPEED": 90.0
+
+		"RUN_SPEED": 160.0,
+		"GROUND_RUN_ACCEL": 1.25,
+		"RUN_SKID": 8.0,
+
+		"DECEL": 3.0,
+		"AIR_ACCEL": 3.0,
+		"AIR_SKID": 1.5,
+
+		"SWIM_SPEED": 95.0,
+		"SWIM_GROUND_SPEED": 45.0,
+		"SWIM_HEIGHT": 100.0,
+		"SWIM_GRAVITY": 2.5,
+		"MAX_SWIM_FALL_SPEED": 200.0,
+
+		"DEATH_JUMP_HEIGHT": 300.0
 	},
 	"small_hitbox_scale": [1.0, 1.0],
 	"big_hitbox_scale": [1.0, 1.0]
diff --git a/Assets/Sprites/Players/Toad/CharacterInfo.json b/Assets/Sprites/Players/Toad/CharacterInfo.json
index ee7047c..9f65aca 100644
--- a/Assets/Sprites/Players/Toad/CharacterInfo.json
+++ b/Assets/Sprites/Players/Toad/CharacterInfo.json
@@ -1,23 +1,38 @@
 {
 	"name": "CHAR_TOAD",
 	"physics": {
-		"AIR_ACCEL": 3.0,
-		"AIR_SKID": 1.5,
-		"DECEL": 3.0,
-		"FALL_GRAVITY": 25.0,
-		"GROUND_RUN_ACCEL": 1.25,
-		"GROUND_WALK_ACCEL": 4.0,
 		"JUMP_GRAVITY": 11.0,
 		"JUMP_HEIGHT": 300.0,
 		"JUMP_INCR": 8.0,
-		"SWIM_GRAVITY": 2.5,
-		"SWIM_SPEED": 95.0,
-		"MAX_FALL_SPEED": 280,
-		"MAX_SWIM_FALL_SPEED": 200,
-		"RUN_SKID": 8.0,
-		"RUN_SPEED": 160,
+		"JUMP_CANCEL_DIVIDE": 1.5,
+		"JUMP_HOLD_SPEED_THRESHOLD": 0.0,
+
+		"BOUNCE_HEIGHT": 200.0,
+		"BOUNCE_JUMP_HEIGHT": 300.0,
+
+		"FALL_GRAVITY": 25.0,
+		"MAX_FALL_SPEED": 280.0,
+		"CEILING_BUMP_SPEED": 45.0,
+
+		"WALK_SPEED": 96.0,
+		"GROUND_WALK_ACCEL": 4.0,
 		"WALK_SKID": 8.0,
-		"WALK_SPEED": 90.0
+
+		"RUN_SPEED": 160.0,
+		"GROUND_RUN_ACCEL": 1.25,
+		"RUN_SKID": 8.0,
+
+		"DECEL": 3.0,
+		"AIR_ACCEL": 3.0,
+		"AIR_SKID": 1.5,
+
+		"SWIM_SPEED": 95.0,
+		"SWIM_GROUND_SPEED": 45.0,
+		"SWIM_HEIGHT": 100.0,
+		"SWIM_GRAVITY": 2.5,
+		"MAX_SWIM_FALL_SPEED": 200.0,
+
+		"DEATH_JUMP_HEIGHT": 300.0
 	},
 	"small_hitbox_scale": [1.0, 1.0],
 	"big_hitbox_scale": [1.0, 1.0]
diff --git a/Assets/Sprites/Players/Toadette/CharacterInfo.json b/Assets/Sprites/Players/Toadette/CharacterInfo.json
index 18920b0..b94b872 100644
--- a/Assets/Sprites/Players/Toadette/CharacterInfo.json
+++ b/Assets/Sprites/Players/Toadette/CharacterInfo.json
@@ -1,23 +1,38 @@
 {
 	"name": "CHAR_TOADETTE",
 	"physics": {
-		"AIR_ACCEL": 3.0,
-		"AIR_SKID": 1.5,
-		"DECEL": 3.0,
-		"FALL_GRAVITY": 25.0,
-		"GROUND_RUN_ACCEL": 1.25,
-		"GROUND_WALK_ACCEL": 4.0,
 		"JUMP_GRAVITY": 11.0,
 		"JUMP_HEIGHT": 300.0,
 		"JUMP_INCR": 8.0,
-		"SWIM_GRAVITY": 2.5,
-		"SWIM_SPEED": 95.0,
-		"MAX_FALL_SPEED": 280,
-		"MAX_SWIM_FALL_SPEED": 200,
-		"RUN_SKID": 8.0,
-		"RUN_SPEED": 160,
+		"JUMP_CANCEL_DIVIDE": 1.5,
+		"JUMP_HOLD_SPEED_THRESHOLD": 0.0,
+
+		"BOUNCE_HEIGHT": 200.0,
+		"BOUNCE_JUMP_HEIGHT": 300.0,
+
+		"FALL_GRAVITY": 25.0,
+		"MAX_FALL_SPEED": 280.0,
+		"CEILING_BUMP_SPEED": 45.0,
+
+		"WALK_SPEED": 96.0,
+		"GROUND_WALK_ACCEL": 4.0,
 		"WALK_SKID": 8.0,
-		"WALK_SPEED": 90.0
+
+		"RUN_SPEED": 160.0,
+		"GROUND_RUN_ACCEL": 1.25,
+		"RUN_SKID": 8.0,
+
+		"DECEL": 3.0,
+		"AIR_ACCEL": 3.0,
+		"AIR_SKID": 1.5,
+
+		"SWIM_SPEED": 95.0,
+		"SWIM_GROUND_SPEED": 45.0,
+		"SWIM_HEIGHT": 100.0,
+		"SWIM_GRAVITY": 2.5,
+		"MAX_SWIM_FALL_SPEED": 200.0,
+
+		"DEATH_JUMP_HEIGHT": 300.0
 	},
 	"small_hitbox_scale": [1.0, 1.0],
 	"big_hitbox_scale": [1.0, 1.0]
diff --git a/Scripts/Classes/Entities/Player.gd b/Scripts/Classes/Entities/Player.gd
index ab62fda..6b4ee28 100644
--- a/Scripts/Classes/Entities/Player.gd
+++ b/Scripts/Classes/Entities/Player.gd
@@ -12,7 +12,7 @@ var BOUNCE_HEIGHT := 200.0             # The strength at which the player bounce
 var BOUNCE_JUMP_HEIGHT := 300.0        # The strength at which the player bounces off enemies while holding jump, measured in px/sec 
 
 var FALL_GRAVITY := 25.0               # The player's gravity while falling, measured in px/frame
-var MAX_FALL_SPEED := 280              # The player's maximum fall speed, measured in px/sec
+var MAX_FALL_SPEED := 280.0            # The player's maximum fall speed, measured in px/sec
 var CEILING_BUMP_SPEED := 45.0         # The speed at which the player falls after hitting a ceiling, measured in px/sec
 
 var WALK_SPEED := 96.0                 # The player's speed while walking, measured in px/sec
@@ -31,9 +31,9 @@ var SWIM_SPEED := 95.0                 # The player's horizontal speed while swi
 var SWIM_GROUND_SPEED := 45.0          # The player's horizontal speed while grounded underwater, measured in px/sec
 var SWIM_HEIGHT := 100.0               # The strength of the player's swim, measured in px/sec
 var SWIM_GRAVITY := 2.5                # The player's gravity while swimming, measured in px/frame
-var MAX_SWIM_FALL_SPEED := 200         # The player's maximum fall speed while swimming, measured in px/sec
+var MAX_SWIM_FALL_SPEED := 200.0       # The player's maximum fall speed while swimming, measured in px/sec
 
-var DEATH_JUMP_HEIGHT := 300           # The strength of the player's "jump" during the death animation, measured in px/sec
+var DEATH_JUMP_HEIGHT := 300.0         # The strength of the player's "jump" during the death animation, measured in px/sec
 #endregion
 
 @onready var camera_center_joint: Node2D = $CameraCenterJoint