diff --git a/Binary/LagReduction/PD+VB.bin b/Binary/LagReduction/PD+VB.bin
index 7425eb1d..10a2c673 100644
Binary files a/Binary/LagReduction/PD+VB.bin and b/Binary/LagReduction/PD+VB.bin differ
diff --git a/Common/EXILogging/AllocLoggingBuffer.asm b/Common/EXILogging/AllocLoggingBuffer.asm
deleted file mode 100644
index f64d2ff9..00000000
--- a/Common/EXILogging/AllocLoggingBuffer.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-# Address: 0x801a4cb8
-################################################################################
-
-.include "Common/Common.s"
-
-# Alloc buffer
-li  r3, 128
-branchl r12, HSD_MemAlloc
-stw r3, OFST_R13_LOG_BUF(r13)
-
-# Original
-li r0, 0
-stw r0, -0x4F78(r13)
diff --git a/Online/Core/ForceEngineOnRollback.asm b/Online/Core/ForceEngineOnRollback.asm
index f1815fcb..4a782535 100644
--- a/Online/Core/ForceEngineOnRollback.asm
+++ b/Online/Core/ForceEngineOnRollback.asm
@@ -64,7 +64,7 @@ beq RESTORE_AND_EXIT
 li r4, 0
 stb r4, ODB_SHOULD_FORCE_PAD_RENEW(r5)
 branchl r12, RenewInputs_Prefunction
-#exilogf LOG_LEVEL_NOTICE, "Forced a pad renew..."
+#logf LOG_LEVEL_NOTICE, "Forced a pad renew..."
 
 RESTORE_AND_EXIT:
 mr r3, r26 # We will set r26 to 0 later so it's fine to use here
diff --git a/Online/Core/Hacks/ForceNoVideoAssert.asm b/Online/Core/Hacks/ForceNoVideoAssert.asm
index 356f0af8..86090136 100644
--- a/Online/Core/Hacks/ForceNoVideoAssert.asm
+++ b/Online/Core/Hacks/ForceNoVideoAssert.asm
@@ -5,7 +5,7 @@
 .include "Common/Common.s"
 .include "Online/Online.s"
 
-#exilogf LOG_LEVEL_NOTICE, "XFB Status is not 4. Value: %d", "mr r5, 0"
+#logf LOG_LEVEL_NOTICE, "XFB Status is not 4. Value: %d", "mr r5, 0"
 
 # Log XFB status value
 bl STRING
diff --git a/Online/Core/Sound/PreventDuplicateSounds.asm b/Online/Core/Sound/PreventDuplicateSounds.asm
index f74d23de..a01b949d 100644
--- a/Online/Core/Sound/PreventDuplicateSounds.asm
+++ b/Online/Core/Sound/PreventDuplicateSounds.asm
@@ -36,7 +36,7 @@ li REG_IS_SOUND_ACTIVE, 0
 li REG_SOUND_INSTANCE_ID, 0
 rlwinm REG_SOUND_ID, r23, 0, 0xFFFF # Extract half word from sound ID input
 
-#exilogf LOG_LEVEL_WARN, "Play SFX %x, Frame: %d, Rollback: %d", "mr r5, REG_SOUND_ID", "loadGlobalFrame r6", "lbz r7, ODB_STABLE_ROLLBACK_IS_ACTIVE(REG_ODB_ADDRESS)"
+#logf LOG_LEVEL_WARN, "Play SFX %x, Frame: %d, Rollback: %d", "mr r5, REG_SOUND_ID", "loadGlobalFrame r6", "lbz r7, ODB_STABLE_ROLLBACK_IS_ACTIVE(REG_ODB_ADDRESS)"
 
 lbz REG_WRITE_INDEX, SFXDB_WRITE_INDEX(REG_SFXDB_ADDRESS)
 loadGlobalFrame r3
@@ -84,11 +84,11 @@ lbz r3, SFXS_LOG_INDEX(r6)
 cmpw r8, r3
 blt FIND_SOUND_LOOP_START
 
-#exilogf LOG_LEVEL_ERROR, "SFX %x NOT found. End frame: %d", "mr r5, REG_SOUND_ID", "lwz r6, ODB_STABLE_ROLLBACK_END_FRAME(REG_ODB_ADDRESS)"
+#logf LOG_LEVEL_ERROR, "SFX %x NOT found. End frame: %d", "mr r5, REG_SOUND_ID", "lwz r6, ODB_STABLE_ROLLBACK_END_FRAME(REG_ODB_ADDRESS)"
 b STORE_SOUND
 
 SOUND_ALREADY_PLAYED:
-#exilogf LOG_LEVEL_WARN, "SFX %x found. End frame: %d", "mr r5, REG_SOUND_ID", "lwz r6, ODB_STABLE_ROLLBACK_END_FRAME(REG_ODB_ADDRESS)"
+#logf LOG_LEVEL_WARN, "SFX %x found. End frame: %d", "mr r5, REG_SOUND_ID", "lwz r6, ODB_STABLE_ROLLBACK_END_FRAME(REG_ODB_ADDRESS)"
 lwz REG_SOUND_INSTANCE_ID, SFXS_ENTRY_INSTANCE_ID(r5)
 li REG_IS_SOUND_ACTIVE, 1
 
diff --git a/Online/Menus/CSS/Teams/AnimateCursorPort.asm b/Online/Menus/CSS/Teams/AnimateCursorPort.asm
index a42cc145..2a11612f 100644
--- a/Online/Menus/CSS/Teams/AnimateCursorPort.asm
+++ b/Online/Menus/CSS/Teams/AnimateCursorPort.asm
@@ -37,7 +37,7 @@ mulli r6, r6, 0x4
 add REG_TEAM_IDX, REG_TEAM_IDX, r6
 
 mr r3, REG_TEAM_IDX
-#exilogf LOG_LEVEL_NOTICE, "CURSOR COLOR r3: %d", "mr r5, 3", "mr r6, 6"
+#logf LOG_LEVEL_NOTICE, "CURSOR COLOR r3: %d", "mr r5, 3", "mr r6, 6"
 branchl r12, FN_IntToFloat
 
 b EXIT
diff --git a/Online/Menus/CSS/Teams/InitTeamToggleButton.asm b/Online/Menus/CSS/Teams/InitTeamToggleButton.asm
index 986d042e..244c11b6 100644
--- a/Online/Menus/CSS/Teams/InitTeamToggleButton.asm
+++ b/Online/Menus/CSS/Teams/InitTeamToggleButton.asm
@@ -354,7 +354,7 @@ lbz r3, 0x70(REG_PORT_SELECTIONS_ADDR)
 mr REG_INTERNAL_CHAR_ID, r3
 
 lbz REG_TEAM_IDX, CSSDT_TEAM_IDX(REG_CSSDT_ADDR)
-# exilogf LOG_LEVEL_NOTICE, "TEAM INDEX %d", "mr r5, 25"
+# logf LOG_LEVEL_NOTICE, "TEAM INDEX %d", "mr r5, 25"
 
 # Animate the team icon based on team index
 cmpwi REG_TEAM_IDX, 3
diff --git a/Online/Slippi Online Scene/boot.asm b/Online/Slippi Online Scene/boot.asm
index f15fe867..3d394b5f 100644
--- a/Online/Slippi Online Scene/boot.asm	
+++ b/Online/Slippi Online Scene/boot.asm	
@@ -56,4 +56,4 @@ branch r12, 0x801b136c
 # Code end
 ################################################################################
 EXIT:
-li r3, 0x2 # Load menu first
+li r3, 0x1 # Load menu first
diff --git a/Output/Console/GALE01r2.ini b/Output/Console/GALE01r2.ini
index 4dcd582c..98d69bac 100644
--- a/Output/Console/GALE01r2.ini
+++ b/Output/Console/GALE01r2.ini
@@ -702,320 +702,3 @@ C03D000C FC020840
 BA8100B0 800100E4
 382100E0 7C0803A6
 60000000 00000000
-
-$Optional: Debug Game-Side Latency [Fizzi]
-*Shows latency information on screen while in-game
-C216E774 00000093 #External/Debug Inputs/InitOnGameStart.asm
-48000410 4E800021
-00000000 43480000
-41C80000 000000FF
-000000B4 E2E2E2FF
-41200000 41880000
-546F7461 6C204761
-6D65204C 61673A20
-25752075 730A0A00
-506F6C6C 20436F75
-6E743A20 25750A00
-4D696E20 506F6C6C
-20446966 663A2025
-75207573 0A004D61
-7820506F 6C6C2044
-6966663A 20257520
-75730A00 46657463
-682D4665 7463683A
-20257520 75730A00
-506F6C6C 2D466574
-63683A20 25752075
-730A0050 6F6C6C2D
-456E6769 6E653A20
-25752075 730A0000
-4E800021 4E800020
-4E800021 7C0802A6
-90010004 9421FF20
-BE8100B0 4BFFFF31
-7FE802A6 83DF0000
-83BE0006 887E0000
-2C030001 40820128
-7FA3EB78 3D808030
-618C2BB0 7D8903A6
-4E800421 7FA3EB78
-38800000 38A00000
-3D808030 618C2A3C
-7D8903A6 4E800421
-7FA3EB78 389F0020
-80BE0056 3D808030
-618C2D4C 7D8903A6
-4E800421 7FA3EB78
-389F0038 80BE006E
-3D808030 618C2D4C
-7D8903A6 4E800421
-7FA3EB78 389F0048
-80BE005A 3D808030
-618C2D4C 7D8903A6
-4E800421 7FA3EB78
-389F005E 80BE005E
-3D808030 618C2D4C
-7D8903A6 4E800421
-7FA3EB78 389F0074
-80BE0062 3D808030
-618C2D4C 7D8903A6
-4E800421 7FA3EB78
-389F0088 80BE0066
-3D808030 618C2D4C
-7D8903A6 4E800421
-7FA3EB78 389F009B
-80BE006A 3D808030
-618C2D4C 7D8903A6
-4E800421 3C608046
-6063B6A0 88630008
-2C030000 41820020
-807E0012 3D808034
-618C9CBC 7D8903A6
-4E800421 38600002
-987E0000 BA8100B0
-800100E4 382100E0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF20 BE8100B0
-4BFFFDCD 7FE802A6
-38600020 3D808037
-618CF1E4 7D8903A6
-4E800421 7C681B78
-3860001E 3880FF2E
-38A0FFD8 38C00001
-38E00001 3D808030
-618C2834 7D8903A6
-4E800421 7C7E1B78
-806DB77C 7FC4F378
-3D808030 618C2810
-7D8903A6 4E800421
-38600000 987E0026
-7FC3F378 389F000C
-3D808030 618C2B90
-7D8903A6 4E800421
-C03F0004 D03E0008
-C03F0008 D03E000C
-807F0000 93C30002
-BA8100B0 800100E4
-382100E0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF20
-BE8100B0 4BFFFD11
-7FE802A6 386003E8
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C681B78 3860001F
-38800000 38A00000
-38C0001D 38E00009
-3D808030 618C2834
-7D8903A6 4E800421
-7C7E1B78 806DB77C
-7FC4F378 3D808030
-618C2810 7D8903A6
-4E800421 38600000
-987E0026 7FC3F378
-389F0010 3D808030
-618C2B90 7D8903A6
-4E800421 7FC3F378
-C03F0018 C05F001C
-3D808030 618C2B10
-7D8903A6 4E800421
-7FC3F378 389F0014
-3D808030 618C2B64
-7D8903A6 4E800421
-7FC3F378 3D808030
-618C2AF0 7D8903A6
-4E800421 807F0000
-93C30006 38600013
-38800014 38A00000
-3D808039 618C01F0
-7D8903A6 4E800421
-4BFFFCE1 7C8802A6
-38A00007 3D808038
-618CFD54 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF20 BE8100B0
-38600072 3D808037
-618CF1E4 7D8903A6
-4E800421 4BFFFBD1
-7C8802A6 90640000
-7C7E1B78 38800072
-3D808000 618CC160
-7D8903A6 4E800421
-4BFFFDD1 4BFFFE89
-4BFFFC59 7C6802A6
-907E0012 3D808034
-618C9BF0 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 C022A8C8
-60000000 00000000
-C21A4DEC 00000027 #External/Debug Inputs/LogEngineTime.asm
-3C608048 80639D30
-5463443E 2C030202
-4082011C 3C608048
-80639D60 2C030000
-4081010C 7C0802A6
-90010004 9421FF20
-BE8100B0 3D808034
-618C7364 7D8903A6
-4E800421 7C7E1B78
-3C608016 6063E774
-80830000 5485302E
-38800040 7C8523D6
-7C632214 83E30008
-887F0000 2C030000
-41820098 3C80804C
-60841FAC 80640000
-547C073E 54630036
-90640000 3D808034
-618CC408 7D8903A6
-4E800421 1C9C0004
-38840016 7C9F202E
-7C641850 1C63000C
-3C808000 608400FC
-80840000 38A003E8
-7C842B96 7C842B96
-7C632396 7C7D1B78
-93BF006A 807F0002
-9B810008 9B810009
-9B81000A 80810008
-54842026 608400FF
-90810008 38810008
-3D808030 618C2B90
-7D8903A6 4E800421
-7FC3F378 3D808034
-618C738C 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 800D9368
-60000000 00000000
-C2376A88 0000002C #External/Debug Inputs/LogFetchTime.asm
-3C608048 80639D30
-5463443E 2C030202
-40820148 3C608047
-60639D64 80630000
-2C030000 40820134
-7C0802A6 90010004
-9421FF20 BE8100B0
-3D808034 618C7364
-7D8903A6 4E800421
-7C7E1B78 3C608016
-6063E774 80830000
-5485302E 38800040
-7C8523D6 7C632214
-83E30008 8061010C
-54638036 889F0001
-7C632378 5463803E
-9061010C 807F000A
-889F0001 1C840004
-38840016 7C7F212E
-887F0001 38630001
-2C030010 41800008
-38600000 987F0001
-887F0000 2C030000
-4082000C 38600001
-987F0000 3D808034
-618CC408 7D8903A6
-4E800421 7C7D1B78
-809F000E 93BF000E
-7C64E850 1C63000C
-3C808000 608400FC
-80840000 38A003E8
-7C842B96 7C842B96
-7C632396 907F0062
-807F000A 7C63E850
-1C63000C 3C808000
-608400FC 80840000
-38A003E8 7C842B96
-7C842B96 7C632396
-907F0066 7FC3F378
-3D808034 618C738C
-7D8903A6 4E800421
-BA8100B0 800100E4
-382100E0 7C0803A6
-881F0002 00000000
-C2349A28 00000024 #External/Debug Inputs/LogPollTime.asm
-3C608048 80639D30
-5463443E 2C030202
-40820104 3C608047
-60639D64 80630000
-2C030000 408200F0
-7C0802A6 90010004
-9421FF20 BE8100B0
-3D808034 618C7364
-7D8903A6 4E800421
-7C7E1B78 3C608016
-6063E774 80830000
-5485302E 38800040
-7C8523D6 7C632214
-83E30008 807F006E
-38630001 907F006E
-3D808034 618CC408
-7D8903A6 4E800421
-809F000A 907F000A
-7C641850 1C63000C
-3C808000 608400FC
-80840000 38A003E8
-7C842B96 7C842B96
-7C632396 7C7D1B78
-807F006E 5463063F
-41820028 807F005A
-7C1D1800 40800008
-93BF005A 807F005E
-7C1D1800 40810008
-93BF005E 4800000C
-93BF005A 93BF005E
-7FC3F378 3D808034
-618C738C 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 80B80000
-60000000 00000000
-C2375C14 0000002B #External/Debug Inputs/LogScanoutTime.asm
-48000034 5464C63E
-5463463E 7C032000
-4182000C 3860FFFF
-48000018 3863FFF1
-1C630006 38800005
-7C632396 5463E73E
-4E800020 3C608048
-80639D30 5463443E
-2C030202 40820108
-3C608047 60639D64
-80630000 2C030000
-408200F4 7C0802A6
-90010004 9421FF20
-BE8100B0 3D808034
-618C7364 7D8903A6
-4E800421 7C7E1B78
-3C608016 6063E774
-80830000 5485302E
-38800040 7C8523D6
-7C632214 83E30008
-887F0000 2C030000
-41820080 3C60804A
-60638B10 80630000
-38800000 7C0323AC
-7C0004AC 4C00012C
-83430000 7F43D378
-4BFFFF35 2C030000
-41800050 7C7C1B78
-3D808034 618CC408
-7D8903A6 4E800421
-1C9C0004 38840016
-7C9F202E 7C641850
-1C63000C 3C808000
-608400FC 80840000
-38A003E8 7C842B96
-7C842B96 7C632396
-7C7D1B78 93BF0056
-7FC3F378 3D808034
-618C738C 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 80010024
-60000000 00000000
diff --git a/Output/Console/g_core.bin b/Output/Console/g_core.bin
index ba15a8a9..b01d8c0a 100644
Binary files a/Output/Console/g_core.bin and b/Output/Console/g_core.bin differ
diff --git a/Output/Console/g_core_porta.bin b/Output/Console/g_core_porta.bin
index db7c17c7..b9b03399 100644
Binary files a/Output/Console/g_core_porta.bin and b/Output/Console/g_core_porta.bin differ
diff --git a/Output/Netplay/GALE01r2.ini b/Output/Netplay/GALE01r2.ini
index 49a512b2..6e2cf55c 100644
--- a/Output/Netplay/GALE01r2.ini
+++ b/Output/Netplay/GALE01r2.ini
@@ -4653,7 +4653,7 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm
 60631360 906400A0
 3D80801B 618C136C
 7D8903A6 4E800420
-38600002 00000000
+38600001 00000000
 C21A45B8 000001FF #Online/Slippi Online Scene/main.asm
 3BA30004 7C0802A6
 90010004 9421FF20
@@ -5610,6 +5610,20 @@ BE8100B0 4BFFFCA9
 7C0803A6 4E800020
 60000000 00000000
 043775B0 7C600775 #Online/Debugging/LogInputOnCopy.asm
+041A4C24 C0429A7C #Polling Drift Fix + VB [tauKhan]
+0401985C 3C60804C
+04019860 91231F5C
+C2376200 00000003
+2C1DFFFF 41820008
+48000008 93A2C150
+60000000 00000000
+C21A5018 00000005
+3B5A0001 8002C150
+2C00FFFF 38000000
+9002C150 3D80801A
+618C5078 7D8903A6
+4D820420 00000000
+04218D68 C8228000
 C209E090 00000011 #Common/FastForward/DynamicsFix.asm
 807E0000 80630028
 48000009 48000074
@@ -6926,392 +6940,3 @@ C0230064 BA810008
 BA810008 800100B4
 382100B0 7C0803A6
 60000000 00000000
-
-$Optional: Debug Game-Side Latency [Fizzi]
-*Shows latency information on screen while in-game
-C216E774 00000093 #External/Debug Inputs/InitOnGameStart.asm
-48000410 4E800021
-00000000 43480000
-41C80000 000000FF
-000000B4 E2E2E2FF
-41200000 41880000
-546F7461 6C204761
-6D65204C 61673A20
-25752075 730A0A00
-506F6C6C 20436F75
-6E743A20 25750A00
-4D696E20 506F6C6C
-20446966 663A2025
-75207573 0A004D61
-7820506F 6C6C2044
-6966663A 20257520
-75730A00 46657463
-682D4665 7463683A
-20257520 75730A00
-506F6C6C 2D466574
-63683A20 25752075
-730A0050 6F6C6C2D
-456E6769 6E653A20
-25752075 730A0000
-4E800021 4E800020
-4E800021 7C0802A6
-90010004 9421FF20
-BE8100B0 4BFFFF31
-7FE802A6 83DF0000
-83BE0006 887E0000
-2C030001 40820128
-7FA3EB78 3D808030
-618C2BB0 7D8903A6
-4E800421 7FA3EB78
-38800000 38A00000
-3D808030 618C2A3C
-7D8903A6 4E800421
-7FA3EB78 389F0020
-80BE0056 3D808030
-618C2D4C 7D8903A6
-4E800421 7FA3EB78
-389F0038 80BE006E
-3D808030 618C2D4C
-7D8903A6 4E800421
-7FA3EB78 389F0048
-80BE005A 3D808030
-618C2D4C 7D8903A6
-4E800421 7FA3EB78
-389F005E 80BE005E
-3D808030 618C2D4C
-7D8903A6 4E800421
-7FA3EB78 389F0074
-80BE0062 3D808030
-618C2D4C 7D8903A6
-4E800421 7FA3EB78
-389F0088 80BE0066
-3D808030 618C2D4C
-7D8903A6 4E800421
-7FA3EB78 389F009B
-80BE006A 3D808030
-618C2D4C 7D8903A6
-4E800421 3C608046
-6063B6A0 88630008
-2C030000 41820020
-807E0012 3D808034
-618C9CBC 7D8903A6
-4E800421 38600002
-987E0000 BA8100B0
-800100E4 382100E0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF20 BE8100B0
-4BFFFDCD 7FE802A6
-38600020 3D808037
-618CF1E4 7D8903A6
-4E800421 7C681B78
-3860001E 3880FF2E
-38A0FFD8 38C00001
-38E00001 3D808030
-618C2834 7D8903A6
-4E800421 7C7E1B78
-806DB77C 7FC4F378
-3D808030 618C2810
-7D8903A6 4E800421
-38600000 987E0026
-7FC3F378 389F000C
-3D808030 618C2B90
-7D8903A6 4E800421
-C03F0004 D03E0008
-C03F0008 D03E000C
-807F0000 93C30002
-BA8100B0 800100E4
-382100E0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF20
-BE8100B0 4BFFFD11
-7FE802A6 386003E8
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C681B78 3860001F
-38800000 38A00000
-38C0001D 38E00009
-3D808030 618C2834
-7D8903A6 4E800421
-7C7E1B78 806DB77C
-7FC4F378 3D808030
-618C2810 7D8903A6
-4E800421 38600000
-987E0026 7FC3F378
-389F0010 3D808030
-618C2B90 7D8903A6
-4E800421 7FC3F378
-C03F0018 C05F001C
-3D808030 618C2B10
-7D8903A6 4E800421
-7FC3F378 389F0014
-3D808030 618C2B64
-7D8903A6 4E800421
-7FC3F378 3D808030
-618C2AF0 7D8903A6
-4E800421 807F0000
-93C30006 38600013
-38800014 38A00000
-3D808039 618C01F0
-7D8903A6 4E800421
-4BFFFCE1 7C8802A6
-38A00007 3D808038
-618CFD54 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF20 BE8100B0
-38600072 3D808037
-618CF1E4 7D8903A6
-4E800421 4BFFFBD1
-7C8802A6 90640000
-7C7E1B78 38800072
-3D808000 618CC160
-7D8903A6 4E800421
-4BFFFDD1 4BFFFE89
-4BFFFC59 7C6802A6
-907E0012 3D808034
-618C9BF0 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 C022A8C8
-60000000 00000000
-C21A4DEC 00000027 #External/Debug Inputs/LogEngineTime.asm
-3C608048 80639D30
-5463443E 2C030202
-4082011C 3C608048
-80639D60 2C030000
-4081010C 7C0802A6
-90010004 9421FF20
-BE8100B0 3D808034
-618C7364 7D8903A6
-4E800421 7C7E1B78
-3C608016 6063E774
-80830000 5485302E
-38800040 7C8523D6
-7C632214 83E30008
-887F0000 2C030000
-41820098 3C80804C
-60841FAC 80640000
-547C073E 54630036
-90640000 3D808034
-618CC408 7D8903A6
-4E800421 1C9C0004
-38840016 7C9F202E
-7C641850 1C63000C
-3C808000 608400FC
-80840000 38A003E8
-7C842B96 7C842B96
-7C632396 7C7D1B78
-93BF006A 807F0002
-9B810008 9B810009
-9B81000A 80810008
-54842026 608400FF
-90810008 38810008
-3D808030 618C2B90
-7D8903A6 4E800421
-7FC3F378 3D808034
-618C738C 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 800D9368
-60000000 00000000
-C2376A88 0000002C #External/Debug Inputs/LogFetchTime.asm
-3C608048 80639D30
-5463443E 2C030202
-40820148 3C608047
-60639D64 80630000
-2C030000 40820134
-7C0802A6 90010004
-9421FF20 BE8100B0
-3D808034 618C7364
-7D8903A6 4E800421
-7C7E1B78 3C608016
-6063E774 80830000
-5485302E 38800040
-7C8523D6 7C632214
-83E30008 8061010C
-54638036 889F0001
-7C632378 5463803E
-9061010C 807F000A
-889F0001 1C840004
-38840016 7C7F212E
-887F0001 38630001
-2C030010 41800008
-38600000 987F0001
-887F0000 2C030000
-4082000C 38600001
-987F0000 3D808034
-618CC408 7D8903A6
-4E800421 7C7D1B78
-809F000E 93BF000E
-7C64E850 1C63000C
-3C808000 608400FC
-80840000 38A003E8
-7C842B96 7C842B96
-7C632396 907F0062
-807F000A 7C63E850
-1C63000C 3C808000
-608400FC 80840000
-38A003E8 7C842B96
-7C842B96 7C632396
-907F0066 7FC3F378
-3D808034 618C738C
-7D8903A6 4E800421
-BA8100B0 800100E4
-382100E0 7C0803A6
-881F0002 00000000
-C2349A28 00000024 #External/Debug Inputs/LogPollTime.asm
-3C608048 80639D30
-5463443E 2C030202
-40820104 3C608047
-60639D64 80630000
-2C030000 408200F0
-7C0802A6 90010004
-9421FF20 BE8100B0
-3D808034 618C7364
-7D8903A6 4E800421
-7C7E1B78 3C608016
-6063E774 80830000
-5485302E 38800040
-7C8523D6 7C632214
-83E30008 807F006E
-38630001 907F006E
-3D808034 618CC408
-7D8903A6 4E800421
-809F000A 907F000A
-7C641850 1C63000C
-3C808000 608400FC
-80840000 38A003E8
-7C842B96 7C842B96
-7C632396 7C7D1B78
-807F006E 5463063F
-41820028 807F005A
-7C1D1800 40800008
-93BF005A 807F005E
-7C1D1800 40810008
-93BF005E 4800000C
-93BF005A 93BF005E
-7FC3F378 3D808034
-618C738C 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 80B80000
-60000000 00000000
-C2375C14 0000002B #External/Debug Inputs/LogScanoutTime.asm
-48000034 5464C63E
-5463463E 7C032000
-4182000C 3860FFFF
-48000018 3863FFF1
-1C630006 38800005
-7C632396 5463E73E
-4E800020 3C608048
-80639D30 5463443E
-2C030202 40820108
-3C608047 60639D64
-80630000 2C030000
-408200F4 7C0802A6
-90010004 9421FF20
-BE8100B0 3D808034
-618C7364 7D8903A6
-4E800421 7C7E1B78
-3C608016 6063E774
-80830000 5485302E
-38800040 7C8523D6
-7C632214 83E30008
-887F0000 2C030000
-41820080 3C60804A
-60638B10 80630000
-38800000 7C0323AC
-7C0004AC 4C00012C
-83430000 7F43D378
-4BFFFF35 2C030000
-41800050 7C7C1B78
-3D808034 618CC408
-7D8903A6 4E800421
-1C9C0004 38840016
-7C9F202E 7C641850
-1C63000C 3C808000
-608400FC 80840000
-38A003E8 7C842B96
-7C842B96 7C632396
-7C7D1B78 93BF0056
-7FC3F378 3D808034
-618C738C 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 80010024
-60000000 00000000
-041BFA20 38600002 #External/Boot to CSS/Boot To CSS.asm
-
-$Optional: PD+VB [taukhan]
-*PD+VB
-C21A4D98 00000007 #Polling Drift Fix + VB [tauKhan]
-8062A6F4 2C030001
-40820028 8062A6F0
-2C030002 4182001C
-386DBD88 3D808034
-618CBA14 7D8803A6
-4E800021 4BFFFFD4
-60000000 00000000
-C21A5050 0000000B
-8062A6F4 2C030001
-40820044 8062A6F0
-2C030002 40820038
-4800001C 8062A6F0
-2C030002 41820028
-8062A6F4 2C030001
-4082001C 386DBD88
-3D808034 618CBA14
-7D8803A6 4E800021
-4BFFFFD4 38600000
-60000000 00000000
-C21A4BEC 00000015
-4800007D 7C0802A6
-90010004 9421FFF8
-386DBD88 8082A6F0
-38840001 9082A6F0
-2C040001 40820014
-3D808001 618C95FC
-7D8803A6 4E800021
-8082A6F0 2C040002
-40820014 3D808034
-618CBB00 7D8803A6
-4E800021 38600001
-9062A6F4 38604000
-38635624 3C808043
-B0642A42 8001000C
-38210008 7C0803A6
-4E800020 7C6802A6
-3D808034 618CE894
-7D8803A6 4E800021
-3C608048 3C80801A
-380446F4 38800000
-60000000 00000000
-04158268 C82280A0
-C234EB60 00000007
-8062A6F0 2C030001
-4080001C 38600000
-9062A6F4 3C608043
-38804000 388455FC
-B0832A42 38600000
-9062A6F0 386DBD88
-60000000 00000000
-04397878 4800020C
-
-$Optional: PD [Dan Salvato]
-*PD
-C21A4DA0 00000003 #Polling Drift Fix [Dan Salvato]
-901C0000 3D808001
-618C95FC 7D8903A6
-4E800421 00000000
-041A4DB4 60000000
-04019860 4BFFFD9D
-
-$Optional: 59.94Hz Engine [Fizzi]
-*Attempts to fix polling drift
-044DA2A8 3C88AB85 #External/59.94Hz Engine/InGameSpeed.asm
-044DA9E8 3C88AB85 #External/59.94Hz Engine/MenuSpeed.asm
-044D7CA0 3C88AB85 #External/59.94Hz Engine/SetSpeedOnBoot.asm
-044DA5F8 3C88AB85 #External/59.94Hz Engine/TrainingModeSpeed.asm
diff --git a/Output/Netplay/GALJ01r2.ini b/Output/Netplay/GALJ01r2.ini
index e2fc8ae8..5aeebdb0 100644
--- a/Output/Netplay/GALJ01r2.ini
+++ b/Output/Netplay/GALJ01r2.ini
@@ -4652,7 +4652,7 @@ C21BFA20 00000012 #Online/Slippi Online Scene/boot.asm
 60631360 906400A0
 3D80801B 618C136C
 7D8903A6 4E800420
-38600002 00000000
+38600001 00000000
 C21A45B8 000001FF #Online/Slippi Online Scene/main.asm
 3BA30004 7C0802A6
 90010004 9421FF20
@@ -5609,6 +5609,20 @@ BE8100B0 4BFFFCA9
 7C0803A6 4E800020
 60000000 00000000
 043775B0 7C600775 #Online/Debugging/LogInputOnCopy.asm
+041A4C24 C0429A7C #Polling Drift Fix + VB [tauKhan]
+0401985C 3C60804C
+04019860 91231F5C
+C2376200 00000003
+2C1DFFFF 41820008
+48000008 93A2C150
+60000000 00000000
+C21A5018 00000005
+3B5A0001 8002C150
+2C00FFFF 38000000
+9002C150 3D80801A
+618C5078 7D8903A6
+4D820420 00000000
+04218D68 C8228000
 C209E090 00000011 #Common/FastForward/DynamicsFix.asm
 807E0000 80630028
 48000009 48000074
@@ -6925,392 +6939,3 @@ C0230064 BA810008
 BA810008 800100B4
 382100B0 7C0803A6
 60000000 00000000
-
-$Optional: Debug Game-Side Latency [Fizzi]
-*Shows latency information on screen while in-game
-C216E774 00000093 #External/Debug Inputs/InitOnGameStart.asm
-48000410 4E800021
-00000000 43480000
-41C80000 000000FF
-000000B4 E2E2E2FF
-41200000 41880000
-546F7461 6C204761
-6D65204C 61673A20
-25752075 730A0A00
-506F6C6C 20436F75
-6E743A20 25750A00
-4D696E20 506F6C6C
-20446966 663A2025
-75207573 0A004D61
-7820506F 6C6C2044
-6966663A 20257520
-75730A00 46657463
-682D4665 7463683A
-20257520 75730A00
-506F6C6C 2D466574
-63683A20 25752075
-730A0050 6F6C6C2D
-456E6769 6E653A20
-25752075 730A0000
-4E800021 4E800020
-4E800021 7C0802A6
-90010004 9421FF20
-BE8100B0 4BFFFF31
-7FE802A6 83DF0000
-83BE0006 887E0000
-2C030001 40820128
-7FA3EB78 3D808030
-618C2BB0 7D8903A6
-4E800421 7FA3EB78
-38800000 38A00000
-3D808030 618C2A3C
-7D8903A6 4E800421
-7FA3EB78 389F0020
-80BE0056 3D808030
-618C2D4C 7D8903A6
-4E800421 7FA3EB78
-389F0038 80BE006E
-3D808030 618C2D4C
-7D8903A6 4E800421
-7FA3EB78 389F0048
-80BE005A 3D808030
-618C2D4C 7D8903A6
-4E800421 7FA3EB78
-389F005E 80BE005E
-3D808030 618C2D4C
-7D8903A6 4E800421
-7FA3EB78 389F0074
-80BE0062 3D808030
-618C2D4C 7D8903A6
-4E800421 7FA3EB78
-389F0088 80BE0066
-3D808030 618C2D4C
-7D8903A6 4E800421
-7FA3EB78 389F009B
-80BE006A 3D808030
-618C2D4C 7D8903A6
-4E800421 3C608046
-6063B6A0 88630008
-2C030000 41820020
-807E0012 3D808034
-618C9CBC 7D8903A6
-4E800421 38600002
-987E0000 BA8100B0
-800100E4 382100E0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF20 BE8100B0
-4BFFFDCD 7FE802A6
-38600020 3D808037
-618CF1E4 7D8903A6
-4E800421 7C681B78
-3860001E 3880FF2E
-38A0FFD8 38C00001
-38E00001 3D808030
-618C2834 7D8903A6
-4E800421 7C7E1B78
-806DB77C 7FC4F378
-3D808030 618C2810
-7D8903A6 4E800421
-38600000 987E0026
-7FC3F378 389F000C
-3D808030 618C2B90
-7D8903A6 4E800421
-C03F0004 D03E0008
-C03F0008 D03E000C
-807F0000 93C30002
-BA8100B0 800100E4
-382100E0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF20
-BE8100B0 4BFFFD11
-7FE802A6 386003E8
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C681B78 3860001F
-38800000 38A00000
-38C0001D 38E00009
-3D808030 618C2834
-7D8903A6 4E800421
-7C7E1B78 806DB77C
-7FC4F378 3D808030
-618C2810 7D8903A6
-4E800421 38600000
-987E0026 7FC3F378
-389F0010 3D808030
-618C2B90 7D8903A6
-4E800421 7FC3F378
-C03F0018 C05F001C
-3D808030 618C2B10
-7D8903A6 4E800421
-7FC3F378 389F0014
-3D808030 618C2B64
-7D8903A6 4E800421
-7FC3F378 3D808030
-618C2AF0 7D8903A6
-4E800421 807F0000
-93C30006 38600013
-38800014 38A00000
-3D808039 618C01F0
-7D8903A6 4E800421
-4BFFFCE1 7C8802A6
-38A00007 3D808038
-618CFD54 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF20 BE8100B0
-38600072 3D808037
-618CF1E4 7D8903A6
-4E800421 4BFFFBD1
-7C8802A6 90640000
-7C7E1B78 38800072
-3D808000 618CC160
-7D8903A6 4E800421
-4BFFFDD1 4BFFFE89
-4BFFFC59 7C6802A6
-907E0012 3D808034
-618C9BF0 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 C022A8C8
-60000000 00000000
-C21A4DEC 00000027 #External/Debug Inputs/LogEngineTime.asm
-3C608048 80639D30
-5463443E 2C030202
-4082011C 3C608048
-80639D60 2C030000
-4081010C 7C0802A6
-90010004 9421FF20
-BE8100B0 3D808034
-618C7364 7D8903A6
-4E800421 7C7E1B78
-3C608016 6063E774
-80830000 5485302E
-38800040 7C8523D6
-7C632214 83E30008
-887F0000 2C030000
-41820098 3C80804C
-60841FAC 80640000
-547C073E 54630036
-90640000 3D808034
-618CC408 7D8903A6
-4E800421 1C9C0004
-38840016 7C9F202E
-7C641850 1C63000C
-3C808000 608400FC
-80840000 38A003E8
-7C842B96 7C842B96
-7C632396 7C7D1B78
-93BF006A 807F0002
-9B810008 9B810009
-9B81000A 80810008
-54842026 608400FF
-90810008 38810008
-3D808030 618C2B90
-7D8903A6 4E800421
-7FC3F378 3D808034
-618C738C 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 800D9368
-60000000 00000000
-C2376A88 0000002C #External/Debug Inputs/LogFetchTime.asm
-3C608048 80639D30
-5463443E 2C030202
-40820148 3C608047
-60639D64 80630000
-2C030000 40820134
-7C0802A6 90010004
-9421FF20 BE8100B0
-3D808034 618C7364
-7D8903A6 4E800421
-7C7E1B78 3C608016
-6063E774 80830000
-5485302E 38800040
-7C8523D6 7C632214
-83E30008 8061010C
-54638036 889F0001
-7C632378 5463803E
-9061010C 807F000A
-889F0001 1C840004
-38840016 7C7F212E
-887F0001 38630001
-2C030010 41800008
-38600000 987F0001
-887F0000 2C030000
-4082000C 38600001
-987F0000 3D808034
-618CC408 7D8903A6
-4E800421 7C7D1B78
-809F000E 93BF000E
-7C64E850 1C63000C
-3C808000 608400FC
-80840000 38A003E8
-7C842B96 7C842B96
-7C632396 907F0062
-807F000A 7C63E850
-1C63000C 3C808000
-608400FC 80840000
-38A003E8 7C842B96
-7C842B96 7C632396
-907F0066 7FC3F378
-3D808034 618C738C
-7D8903A6 4E800421
-BA8100B0 800100E4
-382100E0 7C0803A6
-881F0002 00000000
-C2349A28 00000024 #External/Debug Inputs/LogPollTime.asm
-3C608048 80639D30
-5463443E 2C030202
-40820104 3C608047
-60639D64 80630000
-2C030000 408200F0
-7C0802A6 90010004
-9421FF20 BE8100B0
-3D808034 618C7364
-7D8903A6 4E800421
-7C7E1B78 3C608016
-6063E774 80830000
-5485302E 38800040
-7C8523D6 7C632214
-83E30008 807F006E
-38630001 907F006E
-3D808034 618CC408
-7D8903A6 4E800421
-809F000A 907F000A
-7C641850 1C63000C
-3C808000 608400FC
-80840000 38A003E8
-7C842B96 7C842B96
-7C632396 7C7D1B78
-807F006E 5463063F
-41820028 807F005A
-7C1D1800 40800008
-93BF005A 807F005E
-7C1D1800 40810008
-93BF005E 4800000C
-93BF005A 93BF005E
-7FC3F378 3D808034
-618C738C 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 80B80000
-60000000 00000000
-C2375C14 0000002B #External/Debug Inputs/LogScanoutTime.asm
-48000034 5464C63E
-5463463E 7C032000
-4182000C 3860FFFF
-48000018 3863FFF1
-1C630006 38800005
-7C632396 5463E73E
-4E800020 3C608048
-80639D30 5463443E
-2C030202 40820108
-3C608047 60639D64
-80630000 2C030000
-408200F4 7C0802A6
-90010004 9421FF20
-BE8100B0 3D808034
-618C7364 7D8903A6
-4E800421 7C7E1B78
-3C608016 6063E774
-80830000 5485302E
-38800040 7C8523D6
-7C632214 83E30008
-887F0000 2C030000
-41820080 3C60804A
-60638B10 80630000
-38800000 7C0323AC
-7C0004AC 4C00012C
-83430000 7F43D378
-4BFFFF35 2C030000
-41800050 7C7C1B78
-3D808034 618CC408
-7D8903A6 4E800421
-1C9C0004 38840016
-7C9F202E 7C641850
-1C63000C 3C808000
-608400FC 80840000
-38A003E8 7C842B96
-7C842B96 7C632396
-7C7D1B78 93BF0056
-7FC3F378 3D808034
-618C738C 7D8903A6
-4E800421 BA8100B0
-800100E4 382100E0
-7C0803A6 80010024
-60000000 00000000
-041BFA20 38600002 #External/Boot to CSS/Boot To CSS.asm
-
-$Optional: PD+VB [taukhan]
-*PD+VB
-C21A4D98 00000007 #Polling Drift Fix + VB [tauKhan]
-8062A6F4 2C030001
-40820028 8062A6F0
-2C030002 4182001C
-386DBD88 3D808034
-618CBA14 7D8803A6
-4E800021 4BFFFFD4
-60000000 00000000
-C21A5050 0000000B
-8062A6F4 2C030001
-40820044 8062A6F0
-2C030002 40820038
-4800001C 8062A6F0
-2C030002 41820028
-8062A6F4 2C030001
-4082001C 386DBD88
-3D808034 618CBA14
-7D8803A6 4E800021
-4BFFFFD4 38600000
-60000000 00000000
-C21A4BEC 00000015
-4800007D 7C0802A6
-90010004 9421FFF8
-386DBD88 8082A6F0
-38840001 9082A6F0
-2C040001 40820014
-3D808001 618C95FC
-7D8803A6 4E800021
-8082A6F0 2C040002
-40820014 3D808034
-618CBB00 7D8803A6
-4E800021 38600001
-9062A6F4 38604000
-38635624 3C808043
-B0642A42 8001000C
-38210008 7C0803A6
-4E800020 7C6802A6
-3D808034 618CE894
-7D8803A6 4E800021
-3C608048 3C80801A
-380446F4 38800000
-60000000 00000000
-04158268 C82280A0
-C234EB60 00000007
-8062A6F0 2C030001
-4080001C 38600000
-9062A6F4 3C608043
-38804000 388455FC
-B0832A42 38600000
-9062A6F0 386DBD88
-60000000 00000000
-04397878 4800020C
-
-$Optional: PD [Dan Salvato]
-*PD
-C21A4DA0 00000003 #Polling Drift Fix [Dan Salvato]
-901C0000 3D808001
-618C95FC 7D8903A6
-4E800421 00000000
-041A4DB4 60000000
-04019860 4BFFFD9D
-
-$Optional: 59.94Hz Engine [Fizzi]
-*Attempts to fix polling drift
-044DA2A8 3C88AB85 #External/59.94Hz Engine/InGameSpeed.asm
-044DA9E8 3C88AB85 #External/59.94Hz Engine/MenuSpeed.asm
-044D7CA0 3C88AB85 #External/59.94Hz Engine/SetSpeedOnBoot.asm
-044DA5F8 3C88AB85 #External/59.94Hz Engine/TrainingModeSpeed.asm
diff --git a/console_core.json b/console_core.json
index 4447c9f4..98b0e2f9 100644
--- a/console_core.json
+++ b/console_core.json
@@ -189,23 +189,6 @@
           "annotation": "Avoids PS + Widescreen desyncs [Fizzi]"
         }
       ]
-    },
-    {
-      "name": "Optional: Debug Game-Side Latency",
-      "authors": [
-        "Fizzi"
-      ],
-      "description": [
-        "Shows latency information on screen while in-game"
-      ],
-      "build": [
-        {
-          "type": "injectFolder",
-          "sourceFolder": "External/Debug Inputs",
-          "isRecursive": true,
-          "annotation": "Shows latency information on screen while in-game"
-        }
-      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/netplay.json b/netplay.json
index bb209bd4..de99eee0 100644
--- a/netplay.json
+++ b/netplay.json
@@ -327,6 +327,11 @@
           "isRecursive": true,
           "annotation": "Log injections [Fizzi]"
         },
+        {
+          "type": "binary",
+          "sourceFile": "Binary/LagReduction/PD+VB.bin",
+          "annotation": "Polling Drift Fix + VB [tauKhan]"
+        },
         {
           "type": "injectFolder",
           "sourceFolder": "Common/FastForward",
@@ -516,77 +521,6 @@
           "isRecursive": true
         }
       ]
-    },
-    {
-      "name": "Optional: Debug Game-Side Latency",
-      "authors": [
-        "Fizzi"
-      ],
-      "description": [
-        "Shows latency information on screen while in-game"
-      ],
-      "build": [
-        {
-          "type": "injectFolder",
-          "sourceFolder": "External/Debug Inputs",
-          "isRecursive": true,
-          "annotation": "Shows latency information on screen while in-game"
-        },
-        {
-          "type": "injectFolder",
-          "sourceFolder": "External/Boot to CSS",
-          "isRecursive": true
-        }
-      ]
-    },
-    {
-      "name": "Optional: PD+VB",
-      "authors": [
-        "taukhan"
-      ],
-      "description": [
-        "PD+VB"
-      ],
-      "build": [
-        {
-          "type": "binary",
-          "sourceFile": "Binary/LagReduction/PD+VB.bin",
-          "annotation": "Polling Drift Fix + VB [tauKhan]"
-        }
-      ]
-    },
-    {
-      "name": "Optional: PD",
-      "authors": [
-        "Dan Salvato"
-      ],
-      "description": [
-        "PD"
-      ],
-      "build": [
-        {
-          "type": "binary",
-          "sourceFile": "Binary/LagReduction/PD.bin",
-          "annotation": "Polling Drift Fix [Dan Salvato]"
-        }
-      ]
-    },
-    {
-      "name": "Optional: 59.94Hz Engine",
-      "authors": [
-        "Fizzi"
-      ],
-      "description": [
-        "Attempts to fix polling drift"
-      ],
-      "build": [
-        {
-          "type": "injectFolder",
-          "sourceFolder": "External/59.94Hz Engine",
-          "isRecursive": true,
-          "annotation": "59.94Hz Engine"
-        }
-      ]
     }
   ]
 }
\ No newline at end of file