diff --git a/README.md b/README.md
index ac9de63..9d26508 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # mesen-binary-monitor
 
-This is a monitor for Mesen, intended to mimic [VICE's binary monitor](https://vice-emu.sourceforge.io/vice_13.html).
+This is a monitor for Mesen-X, intended to mimic [VICE's binary monitor](https://vice-emu.sourceforge.io/vice_13.html).
 It is currently in an alpha state, and some commands are not functional or behave
 incorrectly. I originally wrote this to support debugging in my [VS65 Debugger](https://github.com/empathicqubit/vscode-cc65-vice-debug).
 To use it, make sure your script timeout is set as high as possible (2147483647)
-and start up Mesen as such:
+and start up Mesen-X as such:
 
 Linux:
 
diff --git a/commands.lua b/commands.lua
index 30a7dbf..40dc67a 100644
--- a/commands.lua
+++ b/commands.lua
@@ -175,8 +175,9 @@ return function(server)
 
         server.stepping = true
         if stepOverSubroutines then
-            -- FIXME
-            emu.execute(count, emu.executeCountType.cpuInstructions)
+            for i=1,count do
+                emu.stepOver()
+            end
         else
             emu.execute(count, emu.executeCountType.cpuInstructions)
         end
@@ -192,7 +193,7 @@ return function(server)
     local function processExecuteUntilReturn(command)
         -- FIXME
         server.stepping = true
-        emu.execute(1, emu.executeCountType.cpuInstructions)
+        emu.stepOut()
 
         server.running = true