diff --git a/src/burn/drv/pre90s/d_snk68.cpp b/src/burn/drv/pre90s/d_snk68.cpp
index 2d4c8efde..7117f08e3 100644
--- a/src/burn/drv/pre90s/d_snk68.cpp
+++ b/src/burn/drv/pre90s/d_snk68.cpp
@@ -6,7 +6,6 @@
 
 // To Do:
 // 	Analog Inputs
-//	Fix savestates (crash due to snd?)
 
 static UINT8 DrvJoy1[8];
 static UINT8 DrvJoy2[8];
@@ -54,21 +53,20 @@ static INT32 pow_charbase;
 #define A(a, b, c, d) { a, b, (UINT8*)(c), d }
 
 static struct BurnInputInfo DrvInputList[] = {
-	{"Coin 1"       , BIT_DIGITAL  , DrvJoy3 + 4,	"p1 coin"  },
-	{"Coin 2"       , BIT_DIGITAL  , DrvJoy3 + 5,	"p2 coin"  },
-
-	{"P1 Start"  ,    BIT_DIGITAL  , DrvJoy1 + 7,	"p1 start" },
-	{"P1 Up",	  BIT_DIGITAL,   DrvJoy1 + 0,   "p1 up",   },
-	{"P1 Down",	  BIT_DIGITAL,   DrvJoy1 + 1,   "p1 down", },
+	{"P1 Coin",       BIT_DIGITAL  , DrvJoy3 + 4,	"p1 coin"  },
+	{"P1 Start",      BIT_DIGITAL  , DrvJoy1 + 7,	"p1 start" },
+	{"P1 Up",	  BIT_DIGITAL  , DrvJoy1 + 0,   "p1 up",   },
+	{"P1 Down",	  BIT_DIGITAL  , DrvJoy1 + 1,   "p1 down", },
 	{"P1 Left"      , BIT_DIGITAL  , DrvJoy1 + 2, 	"p1 left"  },
 	{"P1 Right"     , BIT_DIGITAL  , DrvJoy1 + 3, 	"p1 right" },
 	{"P1 Button 1"  , BIT_DIGITAL  , DrvJoy1 + 4,	"p1 fire 1"},
 	{"P1 Button 2"  , BIT_DIGITAL  , DrvJoy1 + 5,	"p1 fire 2"},
 	{"P1 Button 3"  , BIT_DIGITAL  , DrvJoy1 + 6,	"p1 fire 3"},
 
-	{"P2 Start"  ,    BIT_DIGITAL  , DrvJoy2 + 7,	"p2 start" },
-	{"P2 Up",	  BIT_DIGITAL,   DrvJoy2 + 0,   "p2 up",   },
-	{"P2 Down",	  BIT_DIGITAL,   DrvJoy2 + 1,   "p2 down", },
+	{"P2 Coin",       BIT_DIGITAL  , DrvJoy3 + 5,	"p2 coin"  },
+	{"P2 Start",      BIT_DIGITAL  , DrvJoy2 + 7,	"p2 start" },
+	{"P2 Up",	  BIT_DIGITAL  , DrvJoy2 + 0,   "p2 up",   },
+	{"P2 Down",	  BIT_DIGITAL  , DrvJoy2 + 1,   "p2 down", },
 	{"P2 Left"      , BIT_DIGITAL  , DrvJoy2 + 2, 	"p2 left"  },
 	{"P2 Right"     , BIT_DIGITAL  , DrvJoy2 + 3, 	"p2 right" },
 	{"P2 Button 1"  , BIT_DIGITAL  , DrvJoy2 + 4,	"p2 fire 1"},
@@ -85,12 +83,10 @@ static struct BurnInputInfo DrvInputList[] = {
 STDINPUTINFO(Drv)
 
 static struct BurnInputInfo IkariInputList[] = {
-	{"Coin 1"       , BIT_DIGITAL  , DrvJoy3 + 4,	"p1 coin"  },
-	{"Coin 2"       , BIT_DIGITAL  , DrvJoy3 + 5,	"p2 coin"  },
-
-	{"P1 Start"  ,    BIT_DIGITAL  , DrvJoy1 + 7,	"p1 start" },
-	{"P1 Up",	  BIT_DIGITAL,   DrvJoy1 + 0,   "p1 up",   },
-	{"P1 Down",	  BIT_DIGITAL,   DrvJoy1 + 1,   "p1 down", },
+	{"P1 Coin",       BIT_DIGITAL  , DrvJoy3 + 4,	"p1 coin"  },
+	{"P1 Start",      BIT_DIGITAL  , DrvJoy1 + 7,	"p1 start" },
+	{"P1 Up",	  BIT_DIGITAL  , DrvJoy1 + 0,   "p1 up",   },
+	{"P1 Down",	  BIT_DIGITAL  , DrvJoy1 + 1,   "p1 down", },
 	{"P1 Left"      , BIT_DIGITAL  , DrvJoy1 + 2, 	"p1 left"  },
 	{"P1 Right"     , BIT_DIGITAL  , DrvJoy1 + 3, 	"p1 right" },
 	{"P1 Button 1"  , BIT_DIGITAL  , DrvJoy1 + 4,	"p1 fire 1"},
@@ -99,9 +95,10 @@ static struct BurnInputInfo IkariInputList[] = {
 
 	A("P1 Right / left",	BIT_ANALOG_REL, DrvAxis + 0,	"p1 z-axis"),
 
-	{"P2 Start"  ,    BIT_DIGITAL  , DrvJoy2 + 7,	"p2 start" },
-	{"P2 Up",	  BIT_DIGITAL,   DrvJoy2 + 0,   "p2 up",   },
-	{"P2 Down",	  BIT_DIGITAL,   DrvJoy2 + 1,   "p2 down", },
+	{"P2 Coin",       BIT_DIGITAL  , DrvJoy3 + 5,	"p2 coin"  },
+	{"P2 Start",      BIT_DIGITAL  , DrvJoy2 + 7,	"p2 start" },
+	{"P2 Up",	  BIT_DIGITAL  , DrvJoy2 + 0,   "p2 up",   },
+	{"P2 Down",	  BIT_DIGITAL  , DrvJoy2 + 1,   "p2 down", },
 	{"P2 Left"      , BIT_DIGITAL  , DrvJoy2 + 2, 	"p2 left"  },
 	{"P2 Right"     , BIT_DIGITAL  , DrvJoy2 + 3, 	"p2 right" },
 	{"P2 Button 1"  , BIT_DIGITAL  , DrvJoy2 + 4,	"p2 fire 1"},