--- a/src/os9/level2/cmds/Makefile	Sun Aug 05 16:12:30 2018 +0900
+++ b/src/os9/level2/cmds/Makefile	Sun Aug 05 22:17:44 2018 +0900
@@ -1,30 +1,26 @@
-SRC2  = ../src/os9/nitros9-code/level2/cmds
-SRC1  = ../src/os9/nitros9-code/level1/cmds
+SRC2  = ../../nitros9-code/level2/cmds
+SRC1  = ../../nitros9-code/level1/cmds
 
-OBJ2 = dmem mdir mfree mmap pmap proc procs reboot smap
+OBJ2 = mdir mfree proc procs reboot 
 
 OBJ1 = asm attr calldbg cmp config copy cputype date debug del deldir devs dir dir_cb dirsort  dump  echo edit \
-    error free help ident irqs link list load login makdir pd procs prompt shellplus sleep tee touch tsmon unlink
+    error free help ident irqs link list load login makdir pxd pwd procs prompt shellplus sleep tee touch tsmon unlink
 
 all : $(OBJ2) $(OBJ1)
 
-A09 = ../src/a09
+A09 = ../../../a09
 
-dmem : 
-	$(A09) -l $@.lst  -o $@ $(SRC2)/$@.asm
+clean :
+	rm -rf *.lst $(OBJ2) $(OBJ1)
 
 mdir :
-	$(A09) -l $@.lst  -o $@ $(SRC2)/$@.asm
+	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
 mfree :
-	$(A09) -l $@.lst  -o $@ $(SRC2)/$@.asm
-mmap :
-	$(A09) -l $@.lst  -o $@ $(SRC2)/$@.asm
-pmap :
-	$(A09) -l $@.lst  -o $@ $(SRC2)/$@.asm
+	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
 proc :
 	$(A09) -l $@.lst  -o $@ $(SRC2)/$@.asm
 procs :
-	$(A09) -l $@.lst  -o $@ $(SRC2)/$@.asm
+	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
 reboot :
 	$(A09) -l $@.lst  -o $@ $(SRC2)/$@.asm
 smap :
@@ -64,6 +60,8 @@
 	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
 dump :
 	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
+dw.as :
+	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
 echo :
 	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
 edit :
@@ -88,8 +86,10 @@
 	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
 makdir :
 	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
-pd :
-	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
+pxd :
+	$(A09) -D PXD -l $@.lst  -o $@ $(SRC1)/pd.asm
+pwd :
+	$(A09) -D PWD -l $@.lst  -o $@ $(SRC1)/pd.asm
 prompt :
 	$(A09) -l $@.lst  -o $@ $(SRC1)/$@.asm
 shellplus :