diff --git a/PLUGINS.md b/PLUGINS.md
index fffea25..d3b3199 100644
--- a/PLUGINS.md
+++ b/PLUGINS.md
@@ -38,10 +38,10 @@ void Card2Insert()
 ```
 Runs when user presses CARD_INSERT_2, causes TAL to not insert a card if any plugins have this present
 ```
-void AfterCard1Insert()
+void BeforeCard1Insert()
 ```
-Runs after CARD_INSERT_1 is handled
+Runs before CARD_INSERT_1 is handled
 ```
-void AfterCard2Insert()
+void BeforeCard2Insert()
 ```
-Runs after CARD_INSERT_2 is handled
+Runs before CARD_INSERT_2 is handled
diff --git a/plugins/8.18-song-limit/src/lib.rs b/plugins/8.18-song-limit/src/lib.rs
index 14eee20..89cf79b 100644
--- a/plugins/8.18-song-limit/src/lib.rs
+++ b/plugins/8.18-song-limit/src/lib.rs
@@ -191,7 +191,7 @@ pub unsafe fn set_song_data() {
 		"add rsp, 0x28",
 		"movsxd rax, edi",
 		"lea rdx, [rax + rax * 4]",
-		"movsxd rdx, ebx",
+		"movsxd rax, ebx",
 		"add rdx, rax",
 		"lea rax, [rdx + rdx * 8]",
 		"lea rbx, [r8 + rax * 8]",
@@ -205,7 +205,8 @@ pub unsafe fn set_song_data() {
 pub unsafe extern "C" fn Init() {
 	let handle = GetModuleHandleA(0 as *const i8) as usize;
 	HANDLE = Some(handle);
-	SONG_DATA = Some(calloc(1, SONG_DATA_SIZE));
+	SONG_DATA = Some(malloc(SONG_DATA_SIZE));
+	memset(SONG_DATA.unwrap(), 0, SONG_DATA_SIZE);
 
 	let bytes = gen_jmp(primitive_ptr!(set_crown_data_1) as usize);
 	write_bytes(primitive_ptr!(handle + 0x2F3AC8), bytes);
@@ -215,46 +216,46 @@ pub unsafe extern "C" fn Init() {
 	write_bytes(primitive_ptr!(handle + 0x2F3BFC), bytes);
 
 	let bytes = gen_jmp(primitive_ptr!(set_score_rank_1) as usize);
-	write_bytes(primitive_ptr!(handle + 0x3065EC), bytes);
+	write_bytes(primitive_ptr!(handle + 0x3065EA), bytes);
 	let bytes = gen_jmp(primitive_ptr!(set_score_rank_2) as usize);
-	write_bytes(primitive_ptr!(handle + 0x306520), bytes);
+	write_bytes(primitive_ptr!(handle + 0x30651E), bytes);
 	let bytes = gen_jmp(primitive_ptr!(set_score_rank_3) as usize);
-	write_bytes(primitive_ptr!(handle + 0x306454), bytes);
+	write_bytes(primitive_ptr!(handle + 0x306452), bytes);
 	let bytes = gen_jmp(primitive_ptr!(set_score_rank_4) as usize);
-	write_bytes(primitive_ptr!(handle + 0x3068AC), bytes);
+	write_bytes(primitive_ptr!(handle + 0x3068AA), bytes);
 	let bytes = gen_jmp(primitive_ptr!(set_score_rank_5) as usize);
-	write_bytes(primitive_ptr!(handle + 0x3067E0), bytes);
+	write_bytes(primitive_ptr!(handle + 0x3067DE), bytes);
 	let bytes = gen_jmp(primitive_ptr!(set_score_rank_6) as usize);
-	write_bytes(primitive_ptr!(handle + 0x306714), bytes);
+	write_bytes(primitive_ptr!(handle + 0x306712), bytes);
 	let bytes = gen_jmp(primitive_ptr!(set_score_rank_7) as usize);
-	write_bytes(primitive_ptr!(handle + 0x3069A4), bytes);
+	write_bytes(primitive_ptr!(handle + 0x3069A2), bytes);
 
 	let bytes = gen_jmp(primitive_ptr!(set_unknown_data_1) as usize);
-	write_bytes(primitive_ptr!(handle + 0x313757), bytes);
+	write_bytes(primitive_ptr!(handle + 0x313755), bytes);
 	let bytes = gen_jmp(primitive_ptr!(set_unknown_data_2) as usize);
-	write_bytes(primitive_ptr!(handle + 0x313A0D), bytes);
+	write_bytes(primitive_ptr!(handle + 0x313A0B), bytes);
 	let bytes = gen_jmp(primitive_ptr!(set_unknown_data_3) as usize);
-	write_bytes(primitive_ptr!(handle + 0x313B4E), bytes);
+	write_bytes(primitive_ptr!(handle + 0x313B4C), bytes);
 	let bytes = gen_jmp(primitive_ptr!(set_unknown_data_4) as usize);
-	write_bytes(primitive_ptr!(handle + 0x313C44), bytes);
+	write_bytes(primitive_ptr!(handle + 0x313C42), bytes);
 
 	let bytes = gen_jmp(primitive_ptr!(set_unknown_data_other) as usize);
-	write_bytes(primitive_ptr!(handle + 0x313D3A), bytes);
+	write_bytes(primitive_ptr!(handle + 0x313D38), bytes);
 
 	let bytes = gen_jmp(primitive_ptr!(set_crown_data_other) as usize);
-	write_bytes(primitive_ptr!(handle + 0x3140D9), bytes);
+	write_bytes(primitive_ptr!(handle + 0x3140D7), bytes);
 
 	let bytes = gen_jmp(primitive_ptr!(set_song_data) as usize);
-	write_bytes(primitive_ptr!(handle + 0x31367D), bytes);
+	write_bytes(primitive_ptr!(handle + 0x31367B), bytes);
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn AfterCard1Insert() {
+pub unsafe extern "C" fn BeforeCard1Insert() {
 	memset(SONG_DATA.unwrap(), 0, SONG_DATA_SIZE);
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn AfterCard2Insert() {
+pub unsafe extern "C" fn BeforeCard2Insert() {
 	memset(SONG_DATA.unwrap(), 0, SONG_DATA_SIZE);
 }
 
diff --git a/src/dllmain.c b/src/dllmain.c
index 130f35c..570cc1a 100644
--- a/src/dllmain.c
+++ b/src/dllmain.c
@@ -115,6 +115,10 @@ u16 __fastcall bnusio_GetCoin (i32 a1) {
 			    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 		bool hasInserted = false;
 		if (IsButtonTapped (CARD_INSERT_1)) {
+			for (int i = 0; plugins[i] != 0; i++) {
+				FARPROC insertEvent = GetProcAddress (plugins[i], "BeforeCard1Insert");
+				if (insertEvent) ((event *)insertEvent) ();
+			}
 			for (int i = 0; plugins[i] != 0; i++) {
 				FARPROC insertEvent = GetProcAddress (plugins[i], "Card1Insert");
 				if (insertEvent) {
@@ -127,11 +131,11 @@ u16 __fastcall bnusio_GetCoin (i32 a1) {
 				memcpy (cardData + 0x50, accessCode1, 21);
 				touchCallback (0, 0, cardData, touchData);
 			}
+		} else if (IsButtonTapped (CARD_INSERT_2)) {
 			for (int i = 0; plugins[i] != 0; i++) {
-				FARPROC insertEvent = GetProcAddress (plugins[i], "AfterCard1Insert");
+				FARPROC insertEvent = GetProcAddress (plugins[i], "BeforeCard2Insert");
 				if (insertEvent) ((event *)insertEvent) ();
 			}
-		} else if (IsButtonTapped (CARD_INSERT_2)) {
 			for (int i = 0; plugins[i] != 0; i++) {
 				FARPROC insertEvent = GetProcAddress (plugins[i], "Card2Insert");
 				if (insertEvent) ((event *)insertEvent) ();
@@ -142,10 +146,6 @@ u16 __fastcall bnusio_GetCoin (i32 a1) {
 				memcpy (cardData + 0x50, accessCode2, 21);
 				touchCallback (0, 0, cardData, touchData);
 			}
-			for (int i = 0; plugins[i] != 0; i++) {
-				FARPROC insertEvent = GetProcAddress (plugins[i], "AfterCard2Insert");
-				if (insertEvent) ((event *)insertEvent) ();
-			}
 		}
 	}
 	for (int i = 0; plugins[i] != 0; i++) {