diff --git a/Arcade_MiST/Toaplan v1 Hardware/rtl/ToaplanV1.sv b/Arcade_MiST/Toaplan v1 Hardware/rtl/ToaplanV1.sv
index 9eb7dfc3..47ffee6d 100644
--- a/Arcade_MiST/Toaplan v1 Hardware/rtl/ToaplanV1.sv	
+++ b/Arcade_MiST/Toaplan v1 Hardware/rtl/ToaplanV1.sv	
@@ -171,70 +171,62 @@ wire        hb, vb;
 wire  [4:0] r,b,g;
 
 ToaplanV1_Top ToaplanV1_Top(
-	.pll_locked   	( pll_locked ),
-	.clk_sys      	( clk_72     ),
-	.reset        	( reset      ),
-	.core_mod		( core_mod ),
-	.turbo_68k		( 0 ),//cpu_turbo
-	.pause_cpu		( 0 ),
-//	input					scrollDBG,
-	.p1_right		( m_right1 ),
-	.p1_left			( m_left1 ),
-	.p1_down			( m_down1 ),
-	.p1_up			( m_up1 ),
-	.p1_buttons		( m_fire1[3:0] ),
-	.p2_right		( m_right2 ),
-	.p2_left			( m_left2 ),
-	.p2_down			( m_down2 ),
-	.p2_up			( m_up2 ),
-	.p2_buttons		( m_fire2[3:0] ),
-	.start1			( m_one_player ),
-	.start2			( m_two_players ),
-	.coin_a			( m_coin1 ),
-	.coin_b			( m_coin2 ),
-	.b_pause			( 0 ),
-	.service			( key_test ),
-	.key_tilt		( key_tilt ),
-	.key_service	( key_service ),
-	.sw0				( dsw1 ),
-	.sw1				( dsw2 ),
-	.sw2				( dsw3 ),
+	.pll_locked   	( pll_locked 	),
+	.clk_sys      	( clk_72     	),
+	.reset        	( reset      	),
+	.p1_in			( {m_fire1[3:0],m_right1,m_left1,m_down1,m_up1} ),
+	.p2_in			( {m_fire2[3:0],m_right2,m_left2,m_down2,m_up2} ),
+	.sw0				( dsw1 			),
+	.sw1				( dsw2 			),
+	.sw2				( dsw3 			),
+	.start			( {m_two_players,m_one_player} ),
+	.coin				( {m_coin2,m_coin1} ),
+	.b_pause			( 0 				),
+	.service			( key_test 		),
+	.key_tilt		( key_tilt 		),
+	.key_service	( key_service 	),
 
-	.hblank        ( hb         ),
-	.vblank        ( vb         ),
-	.hsync        	( hs         ),
-	.vsync        	( vs         ),
-	.r            	( r          ),
-	.g            	( g          ),
-	.b            	( b          ),
-	.hs_offset		(0),
-	.vs_offset		(0),
-	.hs_width		(0),
-	.vs_width		(0),
-	.refresh_mod	(0),
+	
+	.core_mod		( core_mod 		),
+	.turbo_68k		( 0 				),
+	.pause_cpu		( 0 				),
+	.scrollDBG		( 0 				),
+	
+	.hblank			( hb         	),
+	.vblank			( vb         	),
+	.hsync			( hs         	),
+	.vsync			( vs         	),
+	.r            	( r          	),
+	.g            	( g          	),
+	.b            	( b          	),
+	.hs_offset		( 0				),
+	.vs_offset		( 0				),
+	.hs_width		( 0				),
+	.vs_width		( 0				),
+	.refresh_mod	( 0				),
 
-	.ntsc				(0),
-	.opl2_level		(2'b00),
+	.ntsc				( 0				),
+	.opl2_level		( 2'b00			),
 
 
-	.audio_l      	( laudio     ),
-	.audio_r      	( raudio     ),
+	.audio_l      	( laudio     	),
+	.audio_r      	( raudio     	),
 
-	.ioctl_download( ioctl_downl),
-	.ioctl_index	(ioctl_index),
+	.ioctl_download( ioctl_downl	),
+	.ioctl_index	( ioctl_index	),
 	.ioctl_addr   	( ioctl_addr - 2'd2 ),//check
-	.ioctl_wr     	( ioctl_wr   ),
-	.ioctl_dout   	( ioctl_dout ),
+	.ioctl_wr     	( ioctl_wr   	),
+	.ioctl_dout   	( ioctl_dout 	),
 
-	.SDRAM_A      	( SDRAM_A    ),
-	.SDRAM_BA     	( SDRAM_BA   ),
-	.SDRAM_DQ     	( SDRAM_DQ   ),
-	.SDRAM_DQML   	( SDRAM_DQML ),
-	.SDRAM_DQMH   	( SDRAM_DQMH ),
-	.SDRAM_nCS    	( SDRAM_nCS  ),
-	.SDRAM_nCAS   	( SDRAM_nCAS ),
-	.SDRAM_nRAS   	( SDRAM_nRAS ),
-	.SDRAM_nWE    	( SDRAM_nWE  )
+	.SDRAM_A      	( SDRAM_A    	),
+	.SDRAM_BA     	( SDRAM_BA   	),
+	.SDRAM_DQ     	( SDRAM_DQ   	),
+	.SDRAM_DQML   	( SDRAM_DQML 	),
+	.SDRAM_DQMH   	( SDRAM_DQMH 	),
+	.SDRAM_nCS    	( SDRAM_nCS  	),
+	.SDRAM_nCAS   	( SDRAM_nCAS 	),
+	.SDRAM_nRAS   	( SDRAM_nRAS 	),
+	.SDRAM_nWE    	( SDRAM_nWE  	)
 );
 
 mist_video #(.COLOR_DEPTH(5),.SD_HCNT_WIDTH(10)) mist_video(