diff --git a/glaurung.tap b/glaurung.tap
new file mode 100644
index 0000000..26dd385
Binary files /dev/null and b/glaurung.tap differ
diff --git a/main.cpp b/main.cpp
index 50ed0e7..359763e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -172,25 +172,29 @@ int main(int argc, char *argv[])
                 zxscreen::redraw();
             } else {
                 //if (z80::getPC()==0x05C8) zx_tape::go_berserk();
-                uint8_t dt = z80::step();
-                t_states += dt;
-                zx_tape::update(dt);
-                
                 while (zx_tape::getplaying() && zx_tape::getberserk())
                 {
                     zx_tape::update(z80::step());
                 }
 
-                zx_ula::sound_update(dt);
-                zxscreen::refresh(dt);
+                // En cada bucle fem 10 pasos de la CPU, sino s'ofega
+                for (int i=0;i<10;++i) {
+                    uint8_t dt = z80::step();
+                    t_states += dt;
+                    zx_tape::update(dt);
+                    
+                    zx_ula::sound_update(dt);
+                    zxscreen::refresh(dt);
+                }
 
-                if (t_states>=3500000)
+                if (t_states>=350000)
                 {
                     //if (SDL_GetTicks()>=time+1000)
                         //printf("%i\n", SDL_GetTicks()-(time+1000));
                     //else
                     //    printf("%i\n", SDL_GetTicks()-(time+1000));
                     //t_states = 0;
+                    //printf("%i: %i\n", SDL_GetTicks()-(time+1000), t_states);
                     while (SDL_GetTicks()<time+100) {}
                     t_states -= 350000;
                     time = SDL_GetTicks();
diff --git a/ui.cpp b/ui.cpp
index 4e695ff..f459e74 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -43,6 +43,7 @@ namespace ui
         if (tex) SDL_DestroyTexture(tex);
         tex = SDL_CreateTextureFromSurface(ren, surf);
         SDL_SetTextureBlendMode(tex, SDL_BLENDMODE_BLEND);
+        offset_x = offset_y = 0;
     }
 
     void setoffset(uint8_t x, uint8_t y)
diff --git a/z80.cpp b/z80.cpp
index c1e795f..2c5ec0f 100644
--- a/z80.cpp
+++ b/z80.cpp
@@ -88,7 +88,8 @@ namespace z80
  
     //uint8_t iff1, iff2, im;
     bool exit_from_halt = false;
-
+    int pending_ei = 0;
+    
     #define rA (*_rA)
     #define rF (*_rF)
     #define rB (*_rB)
@@ -683,6 +684,11 @@ namespace z80
     }
 
     void EI()
+    {
+        pending_ei=1;
+    }
+
+    void actualEI()
     {
         iff1 = iff2 = 1;
     }
@@ -1328,6 +1334,9 @@ namespace z80
             case 0xFE: CP(READ_MEM_8());                break;
             case 0xFF: RST(0x38);                       break;
         }
+
+        if (pending_ei==2) { pending_ei=0; actualEI(); }
+        if (pending_ei==1) pending_ei=2;
         return t;
     }
 
@@ -2115,6 +2124,7 @@ namespace z80
     void MISC_INSTRUCTIONS()
     {
         const uint8_t opcode = READ_M1();
+        rR = (rR&0x80) + ((rR+1) & 0x7f);
         uint16_t tmp;
 
         switch (opcode)
diff --git a/zx_ula.cpp b/zx_ula.cpp
index e9d40c8..e30285d 100644
--- a/zx_ula.cpp
+++ b/zx_ula.cpp
@@ -224,6 +224,9 @@ namespace zx_ula
     uint16_t sound_pos=0;
     uint16_t sound_start=0;
     uint16_t t_sound=0;
+    uint32_t samples_generated=0;
+    uint32_t samples_time =0;
+    uint32_t samples_t=0;
 
     void audioCallback(void * userdata, uint8_t * stream, int len)
     {
@@ -259,6 +262,7 @@ namespace zx_ula
         SDL_AudioSpec audioSpec{11025, AUDIO_U8, 1, 0, AUDIO_BUFFER_SIZE>>2, 0, 0, &audioCallback, NULL};
         sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0);
         sound_enable();
+        samples_time=SDL_GetTicks();
     }
 
     void sound_enable()
@@ -274,8 +278,20 @@ namespace zx_ula
     void sound_update(const uint8_t dt)
     {
         t_sound += dt;
+        samples_t += dt;
         if (t_sound>=317) {
             t_sound-=317;
+            samples_generated++;
+            if (samples_t >=3500000) {
+                printf("%i\n", samples_generated);
+                samples_generated=0;
+                samples_t = 0;
+            }
+            /*if (SDL_GetTicks()>=samples_time+1000) {
+                printf("%i\n", samples_generated);
+                samples_generated=0;
+                samples_time = SDL_GetTicks();
+            }*/
             //sound_pos = (sound_pos+1) & 0x3ff;
             //sound_buffer[sound_pos] = ear*128;