diff --git a/cores/Spectrum/tld_zxuno.xst b/cores/Spectrum/tld_zxuno.xst
index 81f8d78..a05e557 100644
--- a/cores/Spectrum/tld_zxuno.xst
+++ b/cores/Spectrum/tld_zxuno.xst
@@ -2,7 +2,7 @@ set -tmpdir "projnav.tmp"
 set -xsthdpdir "xst"
 run
 -ifn tld_zxuno.prj
--infer_ramb8 No
+-infer_ramb8 No -loop_iteration_limit 32768
 -ofn tld_zxuno
 -ofmt NGC
 -p xc6slx9-2-tqg144
diff --git a/firmware/GenRom.c b/firmware/GenRom.c
index 3859748..581d418 100644
--- a/firmware/GenRom.c
+++ b/firmware/GenRom.c
@@ -43,7 +43,7 @@ unsigned short j, k, crc, tab[]= {
 int main(int argc, char *argv[]) {
   if( argc==1 )
     printf("\n"
-    "GenRom v0.04, generates a TAP for loading a ROM in the ZX-Uno, 2016-05-09\n\n"
+    "GenRom v0.05, generates a TAP for loading a ROM in the ZX-Uno, 2016-05-14\n\n"
     "  GenRom         <params1> <params2> <name> <input_file> <output_file>\n\n"
     "  <params1>      Set 5 flags parameters, combinable\n"
     "     0           Default values Issue3, Tim48K, Contended, Disabled Div & NMI\n"
@@ -57,9 +57,9 @@ int main(int argc, char *argv[]) {
     "     0           Default values DISD, DIFUL, DIKEMP, ENMMU, DI1FFD, DI7FFD,"
     "                                                             DITAY and DIAY\n"
     "     s           Disable SD ports (DivMMC and ZXMMC)\n"
-    "     f           Disable Fuller joystick port\n"
-    "     k           Disable Kempston joystick port\n"
     "     m           Enable horizontal MMU in Timex Sinclair\n"
+    "     h           Disable high bit ROM (1FFD bit 2)\n"
+    "     l           Disable low bit ROM (7FFD bit 4)\n"
     "     1           Disable 1FFD port (+2A/+3 memory paging)\n"
     "     7           Disable 7FFD port (128K memory paging)\n"
     "     t           Disable second AY chip\n"
@@ -147,9 +147,9 @@ int main(int argc, char *argv[]) {
   for ( i= 0; i<strlen(argv[2]); i++ )
     switch( argv[2][i] ){
       case 's': mem[0x4009]^= 0b10000000; break;
-      case 'f': mem[0x4009]^= 0b01000000; break;
-      case 'k': mem[0x4009]^= 0b00100000; break;
-      case 'm': mem[0x4009]^= 0b00010000; break;
+      case 'm': mem[0x4009]^= 0b01000000; break;
+      case 'h': mem[0x4009]^= 0b00100000; break;
+      case 'l': mem[0x4009]^= 0b00010000; break;
       case '1': mem[0x4009]^= 0b00001000; break;
       case '7': mem[0x4009]^= 0b00000100; break;
       case 't': mem[0x4009]^= 0b00000010; break;
diff --git a/firmware/firmware.asm b/firmware/firmware.asm
index 1726cbd..9449bbe 100644
--- a/firmware/firmware.asm
+++ b/firmware/firmware.asm
@@ -4156,7 +4156,7 @@ decbhl  dec     hl
         block   $7e00-$
 cad0    defb    'Core:             ',0
 cad1    defm    'http://zxuno.speccy.org', 0
-        defm    'ZX-Uno BIOS v0.326', 0
+        defm    'ZX-Uno BIOS v0.327', 0
         defm    'Copyleft ', 127, ' 2016 ZX-Uno Team', 0
         defm    'Processor: Z80 3.5MHz', 0
         defm    'Memory:    512K Ok', 0
@@ -4191,7 +4191,7 @@ cad8    defm    $10, '                         ', $10, '              ', $10, 0
 cad9    defb    $14, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11
         defb    $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $18, $11
         defb    $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $15, 0
-        defb    '   BIOS v0.326   ', $7f, '2016 ZX-Uno Team', 0
+        defb    '   BIOS v0.327   ', $7f, '2016 ZX-Uno Team', 0
 cad10   defb    'Hardware tests', 0
         defb    $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11
         defb    $11, $11, $11, $11, 0
diff --git a/firmware/generamcs.bat b/firmware/generamcs.bat
index 53f703d..a3b58a0 100644
--- a/firmware/generamcs.bat
+++ b/firmware/generamcs.bat
@@ -9,7 +9,7 @@ fpoke FLASH.ZX1 00000 file:header.bin      ^
                 08000 file:..\firmware.rom ^
                 58000 file:tmp.bin
 fcut tmp.bin 0 53f00 sd_binaries\SPECTRUM.%3
-GenRom 0 sf1ta Machine tmp.bin core_taps\SPECTRUM.TAP
+GenRom 0 sm1ta Machine tmp.bin core_taps\SPECTRUM.TAP
 rem CgLeches core_taps\SPECTRUM.TAP core_wavs\SPECTRUM.WAV 4
 call :CreateMachine CORE2 "Sam Coupe"        SamCoupe\tld_sam.%2.bit 0 %3
 call :CreateMachine CORE3 "Jupiter ACE"      JupiterAce\jupiter_ace.%2.bit JupiterAce\jupiter_ace.v2_v3.bit %3
@@ -21,27 +21,27 @@ call :CreateMachine CORE8 "Acorn Atom (VGA)" AcornAtom\AcornAtom.%2.bit 0 %3
 call :CreateMachine CORE9 "NES (VGA)"        NES\xilinx\nes_zxuno.%2.bit 0 %3
 copy /y rom_binaries\esxdos.rom sd_binaries\ESXDOS.%3
 copy /y firmware.rom sd_binaries\FIRMWARE.%3
-GenRom 0 sf1t BIOS firmware.rom core_taps\FIRMWARE.TAP
+GenRom 0 sm1t BIOS firmware.rom core_taps\FIRMWARE.TAP
 GenRom 0 0    ESXDOS rom_binaries\esxdos.rom core_taps\ESXDOS.TAP
-call :CreateRom 0  "ZX Spectrum 48K Cargando Leches" leches         dn   0
+call :CreateRom 0  "ZX Spectrum 48K Cargando Leches" leches         dn   lh
 call :CreateRom 1  "ZX +3e DivMMC"                 plus3en40divmmc  t    0
-call :CreateRom 5  "SE Basic IV 4.0 Anya"          se               d    0
-call :CreateRom 7  "ZX Spectrum 48K"               48               dn   17
-call :CreateRom 8  "Jet Pac (1983)"                JetPac           0    17
-call :CreateRom 9  "Pssst (1983)"                  Pssst            0    17
-call :CreateRom 10 "Cookie (1983)"                 Cookie           0    17
-call :CreateRom 11 "Tranz Am (1983)"               TranzAm          0    17
-call :CreateRom 12 "Master Chess (1983)"           MasterChess      0    17
-call :CreateRom 13 "Backgammon (1983)"             Backgammon       0    17
-call :CreateRom 14 "Hungry Horace (1983)"          HungryHorace     0    17
-call :CreateRom 15 "Horace & the Spiders (1983)"   HoraceSpiders    0    17
-call :CreateRom 16 "Planetoids (1983)"             Planetoids       0    17
-call :CreateRom 17 "Space Raiders (1983)"          SpaceRaiders     0    17
-call :CreateRom 18 "Deathchase (1983)"             Deathchase       0    17
-call :CreateRom 19 "Manic Miner (1983)"            ManicMiner       0    17
-call :CreateRom 20 "Misco Jones (2013)"            MiscoJones       0    17
-call :CreateRom 21 "Jet Set Willy (1984)"          JetSetWilly      0    17
-call :CreateRom 22 "Lala Prologue (2010)"          LalaPrologue     0    17
+call :CreateRom 5  "SE Basic IV 4.0 Anya"          se               d    h
+call :CreateRom 7  "ZX Spectrum 48K"               48               dn   lh17
+call :CreateRom 8  "Jet Pac (1983)"                JetPac           0    lh17
+call :CreateRom 9  "Pssst (1983)"                  Pssst            0    lh17
+call :CreateRom 10 "Cookie (1983)"                 Cookie           0    lh17
+call :CreateRom 11 "Tranz Am (1983)"               TranzAm          0    lh17
+call :CreateRom 12 "Master Chess (1983)"           MasterChess      0    lh17
+call :CreateRom 13 "Backgammon (1983)"             Backgammon       0    lh17
+call :CreateRom 14 "Hungry Horace (1983)"          HungryHorace     0    lh17
+call :CreateRom 15 "Horace & the Spiders (1983)"   HoraceSpiders    0    lh17
+call :CreateRom 16 "Planetoids (1983)"             Planetoids       0    lh17
+call :CreateRom 17 "Space Raiders (1983)"          SpaceRaiders     0    lh17
+call :CreateRom 18 "Deathchase (1983)"             Deathchase       0    lh17
+call :CreateRom 19 "Manic Miner (1983)"            ManicMiner       0    lh17
+call :CreateRom 20 "Misco Jones (2013)"            MiscoJones       0    lh17
+call :CreateRom 21 "Jet Set Willy (1984)"          JetSetWilly      0    lh17
+call :CreateRom 22 "Lala Prologue (2010)"          LalaPrologue     0    lh17
 srec_cat  FLASH.ZX1 -binary     ^
           -o prom.%2.mcs -Intel ^
           -line-length=44       ^