diff --git a/data/gfx/tiles.gif b/data/gfx/tiles.gif
index cc12712..47fc9f6 100644
Binary files a/data/gfx/tiles.gif and b/data/gfx/tiles.gif differ
diff --git a/data/maps/rooms_background.gif b/data/maps/rooms_background.gif
index 1864907..ade1fd4 100644
Binary files a/data/maps/rooms_background.gif and b/data/maps/rooms_background.gif differ
diff --git a/data/maps/rooms_foreground.gif b/data/maps/rooms_foreground.gif
index bbad1c8..ee6f1ac 100644
Binary files a/data/maps/rooms_foreground.gif and b/data/maps/rooms_foreground.gif differ
diff --git a/data/maps/rooms_items.gif b/data/maps/rooms_items.gif
index a5948a6..ee77d80 100644
Binary files a/data/maps/rooms_items.gif and b/data/maps/rooms_items.gif differ
diff --git a/data/modules/ia/hero.lua b/data/modules/ia/hero.lua
index c887ea2..432f05e 100644
--- a/data/modules/ia/hero.lua
+++ b/data/modules/ia/hero.lua
@@ -52,19 +52,19 @@ function ia.update_hero()
     -- Si li han pegat...
     if sprites.hero.has_been_hit then
         if sprites.hero.flipped then
-            local tx, ty = (sprites.hero.pos.x+3)>>3, (sprites.hero.pos.y+16)>>3
+            local tx, ty = (sprites.hero.pos.x+12)>>3, (sprites.hero.pos.y+16)>>3
             if map.tile(tx,ty) < 16 and map.tile(tx,ty-1) < 16 then
-                if tx<rooms.pos.x then
-                    game.change_room(-1,0)
+                if tx>rooms.pos.x+19 then
+                    game.change_room(1,0)
                 else
                     sprites.hero.pos.x = sprites.hero.pos.x + 1
                 end
             end
         else
-            local tx, ty = (sprites.hero.pos.x+12)>>3, (sprites.hero.pos.y+16)>>3
+            local tx, ty = (sprites.hero.pos.x+3)>>3, (sprites.hero.pos.y+16)>>3
             if map.tile(tx,ty) < 16 and map.tile(tx,ty-1) < 16 then
-                if tx>rooms.pos.x+19 then
-                    game.change_room(1,0)
+                if tx<rooms.pos.x then
+                    game.change_room(-1,0)
                 else
                     sprites.hero.pos.x = sprites.hero.pos.x - 1
                 end
diff --git a/data/modules/ia/nemesio.lua b/data/modules/ia/nemesio.lua
index af5cfe7..ce39f9a 100644
--- a/data/modules/ia/nemesio.lua
+++ b/data/modules/ia/nemesio.lua
@@ -15,7 +15,7 @@ function ia.update_nemesio(spr)
 
     if spr.substate == nemesio.STATIC then
         spr.mode = draw.NORMAL
-        if spr.timer==100 then
+        if spr.timer==50 then
             spr.timer=0
             spr.substate = nemesio.FLOATING
             spr.advance = {x=0,y=0}
diff --git a/data/stages/editor.lua b/data/stages/editor.lua
index 097b081..be312b6 100644
--- a/data/stages/editor.lua
+++ b/data/stages/editor.lua
@@ -14,6 +14,8 @@ editor = {
     item_dragged=nil,
     dragged_start_pos=nil,
     flip=false,
+    msg=nil,
+    msg_timeout=0,
 
     enable = function()
         app.update = editor.update
@@ -153,6 +155,18 @@ editor = {
                 editor.play()
             elseif key.press(key.F11) then
                 reload_textures()
+            elseif key.press(key.N1) then
+                editor.layer=LAYER_FOREGROUND
+                editor.msg="FOREGROUND"
+                editor.msg_timeout = 20
+            elseif key.press(key.N2) then
+                editor.layer=LAYER_BACKGROUND
+                editor.msg="BACKGROUND"
+                editor.msg_timeout = 20
+            elseif key.press(key.N3) then
+                editor.layer=LAYER_ITEMS
+                editor.msg="ITEMS"
+                editor.msg_timeout = 20
             end
 
             if editor.layer==LAYER_ITEMS then
@@ -181,8 +195,11 @@ editor = {
         draw.text(rooms.pos.x//20,1,96,28)
         draw.text(rooms.pos.y//13,5,96,28)
 
-        -- Pintar el menú (el marcador serà en el modul game.lua)
-        --score.draw()
+        if editor.msg_timeout > 0 then
+            editor.msg_timeout = editor.msg_timeout - 1
+            draw.text(editor.msg, 10, 96, 8)
+        end
+
         menu.draw()
 
     end,