diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp
index 747f7b547d6..61b223bc4dc 100644
--- a/src/mame/drivers/mpu4vid.cpp
+++ b/src/mame/drivers/mpu4vid.cpp
@@ -201,6 +201,7 @@ TODO:
 #include "crmaze2p.lh"
 #include "crmaze4p.lh"
 #include "v4addlad.lh"
+#include "v4barqst.lh"
 #include "v4strike.lh"
 
 
@@ -612,64 +613,52 @@ uint8_t mpu4vid_state::pia_ic5_porta_track_r()
  *  Input defintions
  *
  *************************************/
-
-
-
-static INPUT_PORTS_START( crmaze )
-	PORT_START("ORANGE1")
-	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+INPUT_PORTS_START( mpu4vid )
+	PORT_START("ORANGE1") //0 - 7
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("00")//  20p level
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("01")// 100p level
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("02")// Token 1 level
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("03")// Token 2 level
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("04")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("05")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("06")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("07")
 
 	PORT_START("ORANGE2")
-	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("08")// 8 - 11 is JP Key
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("09")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("10")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("11")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("12")// 12 - 15 is % Key
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("13")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("14")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("15")
 
 	PORT_START("BLACK1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) 	PORT_NAME("16")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER)	PORT_NAME("17")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("18")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("19")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("20")
 	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
 	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox (Back) Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
 
 	PORT_START("BLACK2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Right Yellow")
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Right Red")
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Left Red")
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Left Yellow")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Getout Yellow")
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Escape/Getout Red")/* Labelled Escape on cabinet */
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("24")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("25")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("26")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("27")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("28")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("29")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("30")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1)
 
 	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
 	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "DIL201" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPNAME( 0x01, 0x00, "1 Pound for change" ) PORT_DIPLOCATION("DIL2:01")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
 	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
@@ -678,23 +667,66 @@ static INPUT_PORTS_START( crmaze )
 	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL204" ) PORT_DIPLOCATION("DIL2:04")
+	PORT_DIPNAME( 0x08, 0x00, "Attract mode inhibit" ) PORT_DIPLOCATION("DIL2:04")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
 	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL206" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPNAME( 0x20, 0x00, "Coin alarm inhibit" ) PORT_DIPLOCATION("DIL2:06")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
 	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL208" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPNAME( 0x80, 0x00, "Single coin entry" ) PORT_DIPLOCATION("DIL2:08")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
 
 	PORT_START("AUX1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_0")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_1")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_2")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_3")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_4")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_5")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_6")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_7")
+
+	PORT_START("AUX2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM) //Lockouts, in same order as below
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM) 
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM) 
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM) 
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")//PORT_IMPULSE(5)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")//PORT_IMPULSE(5)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")//PORT_IMPULSE(5)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")//PORT_IMPULSE(5)
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( crmaze )
+	PORT_INCLUDE( mpu4vid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x1F, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Right Yellow")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Right Red")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Left Red")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Left Yellow")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("Getout Yellow")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Escape/Getout Red")/* Labelled Escape on cabinet */
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("AUX1")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
@@ -704,16 +736,6 @@ static INPUT_PORTS_START( crmaze )
 	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_CUSTOM)//XB
 	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_CUSTOM)//YB
 
-	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")
-
 	PORT_START("TRACKX")//FAKE
 	PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_INVERT
 	PORT_START("TRACKY")//FAKE
@@ -721,37 +743,9 @@ static INPUT_PORTS_START( crmaze )
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( mating )
-	PORT_START("ORANGE1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("ORANGE2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("BLACK1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill/Meter Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
-
-	PORT_START("BLACK2")
+	PORT_INCLUDE( crmaze )
+	
+	PORT_MODIFY("BLACK2")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Left Red")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Left Yellow")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -761,233 +755,82 @@ static INPUT_PORTS_START( mating )
 	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+INPUT_PORTS_END
 
-	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "DIL201" ) PORT_DIPLOCATION("DIL2:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL204" ) PORT_DIPLOCATION("DIL2:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL206" ) PORT_DIPLOCATION("DIL2:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL208" ) PORT_DIPLOCATION("DIL2:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+static INPUT_PORTS_START( barquest )
+	PORT_INCLUDE( mpu4vid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("AUX1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_CUSTOM)//XA
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_CUSTOM)//YA
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_CUSTOM)//XB
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_CUSTOM)//YB
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) 
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("C")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("B")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("A")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Pass")
 
-	PORT_START("TRACKX")//FAKE
-	PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_INVERT
-	PORT_START("TRACKY")//FAKE
-	PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_INVERT
+	PORT_MODIFY("BLACK2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("C")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("B")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON9) PORT_NAME("A")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("Continue")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Collect")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1)
 
+	PORT_MODIFY("AUX1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
 
-
 static INPUT_PORTS_START( skiltrek )
-	PORT_START("ORANGE1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_INCLUDE( mpu4vid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("ORANGE2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("BLACK1")
+	PORT_MODIFY("BLACK1")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Pass")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("C")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("B")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("A")
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
 
-	PORT_START("BLACK2")
+	PORT_MODIFY("BLACK2")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Continue")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("C")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("B")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("A")
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_START1)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0xE0, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
-
-	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "1 Pound for change" ) PORT_DIPLOCATION("DIL2:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "Attract mode inhibit" ) PORT_DIPLOCATION("DIL2:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "Coin alarm inhibit" ) PORT_DIPLOCATION("DIL2:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "Single coin entry" ) PORT_DIPLOCATION("DIL2:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
-
-	PORT_START("AUX1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")//PORT_IMPULSE(5)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")//PORT_IMPULSE(5)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")//PORT_IMPULSE(5)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")//PORT_IMPULSE(5)
+	PORT_MODIFY("AUX1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( turnover )
-	PORT_START("ORANGE1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_INCLUDE( mpu4vid )
+	
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("ORANGE2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("BLACK1")
+	PORT_MODIFY("BLACK1")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Pass")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("C")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("B")
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("A")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
 
-	PORT_START("BLACK2")
+	PORT_MODIFY("BLACK2")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Continue")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("C")
@@ -997,192 +840,35 @@ static INPUT_PORTS_START( turnover )
 	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1)
 
-	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
-
-	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "1 Pound for change" ) PORT_DIPLOCATION("DIL2:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "Attract mode inhibit" ) PORT_DIPLOCATION("DIL2:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "Coin alarm inhibit" ) PORT_DIPLOCATION("DIL2:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "Single coin entry" ) PORT_DIPLOCATION("DIL2:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
-
-	PORT_START("AUX1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")//PORT_IMPULSE(5)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")//PORT_IMPULSE(5)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")//PORT_IMPULSE(5)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")//PORT_IMPULSE(5)
+	PORT_MODIFY("AUX1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
 
 static INPUT_PORTS_START( adders )
-	PORT_START("ORANGE1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_INCLUDE( mpu4vid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("ORANGE2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("BLACK1")
+	PORT_MODIFY("BLACK1")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("C")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("B")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("A")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Pass")
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Collect")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
 
-	PORT_START("BLACK2")
+	PORT_MODIFY("BLACK2")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("C")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("B")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("A")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Continue")
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_START1)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
-
-	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "1 Pound for change" ) PORT_DIPLOCATION("DIL2:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "Attract mode inhibit" ) PORT_DIPLOCATION("DIL2:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "Coin alarm inhibit" ) PORT_DIPLOCATION("DIL2:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "Single coin entry" ) PORT_DIPLOCATION("DIL2:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
-
-	PORT_START("AUX1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")//PORT_IMPULSE(5)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")//PORT_IMPULSE(5)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")//PORT_IMPULSE(5)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")//PORT_IMPULSE(5)
+	PORT_MODIFY("AUX1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( v4psi )
@@ -1209,7 +895,31 @@ static INPUT_PORTS_START( v4psi )
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start 30p")
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Start 50p")
 	
-	// TODO: dips, cfr. test mode
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Allow Multiple Credits" ) PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Payout when Empty?" ) PORT_DIPLOCATION("DIL2:03")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x08, 0x00, "Bank Win" ) PORT_DIPLOCATION("DIL2:04")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x08, "Pay Live" )
+	PORT_DIPNAME( 0x10, 0x00, "Collect Mode" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, "Credit and Bank" )
+	PORT_DIPSETTING(    0x10, "Bank Only" )
+	PORT_DIPNAME( 0x20, 0x00, "Hall of Fame Entry" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPSETTING(    0x00, "Full Names" )
+	PORT_DIPSETTING(    0x20, "Initials" )
+	PORT_DIPNAME( 0x40, 0x00, "Long Game" ) PORT_DIPLOCATION("DIL2:07")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x80, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Yes  ) )
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( v4tetris )
@@ -1236,121 +946,66 @@ static INPUT_PORTS_START( v4tetris )
 	PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 	
 	// TODO: dips
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Allow Multiple Credits" ) PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Demo Mode" ) PORT_DIPLOCATION("DIL2:03")
+	PORT_DIPSETTING(    0x00, "Continuous" )
+	PORT_DIPSETTING(    0x04, "Cancelled @5min" )
+	PORT_DIPNAME( 0x08, 0x00, "Odd 10p" ) PORT_DIPLOCATION("DIL2:04")
+	PORT_DIPSETTING(    0x00, "Lost @2min" )
+	PORT_DIPSETTING(    0x08, "Never Lost" )
+	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x20, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x80, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Yes  ) )
+
 INPUT_PORTS_END
 
 
 static INPUT_PORTS_START( strike )
-	PORT_START("ORANGE1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("Freeze")
+	PORT_INCLUDE( mpu4vid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON9) PORT_NAME("Freeze")
 	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON9) PORT_NAME("Go On!")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON10) PORT_NAME("Go On!")
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("ORANGE2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("BLACK1")
+	PORT_MODIFY("BLACK1")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Play")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_START2)  PORT_NAME("Play")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Green (Left)")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Yellow (Left)")
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Red (Left)")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
 
-	PORT_START("BLACK2")
+	PORT_MODIFY("BLACK2")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED) 
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("Help")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("Green (Right)")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Yellow (Right)")
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Red (Right)")
 	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_GAMBLE_PAYOUT) PORT_NAME("Collect")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("Collect")
 	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1)
 
-	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
-
-	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "1 Pound for change" ) PORT_DIPLOCATION("DIL2:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "Attract mode inhibit" ) PORT_DIPLOCATION("DIL2:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "Coin alarm inhibit" ) PORT_DIPLOCATION("DIL2:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "Single coin entry" ) PORT_DIPLOCATION("DIL2:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
-
-	PORT_START("AUX1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")//PORT_IMPULSE(5)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")//PORT_IMPULSE(5)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")//PORT_IMPULSE(5)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")//PORT_IMPULSE(5)
+	PORT_MODIFY("AUX1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
 WRITE_LINE_MEMBER(mpu4vid_state::mpu_video_reset)
@@ -1462,7 +1117,7 @@ void mpu4vid_state::bwbvid5_68k_map(address_map &map)
 	map(0x800000, 0x80ffff).ram().share("vid_mainram");
 	map(0x810000, 0x81ffff).ram(); /* ? */
 	map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff).mirror(0x000004);
-	map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)).umask16(0x00ff); //BT RAMDAC?
+	map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)).umask16(0x00ff); //BT RAMDAC on some games?
 	map(0xa00002, 0xa00003).nopr(); // uses a clr instruction on address which generates a dummy read
 	map(0xa00003, 0xa00003).w("ef9369", FUNC(ef9369_device::address_w)).umask16(0x00ff);
 //  map(0xa00000, 0xa00003).rw(FUNC(mpu4vid_state::bt471_r), FUNC(mpu4vid_state::bt471_w)).umask16(0x00ff); Some games use this
@@ -2725,8 +2380,6 @@ ROM_START( v4skltrk )
 	VID_BIOS
 
 	ROM_REGION( 0x800000, "video", 0 )
-
-
 	ROM_LOAD16_BYTE( "st.p1",  0x000000, 0x010000,  CRC(d9de47a5) SHA1(625bf40780203293fc34cd8cea8278b4b4a52a75) )
 	ROM_LOAD16_BYTE( "st.p2",  0x000001, 0x010000,  CRC(b62575c2) SHA1(06d75e8a364750663d329650720021279e195236) )
 	ROM_LOAD16_BYTE( "st.p3",  0x020000, 0x010000,  CRC(9506da76) SHA1(6ef28ab8ec1af455be8ecfab20243f0823dca7c1) )
@@ -3137,7 +2790,7 @@ ROM_START( v4barqst )
 	ROM_REGION( 0x800000, "video", 0 )
 	ROM_LOAD16_BYTE( "bq-6.p1", 0x000000, 0x010000, CRC(f5f81993) SHA1(5975da2b944a8e9cb4bb285d87d64740d9ec045b) )
 	ROM_LOAD16_BYTE( "bq-6.p2", 0x000001, 0x010000, CRC(b9ce9f2e) SHA1(9407a83d1713b641dc551dd73f357d99baebbba2) )
-	ROM_LOAD16_BYTE( "bq-iss4.p1", 0x020000, 0x010000, CRC(f8c9e00b) SHA1(b0081756667068eaaf02f34a161b52024e163018) )
+	ROM_LOAD16_BYTE( "bq-iss4.p1", 0x020000, 0x010000, CRC(f8c9e00b) SHA1(b0081756667068eaaf02f34a161b52024e163018) ) //ISSUE4
 	ROM_LOAD16_BYTE( "bq-iss4.p2", 0x020001, 0x010000, CRC(211d7779) SHA1(c1d835dd4758f28b7bd4e81ea5d3316704fe8ff3) )
 	ROM_LOAD16_BYTE( "bq-iss4.p3", 0x040000, 0x010000, CRC(b6066dec) SHA1(63f66f004f6c66dc1bd61385407e1adb4a678ccd) )
 	ROM_LOAD16_BYTE( "bq-iss4.p4", 0x040001, 0x010000, CRC(71a2a3cf) SHA1(41d95d34b801f54bf4f1044d7bb88704c9a318a0) )
@@ -3161,7 +2814,7 @@ ROM_START( v4barqstd )
 	ROM_REGION( 0x800000, "video", 0 )
 	ROM_LOAD16_BYTE( "bqd.p1", 0x000000, 0x010000, CRC(b574ea46) SHA1(0eb446fbf4f7fcd1b30f35631b4b521730ce26b4) )
 	ROM_LOAD16_BYTE( "bq.p2",  0x000001, 0x010000, CRC(b9ce9f2e) SHA1(9407a83d1713b641dc551dd73f357d99baebbba2) )
-	ROM_LOAD16_BYTE( "bq-iss4.p1", 0x020000, 0x010000, CRC(f8c9e00b) SHA1(b0081756667068eaaf02f34a161b52024e163018) )
+	ROM_LOAD16_BYTE( "bq-iss4.p1", 0x020000, 0x010000, CRC(f8c9e00b) SHA1(b0081756667068eaaf02f34a161b52024e163018) ) //ISSUE4
 	ROM_LOAD16_BYTE( "bq-iss4.p2", 0x020001, 0x010000, CRC(211d7779) SHA1(c1d835dd4758f28b7bd4e81ea5d3316704fe8ff3) )
 	ROM_LOAD16_BYTE( "bq-iss4.p3", 0x040000, 0x010000, CRC(b6066dec) SHA1(63f66f004f6c66dc1bd61385407e1adb4a678ccd) )
 	ROM_LOAD16_BYTE( "bq-iss4.p4", 0x040001, 0x010000, CRC(71a2a3cf) SHA1(41d95d34b801f54bf4f1044d7bb88704c9a318a0) )
@@ -3899,7 +3552,7 @@ ROM_START( v4pztet )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "tc______.2_0", 0x0000, 0x010000, CRC(9a94ccaf) SHA1(42988a22c26f88fa07c1ab68a85f15bc3af0a71c) )
 
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
+	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS - Datapak?
 	ROM_LOAD( "tc____d_.2_0", 0x0000, 0x010000, CRC(d1312b0e) SHA1(d1ba8f49a0b30771f5ffbaaf3f8b6142965a8330) )
 
 	ROM_REGION( 0x800000, "video", 0 )
@@ -3919,7 +3572,7 @@ ROM_START( v4pzteta )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "tp______.2_0", 0x0000, 0x010000, CRC(17757b59) SHA1(013690047e2769c420a9422c662990a71e1bd09d) )
 
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
+	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS - Datapak?
 	ROM_LOAD( "tp____d_.2_0", 0x0000, 0x010000, CRC(5cd09cf8) SHA1(3c288169f9bd49affaaa4e1f5f0fdddf52f381a8) )
 
 	ROM_REGION( 0x800000, "video", 0 )
@@ -4116,7 +3769,7 @@ the copyright dates recorded.
 TODO: Sort these better given the wide variation in dates/versions/core code (SWP version id, for one thing).
 */
 
-GAME(  199?, v4bios,     0,        mod2,       mpu4,     mpu4_state,    empty_init,     ROT0, "Barcrest","MPU4 Video Firmware",MACHINE_IS_BIOS_ROOT )
+GAME(  199?, v4bios,     0,        mod2,       mpu4vid,     mpu4_state,    empty_init,     ROT0, "Barcrest","MPU4 Video Firmware",MACHINE_IS_BIOS_ROOT )
 
 #define GAME_FLAGS MACHINE_NOT_WORKING
 
@@ -4148,17 +3801,17 @@ GAME(  1996?,v4mated,    v4mate,   mating,     mating,   mpu4vid_state, init_mat
 
 /* Quiz games - Questions decoded */
 
-GAMEL(  1989, v4addlad,   v4bios,   mpu4_vid_strike,   adders,   mpu4vid_state, init_strikeit,    ROT0, "Barcrest","Adders and Ladders (v2.1) (MPU4 Video)",GAME_FLAGS,layout_v4addlad )
-GAMEL(  1989, v4addladd,  v4addlad, mpu4_vid_strike,   adders,   mpu4vid_state, init_strikeit,    ROT0, "Barcrest","Adders and Ladders (v2.1d) (MPU4 Video)",GAME_FLAGS,layout_v4addlad )
-GAMEL(  1989, v4addlad20, v4addlad, mpu4_vid_strike,   adders,   mpu4vid_state, init_strikeit,    ROT0, "Barcrest","Adders and Ladders (v2.0) (MPU4 Video)",GAME_FLAGS,layout_v4addlad )
+GAMEL(  1989, v4addlad,   v4bios,   mpu4_vid_strike,   adders,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Adders and Ladders (v2.1) (MPU4 Video)",GAME_FLAGS,layout_v4addlad )
+GAMEL(  1989, v4addladd,  v4addlad, mpu4_vid_strike,   adders,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Adders and Ladders (v2.1d) (MPU4 Video)",GAME_FLAGS,layout_v4addlad )
+GAMEL(  1989, v4addlad20, v4addlad, mpu4_vid_strike,   adders,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Adders and Ladders (v2.0) (MPU4 Video)",GAME_FLAGS,layout_v4addlad )
 
 GAMEL(  199?, v4strike,   v4bios,   mpu4_vid_strike,   strike,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.5) (MPU4 Video)",GAME_FLAGS,layout_v4strike )
 GAMEL(  199?, v4striked,  v4strike, mpu4_vid_strike,   strike,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.5, Datapak) (MPU4 Video)",GAME_FLAGS,layout_v4strike )
 GAMEL(  199?, v4strike2,  v4strike, mpu4_vid_strike,   strike,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.53) (MPU4 Video)",GAME_FLAGS,layout_v4strike )
 GAMEL(  199?, v4strike2d, v4strike, mpu4_vid_strike,   strike,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.53, Datapak) (MPU4 Video)",GAME_FLAGS,layout_v4strike )
 
-GAME(  199?, v4barqst,   v4bios,   mpu4_vid_strike,   mpu4,     mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Barquest (v2.6) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4barqstd,  v4barqst, mpu4_vid_strike,   mpu4,     mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Barquest (v2.6d) (MPU4 Video)",GAME_FLAGS )
+GAMEL(  199?, v4barqst,   v4bios,   mpu4_vid_strike,   barquest,  mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Barquest (v2.6) (MPU4 Video)",GAME_FLAGS,layout_v4barqst )
+GAMEL(  199?, v4barqstd,  v4barqst, mpu4_vid_strike,   barquest,  mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Barquest (v2.6d) (MPU4 Video)",GAME_FLAGS,layout_v4barqst )
 
 /* Quiz games - Questions not decoded properly on games below (no complete characteriser table) */
 
@@ -4173,21 +3826,21 @@ GAME(  1989, v4time,     v4bios,   mpu4_vid,   skiltrek, mpu4vid_state, init_tim
 
 GAME(  1990, v4sklcsh,   v4bios,   mpu4_vid,   skiltrek, mpu4vid_state, init_v4barqst,  ROT0, "Barcrest","Skill Cash (v1.1) (MPU4 Video)",GAME_FLAGS )
 
-GAME(  199?, v4eyedwn,   v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_eyesdown,  ROT0, "Barcrest","Eyes Down (v1.3) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4eyedwnd,  v4eyedwn, mpu4_vid,   mpu4,     mpu4vid_state, init_eyesdown,  ROT0, "Barcrest","Eyes Down (v1.3, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4eyedwn,   v4bios,   mpu4_vid,   mpu4vid,     mpu4vid_state, init_eyesdown,  ROT0, "Barcrest","Eyes Down (v1.3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4eyedwnd,  v4eyedwn, mpu4_vid,   mpu4vid,   mpu4vid_state, init_eyesdown,  ROT0, "Barcrest","Eyes Down (v1.3, Datapak) (MPU4 Video)",GAME_FLAGS )
 
-GAME(  199?, v4quidgr,   v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v1.2) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4quidgrd,  v4quidgr, mpu4_vid,   mpu4,     mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v1.2, Datapak) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4quidgr2,  v4quidgr, mpu4_vid,   mpu4,     mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v2.4) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4quidgr2d, v4quidgr, mpu4_vid,   mpu4,     mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v2.4, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4quidgr,   v4bios,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v1.2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4quidgrd,  v4quidgr, mpu4_vid,   mpu4vid,   mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v1.2, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4quidgr2,  v4quidgr, mpu4_vid,   mpu4vid,   mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v2.4) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4quidgr2d, v4quidgr, mpu4_vid,   mpu4vid,   mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v2.4, Datapak) (MPU4 Video)",GAME_FLAGS )
 
-GAME(  199?, v4barqs2,   v4bios,   mpu4_vid,          mpu4,     mpu4vid_state, init_v4barqst2, ROT0, "Barcrest","Barquest 2 (v0.3) (MPU4 Video)",GAME_FLAGS )
+GAMEL( 199?, v4barqs2,   v4bios,   mpu4_vid,   barquest,   mpu4vid_state, init_v4barqst2, ROT0, "Barcrest","Barquest 2 (v0.3) (MPU4 Video)",GAME_FLAGS,layout_v4barqst )
 
-GAME(  199?, v4wize,     v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.3d) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4wizea,    v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4wize,     v4bios,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.3d) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4wizea,    v4bios,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.2) (MPU4 Video)",GAME_FLAGS )
 
-GAME(  1991, v4opt3,     v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_v4opt3,    ROT0, "Barcrest","Option 3 (v1.0) (MPU4 Video)",GAME_FLAGS )
-GAME(  1991, v4opt3d,    v4opt3,   mpu4_vid,   mpu4,     mpu4vid_state, init_v4opt3,    ROT0, "Barcrest","Option 3 (v1.0) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  1991, v4opt3,     v4bios,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4opt3,    ROT0, "Barcrest","Option 3 (v1.0) (MPU4 Video)",GAME_FLAGS )
+GAME(  1991, v4opt3d,    v4opt3,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4opt3,    ROT0, "Barcrest","Option 3 (v1.0) (Datapak) (MPU4 Video)",GAME_FLAGS )
 
 /* Games below are newer BwB games and use their own BIOS ROMs and hardware setups*/
 
@@ -4264,7 +3917,7 @@ GAME(  199?, v4frfact,   v4bios,   crmaze,     crmaze,   mpu4vid_state, init_bwb
 
 /* Nova - is this the same video board? One of the games displays 'Resetting' but the others do nothing interesting and access strange addresses */
 /* All contain BwB video in the BIOS rom tho */
-
+/* These seem to use the other palette chip (BT471). and use the German BwB bank setup, so may need more work */
 GAME(  199?, v4miami,    0,        bwbvid5,    mpu4,     mpu4vid_state, init_bwbhack,    ROT0, "Nova","Miami Dice (Nova, German) (MPU4 Video)",GAME_FLAGS ) // runs if door open
 
 GAME(  199?, v4cybcas,   0,        bwbvid5,    mpu4,     mpu4vid_state, init_cybcas,     ROT0, "Nova","Cyber Casino (Nova, German) (MPU4 Video)",GAME_FLAGS )
diff --git a/src/mame/layout/v4barqst.lay b/src/mame/layout/v4barqst.lay
new file mode 100644
index 00000000000..00019edd5e7
--- /dev/null
+++ b/src/mame/layout/v4barqst.lay
@@ -0,0 +1,603 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+	<element name="£10" defstate="0">
+		<text string="£10" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="£10" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="£5" defstate="0">
+		<text string="£5" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="£5" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="£3" defstate="0">
+		<text string="£3" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="£3" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="£2" defstate="0">
+		<text string="£2" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="£2" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="£1" defstate="0">
+		<text string="£1" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="£1" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="50p" defstate="0">
+		<text string="50p" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="50p" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="20p" defstate="0">
+		<text string="20p" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="20p" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="10p" defstate="0">
+		<text string="10p" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="10p" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="LIT" defstate="0">
+		<text string="LIT" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="LIT" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="8" defstate="0">
+		<text string="8" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="8" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="7" defstate="0">
+		<text string="7" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="7" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="6" defstate="0">
+		<text string="6" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="6" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="5" defstate="0">
+		<text string="5" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="5" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="4" defstate="0">
+		<text string="4" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="4" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="3" defstate="0">
+		<text string="3" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="3" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="2" defstate="0">
+		<text string="2" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="2" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="1" defstate="0">
+		<text string="1" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="1" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="BAR" defstate="0">
+		<text string="BAR" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="BAR" state="1">
+			<color red="0.8" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+
+	<element name="Q" defstate="0">
+		<text string="Q" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="Q" state="1">
+			<color red="0.2" green="0.8" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+
+	<element name="A" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.5" green="0.0" blue="0.0" />
+		</rect>
+		<text string="A" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="0.0" blue="0.0" />
+		</rect>
+		<text string="A" state="1">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="B" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.5" blue="0.0" />
+		</rect>
+		<text string="B" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="1.0" blue="0.0" />
+		</rect>
+		<text string="B" state="1">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="C" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="0.5" />
+		</rect>
+		<text string="C" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="1.0" />
+		</rect>
+		<text string="C" state="1">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="CONTINUE" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.5" green="0.2" blue="0.0" />
+		</rect>
+		<text string="CONTINUE" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="0.4" blue="0.0" />
+		</rect>
+		<text string="CONTINUE" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="PASS" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.5" green="0.2" blue="0.0" />
+		</rect>
+		<text string="PASS" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="0.4" blue="0.0" />
+		</rect>
+		<text string="PASS" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+
+	<element name="COLLECT" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.3" green="0.3" blue="0.0" />
+		</rect>
+		<text string="COLLECT" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="1.0" blue="0.0" />
+		</rect>
+		<text string="COLLECT" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	
+	<element name="START" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.3" blue="0.0" />
+		</rect>
+		<text string="START" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="1.0" blue="0.0" />
+		</rect>
+		<text string="START" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+
+
+
+
+	<view name="Monitor and Lamps">
+		<bezel name="lamp7" element="8" state="0">
+			<bounds x="150" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp7" element="BAR" state="0">
+			<bounds x="170" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp6" element="LIT" state="0">
+			<bounds x="190" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp5" element="£10" state="0">
+			<bounds x="210" y="0" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp15" element="7" state="0">
+			<bounds x="150" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp15" element="BAR" state="0">
+			<bounds x="170" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp14" element="LIT" state="0">
+			<bounds x="190" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp13" element="£5" state="0">
+			<bounds x="210" y="20" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp23" element="6" state="0">
+			<bounds x="150" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp23" element="BAR" state="0">
+			<bounds x="170" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp22" element="LIT" state="0">
+			<bounds x="190" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp21" element="£3" state="0">
+			<bounds x="210" y="40" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp31" element="5" state="0">
+			<bounds x="150" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp31" element="BAR" state="0">
+			<bounds x="170" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp30" element="LIT" state="0">
+			<bounds x="190" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp29" element="£2" state="0">
+			<bounds x="210" y="60" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp39" element="4" state="0">
+			<bounds x="150" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp39" element="BAR" state="0">
+			<bounds x="170" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp38" element="LIT" state="0">
+			<bounds x="190" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp37" element="£1" state="0">
+			<bounds x="210" y="80" width="20" height="20"/>
+		</bezel>
+
+
+		<bezel name="lamp47" element="3" state="0">
+			<bounds x="150" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp47" element="BAR" state="0">
+			<bounds x="170" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp46" element="LIT" state="0">
+			<bounds x="190" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp45" element="50p" state="0">
+			<bounds x="210" y="100" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp55" element="2" state="0">
+			<bounds x="150" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp55" element="BAR" state="0">
+			<bounds x="170" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp54" element="LIT" state="0">
+			<bounds x="190" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp53" element="20p" state="0">
+			<bounds x="210" y="120" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp63" element="1" state="0">
+			<bounds x="150" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp63" element="BAR" state="0">
+			<bounds x="170" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp62" element="LIT" state="0">
+			<bounds x="190" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp61" element="10p" state="0">
+			<bounds x="210" y="140" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp80" element="Q" state="0">
+			<bounds x="0" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp81" element="Q" state="0">
+			<bounds x="20" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp82" element="BAR" state="0">
+			<bounds x="40" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp83" element="Q" state="0">
+			<bounds x="60" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp84" element="Q" state="0">
+			<bounds x="80" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp85" element="Q" state="0">
+			<bounds x="100" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp86" element="BAR" state="0">
+			<bounds x="120" y="30" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp88" element="Q" state="0">
+			<bounds x="0" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp89" element="BAR" state="0">
+			<bounds x="20" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp90" element="Q" state="0">
+			<bounds x="40" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp91" element="Q" state="0">
+			<bounds x="60" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp92" element="BAR" state="0">
+			<bounds x="80" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp93" element="Q" state="0">
+			<bounds x="100" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp94" element="Q" state="0">
+			<bounds x="120" y="50" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp96" element="BAR" state="0">
+			<bounds x="0" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp97" element="Q" state="0">
+			<bounds x="20" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp98" element="Q" state="0">
+			<bounds x="40" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp99" element="BAR" state="0">
+			<bounds x="60" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp100" element="Q" state="0">
+			<bounds x="80" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp101" element="BAR" state="0">
+			<bounds x="100" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp102" element="Q" state="0">
+			<bounds x="120" y="70" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp104" element="BAR" state="0">
+			<bounds x="0" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp105" element="Q" state="0">
+			<bounds x="20" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp106" element="BAR" state="0">
+			<bounds x="40" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp107" element="Q" state="0">
+			<bounds x="60" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp108" element="Q" state="0">
+			<bounds x="80" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp109" element="Q" state="0">
+			<bounds x="100" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp110" element="BAR" state="0">
+			<bounds x="120" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp112" element="Q" state="0">
+			<bounds x="0" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp113" element="Q" state="0">
+			<bounds x="20" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp114" element="BAR" state="0">
+			<bounds x="40" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp115" element="Q" state="0">
+			<bounds x="60" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp116" element="BAR" state="0">
+			<bounds x="80" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp117" element="Q" state="0">
+			<bounds x="100" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp118" element="Q" state="0">
+			<bounds x="120" y="110" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp120" element="Q" state="0">
+			<bounds x="0" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp121" element="BAR" state="0">
+			<bounds x="20" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp122" element="Q" state="0">
+			<bounds x="40" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp123" element="Q" state="0">
+			<bounds x="60" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp124" element="BAR" state="0">
+			<bounds x="80" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp125" element="BAR" state="0">
+			<bounds x="100" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp126" element="Q" state="0">
+			<bounds x="120" y="130" width="20" height="20"/>
+		</bezel>
+
+
+		<bezel name="lamp25" element="COLLECT" inputtag="BLACK2" inputmask="0x40">
+			<bounds x="0" y="200" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp32" element="PASS" inputtag="BLACK1" inputmask="0x10">
+			<bounds x="0" y="220" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp33" element="A" inputtag="BLACK1" inputmask="0x08">
+			<bounds x="0" y="240" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp40" element="B" inputtag="BLACK1" inputmask="0x04">
+			<bounds x="0" y="260" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp42" element="C" inputtag="BLACK1" inputmask="0x02">
+			<bounds x="0" y="280" width="16" height="16" />
+		</bezel>
+
+		<bezel name="lamp24" element="START" inputtag="BLACK2" inputmask="0x80">
+			<bounds x="564" y="200" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp26" element="CONTINUE" inputtag="BLACK2" inputmask="0x10">
+			<bounds x="564" y="220" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp34" element="A" inputtag="BLACK2" inputmask="0x08">
+			<bounds x="564" y="240" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp41" element="B" inputtag="BLACK2" inputmask="0x04">
+			<bounds x="564" y="260" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp48" element="C" inputtag="BLACK2" inputmask="0x02">
+			<bounds x="564" y="280" width="16" height="16" />
+		</bezel>
+		<screen index="0">
+			<bounds x="50" y="200" width="504" height="296" />
+		</screen>
+	</view>
+</mamelayout>
diff --git a/src/mame/machine/mpu4.cpp b/src/mame/machine/mpu4.cpp
index 91df4c8250d..bdac4337faf 100644
--- a/src/mame/machine/mpu4.cpp
+++ b/src/mame/machine/mpu4.cpp
@@ -811,7 +811,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic4_ca2_w)
 
 WRITE_LINE_MEMBER(mpu4_state::pia_ic4_cb2_w)
 {
-	LOG_IC3(("%s: IC4 PIA Write CA (input MUX strobe /LED B), %02X\n", machine().describe_context(),state));
+	LOG_IC3(("%s: IC4 PIA Write CB (Reel optic flag), %02X\n", machine().describe_context(),state));
 	m_reel_flag=state;
 }
 
@@ -1588,20 +1588,20 @@ INPUT_PORTS_START( mpu4 )
 	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
 
 	PORT_START("AUX1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("0")
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("1")
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("2")
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("3")
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("4")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5")
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("6")
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("7")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_0")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_1")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_2")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_3")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_4")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_5")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_6")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_7")
 
 	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM) //Lockouts, in same order as below
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM) 
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM) 
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM) 
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")//PORT_IMPULSE(5)
 	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")//PORT_IMPULSE(5)
 	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")//PORT_IMPULSE(5)