diff --git a/src/mame/irem/m10.cpp b/src/mame/irem/m10.cpp
index 36c2fbc9ab4..0ea798b19d0 100644
--- a/src/mame/irem/m10.cpp
+++ b/src/mame/irem/m10.cpp
@@ -16,7 +16,7 @@ Notes:
 TODO:
 - DIP switches
 - andromed M-29S starfield
-- andromed coin is always 2 credits?
+
 
 Head On
 -------
@@ -591,6 +591,7 @@ static INPUT_PORTS_START( ipminvad )
 	PORT_DIPSETTING (   0x00, "3" )
 	PORT_DIPSETTING (   0x01, "4" )
 	PORT_DIPSETTING (   0x02, "5" )
+	PORT_DIPSETTING (   0x03, "6" )
 	PORT_DIPNAME( 0x04, 0x00, "Capsules" )
 	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x04, DEF_STR( Yes ) )
@@ -600,7 +601,7 @@ static INPUT_PORTS_START( ipminvad )
 	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Coin_A ) )
 	PORT_DIPSETTING(    0x10, DEF_STR( 2C_1C ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
-	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unused ) )  // Verified with debugger
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unused ) ) // Verified with debugger
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
 	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unused ) )
@@ -621,10 +622,11 @@ static INPUT_PORTS_START( skychut )
 	PORT_INCLUDE( ipminvad )
 
 	PORT_MODIFY("DSW")
-	PORT_DIPNAME(0x03, 0x00, DEF_STR( Lives ) )
-	PORT_DIPSETTING (  0x00, "3" )
-	PORT_DIPSETTING (  0x01, "4" )
-	PORT_DIPSETTING (  0x02, "5" )
+	PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) )
+	PORT_DIPSETTING (   0x00, "3" )
+	PORT_DIPSETTING (   0x01, "4" )
+//  PORT_DIPSETTING (   0x03, "4" ) // dupe
+	PORT_DIPSETTING (   0x02, "5" )
 	PORT_DIPUNKNOWN( 0x04, 0x00 )
 	PORT_DIPUNKNOWN( 0x08, 0x00 )
 	PORT_DIPUNKNOWN( 0x10, 0x00 )
@@ -641,12 +643,13 @@ static INPUT_PORTS_START( andromed )
 	PORT_DIPSETTING (   0x00, "3" )
 	PORT_DIPSETTING (   0x01, "4" )
 	PORT_DIPSETTING (   0x02, "5" )
+	PORT_DIPSETTING (   0x03, "6" )
 	PORT_DIPUNKNOWN( 0x04, 0x00 )
 	PORT_DIPUNKNOWN( 0x08, 0x00 )
-	PORT_DIPUNKNOWN( 0x10, 0x00 )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Free_Play ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x30, 0x10, DEF_STR( Coinage ) )
+	PORT_DIPSETTING( 0x10, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) )
 	PORT_DIPUNKNOWN( 0x40, 0x00 )
 	PORT_DIPUNKNOWN( 0x80, 0x00 )
 INPUT_PORTS_END
@@ -677,9 +680,9 @@ static INPUT_PORTS_START( spacbeam )
 	PORT_DIPSETTING (  0x00, "30000" )
 	PORT_DIPSETTING (  0x08, DEF_STR( None ) )
 	PORT_DIPNAME(0x30, 0x10, DEF_STR( Coinage ) )
-	PORT_DIPSETTING (  0x00, "Testmode" )
 	PORT_DIPSETTING (  0x10, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING (  0x20, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING (  0x00, DEF_STR( Free_Play ) )
 
 	PORT_START("FAKE")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, m10_state, coin_inserted, 0)
@@ -717,9 +720,9 @@ static INPUT_PORTS_START( headoni )
 	PORT_DIPSETTING (  0x00, "30000" )
 	PORT_DIPSETTING (  0x08, DEF_STR( None ) )
 	PORT_DIPNAME(0x30, 0x10, DEF_STR( Coinage ) )
-	PORT_DIPSETTING (  0x00, "Testmode" )
 	PORT_DIPSETTING (  0x10, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING (  0x20, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING (  0x00, DEF_STR( Free_Play ) )
 
 //  PORT_START("VR1")
 //  PORT_ADJUSTER( 50, "Car Rumble Volume" )
@@ -770,9 +773,9 @@ static INPUT_PORTS_START( greenber )
 	PORT_DIPSETTING (  0x00, "5000" )
 	PORT_DIPSETTING (  0x08, "7000" )
 	PORT_DIPNAME(0x30, 0x20, DEF_STR( Coinage ) )
-	PORT_DIPSETTING (  0x00, "Testmode" )
 	PORT_DIPSETTING (  0x20, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING (  0x10, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING (  0x00, DEF_STR( Free_Play ) )
 
 	PORT_START("FAKE")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, m10_state, coin_inserted, 0)
diff --git a/src/mame/irem/m10.h b/src/mame/irem/m10.h
index 2d90c162f1c..53e03406c8b 100644
--- a/src/mame/irem/m10.h
+++ b/src/mame/irem/m10.h
@@ -81,14 +81,11 @@ protected:
 	// video-related
 	tilemap_t * m_tx_tilemap;
 
-	// this is currently unused, because it is needed by gfx_layout (which has no machine)
-	uint32_t extyoffs[32 * 8];
-
 	// video state
-	uint8_t m_flip;
+	uint8_t m_flip = 0;
 
 	// misc
-	int m_last;
+	int m_last = 0;
 	emu_timer *m_interrupt_timer;
 
 	TILEMAP_MAPPER_MEMBER(tilemap_scan);
diff --git a/src/mame/irem/m10_v.cpp b/src/mame/irem/m10_v.cpp
index b687204f4c5..5ef797a61f2 100644
--- a/src/mame/irem/m10_v.cpp
+++ b/src/mame/irem/m10_v.cpp
@@ -20,7 +20,6 @@ static const uint32_t extyoffs[] =
 	STEP256(0, 8)
 };
 
-
 static const gfx_layout backlayout =
 {
 	8,8*32, // 8*(8*32) characters