diff --git a/src/mame/drivers/electra.cpp b/src/mame/drivers/electra.cpp
index ea9437e6009..f248fea8ca9 100644
--- a/src/mame/drivers/electra.cpp
+++ b/src/mame/drivers/electra.cpp
@@ -4,17 +4,19 @@
 
  Electra discrete hardware games
 
- Game Name
- Avenger (1975)                               EG-1020
- Combo 3 (Tennis, Soccer, Hockey) (1975)
- Eliminator IV (1976)
- Flying Fortress (1976)                       EG-1060  (Taito same name?)
- Knockout (1975)
- Pace Car Pro (1975)                          EG-1000
- Pace Race (1974?)
- RTH (1976)
- UFO Chase (1975)                             EG-1010
- Wings / Wings Cocktail (1976)                EG-1040B
+
+Game Name                                 Board part number  DATA
+
+Avenger (1975)                            EG-1020            YES
+Combo 3 (Tennis, Soccer, Hockey) (1975)                      UNKNOWN
+Eliminator IV (1976)                                         UNKNOWN
+Flying Fortress (1976) (Taito same name?) EG-1060            YES
+Knockout (1975)                                              UNKNOWN
+Pace Car Pro (1975)                       EG-1000            NO
+Pace Race (1975)                          EG-1000            NO
+RTH (1976)                                                   UNKNOWN
+UFO Chase (1975)                          EG-1010            UNKNOWN
+Wings / Wings Cocktail (1976)             EG-1040            YES
 
 ***************************************************************************/
 
diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp
index 6cc22351eb5..84c35a548d3 100644
--- a/src/mame/drivers/taitosj.cpp
+++ b/src/mame/drivers/taitosj.cpp
@@ -1486,13 +1486,12 @@ static INPUT_PORTS_START( sfposeid )
 	PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(taitosj_state, input_port_4_f0_r)    // from sound CPU
 
 	PORT_START("DSW1")
-	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )         PORT_DIPLOCATION("SWA:1")
-	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )         PORT_DIPLOCATION("SWA:2")
-	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )         PORT_DIPLOCATION("SWA:3")
+	PORT_DIPNAME( 0x03, 0x02, DEF_STR( Bonus_Life ) )      PORT_DIPLOCATION("SWA:1,2")
+	PORT_DIPSETTING(    0x00, "5000" )
+	PORT_DIPSETTING(    0x01, "10000" )
+	PORT_DIPSETTING(    0x02, "15000" )
+	PORT_DIPSETTING(    0x03, "20000" )
+	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) )          PORT_DIPLOCATION("SWA:3") // Marked as normal OFF on dip sheet
 	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x18, 0x08, DEF_STR( Lives ) )           PORT_DIPLOCATION("SWA:4,5")
@@ -1500,7 +1499,7 @@ static INPUT_PORTS_START( sfposeid )
 	PORT_DIPSETTING(    0x08, "3" )
 	PORT_DIPSETTING(    0x10, "4" )
 	PORT_DIPSETTING(    0x18, "5" )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )         PORT_DIPLOCATION("SWA:6")
+	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unused ) )          PORT_DIPLOCATION("SWA:6") // Marked as normal OFF on dip sheet
 	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Flip_Screen ) )     PORT_DIPLOCATION("SWA:7")
@@ -1514,16 +1513,15 @@ static INPUT_PORTS_START( sfposeid )
 	DSW2_PORT
 
 	PORT_START("DSW3")
-	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )         PORT_DIPLOCATION("SWC:1")
-	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )         PORT_DIPLOCATION("SWC:2")
-	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )         PORT_DIPLOCATION("SWC:3")
+	PORT_DIPNAME( 0x03, 0x00, "Weapons Range" )            PORT_DIPLOCATION("SWC:1,2") // Can't spot any different behaviour in-game, but dip sheet says so.
+	PORT_DIPSETTING(    0x03, "Short" )
+	PORT_DIPSETTING(    0x02, DEF_STR( Medium ) )
+	PORT_DIPSETTING(    0x01, "Long" )
+	PORT_DIPSETTING(    0x00, "Longest" )
+	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) )          PORT_DIPLOCATION("SWC:3") // Marked as normal OFF on dip sheet
 	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )         PORT_DIPLOCATION("SWC:4")
+	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) )          PORT_DIPLOCATION("SWC:4") // Marked as normal OFF on dip sheet
 	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x10, 0x10, "Coinage Display" )          PORT_DIPLOCATION("SWC:5")