diff --git a/data/abad.lua b/data/abad.lua
index 50dcc82..430782e 100644
--- a/data/abad.lua
+++ b/data/abad.lua
@@ -420,22 +420,22 @@ function abad_state_normal()
     
     abad_make_safe()
 
-    if controller:check("right") then
-        abad.update=abad_state_walking
-        abad.flip=false
-    elseif controller:check("up") and abad_in_stairs() then
+    if controller:check("up") and abad_in_stairs() then
         abad.update=abad_state_stairs
-    elseif controller:check("left") then
-        abad.update=abad_state_walking
-        abad.flip=true
-    elseif controller:check("jump") then
-        abad_do_jump()
     elseif controller:check("down") then
         if abad_in_stairs() then
             abad.update=abad_state_stairs
         else
             abad.update=abad_state_crouch
         end
+    elseif controller:check("right") then
+        abad.update=abad_state_walking
+        abad.flip=false
+    elseif controller:check("left") then
+        abad.update=abad_state_walking
+        abad.flip=true
+    elseif controller:check("jump") then
+        abad_do_jump()
     --elseif btn(KEY_Z) then
     --    abad.respawning=240
     elseif controller:check("shoot") then
diff --git a/data/opcions.lua b/data/opcions.lua
index ff604db..7f1a553 100644
--- a/data/opcions.lua
+++ b/data/opcions.lua
@@ -18,7 +18,7 @@ function opcions_draw()
 end
 
 function opcions_update()
-    if key.press(keyShoot) or key.press(key.SPACE) or pad.press(pad.A) or pad.press(btnShoot) then
+    if key.press(keyShoot) or key.press(key.SPACE) or pad.press(pad.A) or pad.press(btnShoot) or key.press(key.RETURN) then
         if menu_sel==0 then
             music.enabled(not music.enabled())
             if music.enabled() then music.play(audio_main_song) end
diff --git a/data/title.lua b/data/title.lua
index c17c6ab..e2f7bec 100644
--- a/data/title.lua
+++ b/data/title.lua
@@ -148,7 +148,7 @@ function title_menu_draw()
 end
 
 function title_menu_update()
-    if key.press(keyShoot) or key.press(key.SPACE) or pad.press(pad.A) or pad.press(btnShoot) then
+    if key.press(keyShoot) or key.press(key.SPACE) or pad.press(pad.A) or pad.press(btnShoot) or key.press(key.RETURN)  then
         title_end()
     elseif key.press(keyDown) or key.press(key.DOWN) or pad.press(pad.DOWN) or pad.press(btnDown) then
         menu_sel=menu_sel+1