diff --git a/Source/Apps/FAT/FAT.COM b/Source/Apps/FAT/FAT.COM
index 2fcfc9e7..1dd7dcca 100644
Binary files a/Source/Apps/FAT/FAT.COM and b/Source/Apps/FAT/FAT.COM differ
diff --git a/Source/Apps/FAT/ReadMe.txt b/Source/Apps/FAT/ReadMe.txt
index 844bc673..ad06db72 100644
--- a/Source/Apps/FAT/ReadMe.txt
+++ b/Source/Apps/FAT/ReadMe.txt
@@ -1,7 +1,7 @@
 RomWBW HBIOS CP/M FAT Utility ("FAT.COM")
 
 Author: Wayne Warthen
-Updated: 8-Oct-2019
+Updated: 11-Oct-2019
 
 Application to manipulate and exchange files with a FAT (DOS)
 filesystem.  Runs on any HBIOS hosted CP/M implementation.
@@ -10,7 +10,9 @@ USAGE:
   FAT DIR <path>
   FAT COPY <src> <dst>
   FAT REN <from> <to>
-  FAT DEL <path><fn>
+  FAT DEL <path>[<file>|<dir>]
+  FAT MD <path>
+  FAT FORMAT <drv>
 
   CP/M filespec: <d>:FILENAME.EXT (<d> is CP/M drive letter A-P)
   FAT filespec:  <u>:/DIR/FILENAME.EXT (<u> is disk unit #)
@@ -61,12 +63,12 @@ NOTES:
  - Files written are not verified.
  
  - Wildcard matching in FAT filesystems is a bit unusual as
-   implemented by FatFS.  See FatFS documentation.
+   implemented by FatFs.  See FatFs documentation.
 
 BUILD NOTES:
  - Source is maintained on GitHub at https://github.com/wwarthen/FAT
 
- - Application is based on FatFS.  FatFS source is included.
+ - Application is based on FatFs.  FatFs source is included.
 
  - SDCC compiler is required to build (v3.9.0 known working).
 
@@ -75,21 +77,25 @@ BUILD NOTES:
  - See Build.cmd for sample build script under Windows.  References
    to SDCC and ZX must be updated for your environment.
    
- - Note that ff.c (core FatFS code) gneerates quite a few compiler
+ - Note that ff.c (core FatFs code) generates quite a few compiler
    warnings (all appear to be benign).
 
 TO DO:
- - Confirm HBIOS is present at startup.
-
  - Allow ^C to abort any operation in progress.
  
- - Handle wildcards in destination, i.e.:
+ - Handle wildcards in destination, e.g.:
      "FAT REN 2:/*.TXT 2:/*.BAK"
  
- - Do something intelligent with R/O and SYS files
+ - Do something intelligent with R/O and SYS files on FAT
  
 HISTORY:
- 2-May-2019: v0.9 initial release (beta)
- 7-May-2019: v0.9.1 added REN and DEL (beta)
- 8-May-2019: v0.9.2 handle file collisions w/ user prompt (beta)
- 8-Oct-2019: v0.9.3 fixed incorrect filename buffer size (MAX_FN)
+   2-May-2019: v0.9   (beta) initial release
+   7-May-2019: v0.9.1 (beta) added REN and DEL
+   8-May-2019: v0.9.2 (beta) handle file collisions w/ user prompt
+   8-Oct-2019: v0.9.3 (beta) fixed incorrect filename buffer size (MAX_FN)
+  10-Oct-2019: v0.9.4 (beta) upgraded to FatFs R0.13c
+  10-Oct-2019: v0.9.5 (beta) added MD (make directory)
+  10-Oct-2019: v0.9.6 (beta) added FORMAT
+  11-Oct-2019: v0.9.7 (beta) fix FORMAT to use existing partition table entries
+                             add attributes to directory listing
+		      
diff --git a/Source/HBIOS/hdsk.asm b/Source/HBIOS/hdsk.asm
index f253bbf3..3c8825bb 100644
--- a/Source/HBIOS/hdsk.asm
+++ b/Source/HBIOS/hdsk.asm
@@ -138,9 +138,13 @@ HDSK_RESET:
 ;   SLICE C/H/S = 65/16/16 OR 16,640 TOTAL SECTORS
 ;   ASSUME 8 SLICES, SO 16640 X 8 = 133,120 TOTAL SECTORS
 ;
+;   2048 TRKS X 16 HDS X 16 SPT = 524288 OR 80000H
+;
 HDSK_CAP:
-	LD	DE,133120 >> 16		; BLOCK COUNT MSW
-	LD	HL,133120 & $FFFF	; BLOCK COUNT LSW
+	;LD	DE,133120 >> 16		; BLOCK COUNT MSW
+	;LD	HL,133120 & $FFFF	; BLOCK COUNT LSW
+	LD	DE,8			; BLOCK COUNT MSW
+	LD	HL,0			; BLOCK COUNT LSW
 	LD	BC,512			; 512 BYTE SECTOR
 	XOR	A			; SIGNAL SUCCESS
 	RET
diff --git a/Source/Images/fd0/u0/FAT.COM b/Source/Images/fd0/u0/FAT.COM
index 2fcfc9e7..1dd7dcca 100644
Binary files a/Source/Images/fd0/u0/FAT.COM and b/Source/Images/fd0/u0/FAT.COM differ
diff --git a/Source/Images/fd1/u0/FAT.COM b/Source/Images/fd1/u0/FAT.COM
index 2fcfc9e7..1dd7dcca 100644
Binary files a/Source/Images/fd1/u0/FAT.COM and b/Source/Images/fd1/u0/FAT.COM differ
diff --git a/Source/Images/hd0/s0/u0/FAT.COM b/Source/Images/hd0/s0/u0/FAT.COM
index 2fcfc9e7..1dd7dcca 100644
Binary files a/Source/Images/hd0/s0/u0/FAT.COM and b/Source/Images/hd0/s0/u0/FAT.COM differ
diff --git a/Source/RomDsk/ROM_1024KB/FAT.COM b/Source/RomDsk/ROM_1024KB/FAT.COM
deleted file mode 100644
index 4568817c..00000000
Binary files a/Source/RomDsk/ROM_1024KB/FAT.COM and /dev/null differ