diff --git a/data/teleporter.sav b/data/teleporter.sav
new file mode 100644
index 0000000..424ad58
--- /dev/null
+++ b/data/teleporter.sav
diff --git a/debug.c b/debug.c
index 17e3648..545cf12 100644
--- a/debug.c
+++ b/debug.c
@@ -116,8 +116,8 @@ void query()
                 print_regs();
                 break;
             case 'm':
-                sscanf(input,"m %d\n",&mempos);
-                fprintf(stderr,"%d: %02x\n",mempos,mem[mempos]);
+                sscanf(input,"m %X\n",&mempos);
+                fprintf(stderr,"%02X: %02x\n",mempos,mem[mempos]);
                 break;
             case 's':
                 sscanf(input,"s %s\n",filename);
@@ -131,8 +131,8 @@ void query()
                 break;
             case 'w':
                 //FIXME ALREADY
-                sscanf(input,"w %d %d\n",&reg,&value);
-                fprintf(stderr,"Setting register %d to %d",reg,value);
+                sscanf(input,"w r%d %d\n",&reg,&value);
+                fprintf(stderr,"Setting r%d = %02X",reg,value);
                 regs[reg] = value;
                 break;
             case 'q':