diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index e1873e15053..707a810f95c 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -553,7 +553,6 @@ WRITE8_MEMBER(fortyl_state::undoukai_mcu_w)
 
 READ8_MEMBER(fortyl_state::undoukai_mcu_r)
 {
-
 	//  logerror("mcu_r %02x\n", m_from_mcu);
 
 	return m_from_mcu;
@@ -769,11 +768,11 @@ static INPUT_PORTS_START( 40love )
 	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Free_Play ) )	PORT_DIPLOCATION("SW1:3")
 	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x18, 0x10, DEF_STR( Lives ) )		PORT_DIPLOCATION("SW1:4,5")
+	PORT_DIPNAME( 0x18, 0x18, DEF_STR( Lives ) )		PORT_DIPLOCATION("SW1:4,5")
 	PORT_DIPSETTING(    0x00, "1" )
-	PORT_DIPSETTING(    0x08, "2" )
-	PORT_DIPSETTING(    0x10, "3" )
-	PORT_DIPSETTING(    0x18, "4" )
+	PORT_DIPSETTING(    0x18, "3" )
+	PORT_DIPSETTING(    0x10, "5" )
+	PORT_DIPSETTING(    0x08, "6" )
 	PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SW1:6" )
 	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Flip_Screen ) )	PORT_DIPLOCATION("SW1:7")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
@@ -823,28 +822,28 @@ static INPUT_PORTS_START( 40love )
 	PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "SW3:2" )
 	PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "SW3:3" )
 	PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW3:4" )
-	PORT_DIPNAME( 0x10, 0x10, "Display Credit Settings" )	PORT_DIPLOCATION("SW3:5")
+	PORT_DIPNAME( 0x10, 0x10, "Coinage Display" )			PORT_DIPLOCATION("SW3:5")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x20, "Year Display" )				PORT_DIPLOCATION("SW3:6")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, "Score points to: (Cheat)")	PORT_DIPLOCATION("SW3:7")
-	PORT_DIPSETTING(    0x40, "Winner" )
-	PORT_DIPSETTING(    0x00, "Human" )
-	PORT_DIPNAME( 0x80, 0x00, "Coin Door Type" )			PORT_DIPLOCATION("SW3:8")
-	PORT_DIPSETTING(    0x00, "Single Slot" )
-	PORT_DIPSETTING(    0x80, "Double Slot" )
+	PORT_DIPNAME( 0x40, 0x40, "Player Always Wins (Cheat)")	PORT_DIPLOCATION("SW3:7")
+	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x80, "Coin Slots" )				PORT_DIPLOCATION("SW3:8")
+	PORT_DIPSETTING(    0x00, "1" )
+	PORT_DIPSETTING(    0x80, "2" )
 
 	PORT_START("SYSTEM")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )	//??
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )	//??
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_COIN1 )	//OK
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH,IPT_COIN2 )	//OK
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 )	//OK
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )	//OK
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )	//OK
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )	//OK
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )	// ?
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )	// ?
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH,IPT_COIN1 )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH,IPT_COIN2 )
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
 
 	PORT_START("P1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -853,7 +852,7 @@ static INPUT_PORTS_START( 40love )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 )	// ?
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 )
 
 	PORT_START("P2")
@@ -863,7 +862,7 @@ static INPUT_PORTS_START( 40love )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_COCKTAIL
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_COCKTAIL	// ?
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_COCKTAIL
 INPUT_PORTS_END
 
@@ -1023,6 +1022,7 @@ static MACHINE_RESET( common )
 	state->m_pix1 = 0;
 	state->m_pix2[0] = 0;
 	state->m_pix2[1] = 0;
+
 	/* sound */
 	state->m_sound_nmi_enable = 0;
 	state->m_pending_nmi = 0;