diff --git a/source/cart_hw/cart_hw.c b/source/cart_hw/cart_hw.c
index 6c06731..90f998c 100644
--- a/source/cart_hw/cart_hw.c
+++ b/source/cart_hw/cart_hw.c
@@ -30,6 +30,12 @@
 
 #define CART_CNT 26
 
+/* Global Variables */
+T_CART_HW cart_hw;
+uint8 j_cart;
+uint8 *default_rom;
+int old_system[2] = {-1,-1};
+
 /* Function prototypes */
 void default_time_w(uint32 address, uint32 data);
 void special_mapper_w(uint32 address, uint32 data);
@@ -54,7 +60,7 @@ typedef struct
   - copy protection device
   - custom ROM banking device
 */
-T_CART_ENTRY rom_database[CART_CNT] =
+static const T_CART_ENTRY rom_database[CART_CNT] =
 {
 /* Game no Kanzume Otokuyou */
   {0x0000,0xf9d1,0,0,{{0,0,0,0},{0,0,0,0},{0,0,0,0},0,0,0,seganet_mapper_w,0,0}},
@@ -110,12 +116,9 @@ T_CART_ENTRY rom_database[CART_CNT] =
   {0x30b9,0x1c2a,0x40,0x40,{{0,0,0,0},{0,0,0,0},{0,0,0,0},0,0,0,0,default_regs_r,0}}
 };
 
-
-/* previous inputs */
-int old_system[2] = {-1,-1};
-
 /* temporary memory chunk */
-uint8 mem_chunk[0x10000];
+static uint8 mem_chunk[0x10000];
+
 
 /************************************************************
           Cart Hardware initialization 
diff --git a/source/cart_hw/cart_hw.h b/source/cart_hw/cart_hw.h
index 492c373..bc36d9c 100644
--- a/source/cart_hw/cart_hw.h
+++ b/source/cart_hw/cart_hw.h
@@ -42,9 +42,10 @@ typedef struct
 } T_CART_HW;
 
 /* global variables */
-T_CART_HW cart_hw;
-uint8 j_cart;
-uint8 *default_rom;
+extern T_CART_HW cart_hw;
+extern uint8 j_cart;
+extern uint8 *default_rom;
+extern int old_system[2];
 
 /* Function prototypes */
 extern void cart_hw_reset();
diff --git a/source/cart_hw/eeprom.c b/source/cart_hw/eeprom.c
index 3cbd6ae..68f61c1 100644
--- a/source/cart_hw/eeprom.c
+++ b/source/cart_hw/eeprom.c
@@ -21,6 +21,10 @@
 
 #include "shared.h"
 
+#define GAME_CNT 25
+
+T_EEPROM eeprom;
+
 typedef struct
 {
   char game_id[14];
@@ -28,7 +32,7 @@ typedef struct
   T_EEPROM_TYPE type;
 } T_GAME_ENTRY;
 
-T_GAME_ENTRY database[25] = 
+static const T_GAME_ENTRY database[GAME_CNT] = 
 {
   /* ACCLAIM mappers */
   /* 24C02 (old mapper) */
@@ -73,12 +77,9 @@ T_GAME_ENTRY database[25] =
   {{"T-120146-50"}, 0,      {16, 0x1FFF, 0x1FFF, 0x300000, 0x380001, 0x300000, 0, 7, 1}}    /* Brian Lara Cricket 96, Shane Warne Cricket */
 };
 
-
-T_EEPROM eeprom;
-
 void eeprom_init()
 {
-  uint8 i = 0;
+  int i = 0;
 
   /* initialize eeprom */
   memset(&eeprom, 0, sizeof(T_EEPROM));
@@ -86,10 +87,11 @@ void eeprom_init()
   eeprom.scl = eeprom.old_scl = 1;
   eeprom.state = STAND_BY;
 
+  /* no eeprom by default */
   sram.custom = 0;
 
   /* look into game database */
-  while ((i<25) && (!sram.custom))
+  while ((i<GAME_CNT) && (!sram.custom))
   {
     if (strstr(rominfo.product,database[i].game_id) != NULL)
     {
diff --git a/source/gx/gui/gui.h b/source/gx/gui/gui.h
index 94f69af..64c4996 100644
--- a/source/gx/gui/gui.h
+++ b/source/gx/gui/gui.h
@@ -135,7 +135,6 @@ typedef struct
 /* Menu inputs */
 struct t_input_menu
 {
-  u32 connected;
   u16 keys;
 #ifdef HW_RVL
   struct ir_t ir;
diff --git a/source/gx/gui/menu.c b/source/gx/gui/menu.c
index 2b3a1dd..29d23ec 100644
--- a/source/gx/gui/menu.c
+++ b/source/gx/gui/menu.c
@@ -1045,7 +1045,6 @@ static void videomenu ()
 /****************************************************************************
  * Controllers Settings menu
  ****************************************************************************/
-extern int old_system[2];
 
 /* Set menu elements depending on current system configuration */
 static void ctrlmenu_raz(void)
diff --git a/source/gx/gx_input.c b/source/gx/gx_input.c
index 30f807a..44088bc 100644
--- a/source/gx/gx_input.c
+++ b/source/gx/gx_input.c
@@ -29,10 +29,11 @@
 #define ANALOG_SENSITIVITY 30
 
 /* Delay before held keys triggering */
-#define HELD_DELAY 18
+/* higher is the value, less responsive is the key update */
+#define HELD_DELAY 30
 
 /* Direction & selection update speed when a key is being held */
-/* the less is the value, faster is the key update */
+/* lower is the value, faster is the key update */
 #define HELD_SPEED 4
 
 /* Menu request flag */
@@ -751,7 +752,7 @@ void gx_input_UpdateEmu(void)
 void gx_input_UpdateMenu(u32 cnt)
 {
   /* PAD status update */
-  m_input.connected = PAD_ScanPads();
+  PAD_ScanPads();
 
   /* PAD pressed keys */
   s16 pp = PAD_ButtonsDown(0);