diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/README.md b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/README.md
index f4608f5c2..c43d44b1b 100644
--- a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/README.md
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/README.md
@@ -8,7 +8,7 @@ machines:
     debugger: true
     autoStart: true
     connection: com2->vt100.serialPort
-    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml
+    config: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml
   - id: vt100
     type: pc8080
     debugger: true
@@ -22,6 +22,8 @@ IBM PC AT with VT100 Terminal and Dual Debuggers
 
 Demonstration of a [IBM PC AT with VT100 Terminal](../../vt100/) connected via COM2, with Debuggers attached.
 
+Use the DOS command `CTTY COM2` to use the VT100 for console operations.  `CTTY CON` will return control to the PC.
+
 {% include machine.html id="ibm5170" %}
 
 {% include machine.html id="vt100" %}
diff --git a/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml
new file mode 100644
index 000000000..7e6d2b68c
--- /dev/null
+++ b/devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/vt100/machine.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.2/machine.xsl"?>
+<machine id="ibm5170" type="pcx86" border="1" pos="center" background="default">
+	<name pos="center">IBM PC AT (8Mhz), 128Kb EGA, 2Mb RAM, 20Mb Hard Disk (Formatted)</name>
+	<computer id="at-ega-2048k" name="IBM PC AT" buswidth="24"/>
+	<cpu id="cpu286" model="80286" cycles="8000000" autostart="true"/>
+	<ram id="ramLow" addr="0x00000" test="false" size="0xa0000" comment="ROM BIOS memory test has been disabled"/>
+	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
+	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1985-11-15/ATBIOS-REV3.json"/>
+	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-lockfs.xml"/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
+	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-arrows.xml"/>
+	<debugger id="debugger" messages="fault" commands=""/>
+	<panel ref="/devices/pcx86/panel/wide.xml"/>
+	<hdc ref="/disks/pcx86/fixed/20mb/pcdos330-empty.xml"/>
+	<chipset id="chipset" model="5170" floppies="[1440,1200]"/>
+	<serial id="com1" adapter="1"/>
+	<serial id="com2" adapter="2"/>
+	<mouse serial="com1"/>
+</machine>
diff --git a/devices/pcx86/machine/5170/ega/640kb/README.md b/devices/pcx86/machine/5170/ega/640kb/README.md
index a622b507b..ffbd0ea35 100644
--- a/devices/pcx86/machine/5170/ega/640kb/README.md
+++ b/devices/pcx86/machine/5170/ega/640kb/README.md
@@ -7,6 +7,6 @@ redirect_from:
 ---
 
 IBM PC AT with 640Kb RAM and Enhanced Color Graphics (EGA) Display
----
+------------------------------------------------------------------
 
 * [IBM PC AT (6Mhz, 640Kb, Dual Floppy) with EGA Display](/devices/pcx86/machine/5170/ega/640kb/rev1/) ([Debugger](/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/))
diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.md b/devices/pcx86/machine/5170/ega/640kb/rev1/README.md
similarity index 79%
rename from devices/pcx86/machine/5170/ega/640kb/rev1/machine.md
rename to devices/pcx86/machine/5170/ega/640kb/rev1/README.md
index f2fea36df..0d1cec932 100644
--- a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.md
+++ b/devices/pcx86/machine/5170/ega/640kb/rev1/README.md
@@ -10,4 +10,7 @@ machines:
     type: pcx86
 ---
 
+IBM PC AT with 640Kb RAM and EGA Display
+----------------------------------------
+
 {% include machine.html id="ibm5170" %}
diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.md b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/README.md
similarity index 51%
rename from devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.md
rename to devices/pcx86/machine/5170/ega/640kb/rev1/debugger/README.md
index 5733fcaab..e826d3987 100644
--- a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.md
+++ b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/README.md
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: IBM PC AT (Model 5170, 640Kb) with EGA Display
+title: IBM PC AT (Model 5170, 640Kb) with EGA Display and Debugger
 permalink: /devices/pcx86/machine/5170/ega/640kb/rev1/debugger/
 machines:
   - id: ibm5170
@@ -8,4 +8,7 @@ machines:
     debugger: true
 ---
 
+IBM PC AT with 640Kb RAM and EGA Display and Debugger
+-----------------------------------------------------
+
 {% include machine.html id="ibm5170" %}
diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
index 23d6a1f19..b1005fc0c 100644
--- a/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
+++ b/devices/pcx86/machine/5170/ega/640kb/rev1/debugger/machine.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.2/machine.xsl"?>
 <machine id="ibm5170" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC AT, 128K EGA, 640Kb RAM</name>
+	<name pos="center">IBM PC AT, 640Kb RAM, 128K EGA</name>
 	<computer id="at-ega-640k" name="IBM PC AT" buswidth="24"/>
 	<cpu id="cpu286" model="80286"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.00 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK1.json"}, B: {name: "PC-DOS 3.00 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.00/PCDOS300-DISK2.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us84-buttons-functions.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pcx86/panel/wide.xml"/>
diff --git a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml b/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
index 621e7a90e..cfb012280 100644
--- a/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
+++ b/devices/pcx86/machine/5170/ega/640kb/rev1/machine.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcx86/1.35.2/machine.xsl"?>
 <machine id="ibm5170" type="pcx86" border="1" pos="center" background="default">
-	<name pos="center">IBM PC AT, 128K EGA, 640Kb RAM</name>
+	<name pos="center">IBM PC AT, 640Kb RAM, 128K EGA</name>
 	<computer id="at-ega-640k" name="IBM PC AT" buswidth="24"/>
 	<cpu id="cpu286" model="80286"/>
 	<ram id="ramLow" addr="0x00000" size="0xa0000"/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pcx86/rom/5170/1984-01-10/ATBIOS-REV1.json"/>
 	<video ref="/devices/pcx86/video/ibm/ega/1984-09-13/128kb-autolockfs.xml"/>
-	<fdc ref="/disks/pcx86/compiled/library.xml" pos="right" automount='{A: {name: "MS-DOS 4.00 (Disk 1)", path: "/disks/pcx86/dos/microsoft/4.00/MSDOS400-DISK1.json"}}'/>
+	<fdc ref="/disks/pcx86/compiled/library.xml" automount='{A: {name: "PC-DOS 3.30 (Disk 1)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json"}, B: {name: "PC-DOS 3.30 (Disk 2)", path: "/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pcx86/keyboard/us83-buttons-minimal.xml"/>
 	<chipset id="chipset" model="5170" floppies="[1200,1200]"/>
 	<serial id="com1" adapter="1"/>
diff --git a/disks/pcx86/shareware/pcmag/README.md b/disks/pcx86/shareware/pcmag/README.md
index 90d10250f..e5137d7c3 100644
--- a/disks/pcx86/shareware/pcmag/README.md
+++ b/disks/pcx86/shareware/pcmag/README.md
@@ -10,7 +10,7 @@ PC Magazine Disks
 To build the following collection, we started with the ZIP archives at
 "[THE PROGRAMMER'S CORNER: BBS ARCHIVE FROM THE PAST](https://www.pcorner.com/list/MAG)".
 We filtered out the duplicates, organized them chronologically, and then put their contents onto diskette
-images that you can easily "Load" and "Save" in any [PCjs Machine](devices/pcx86/machine/).
+images that you can easily "Load" and "Save" in any [PCjs Machine](/devices/pcx86/machine/).
 In fact, if you click on the name of any diskette in the headings below, a machine should automatically launch
 with that diskette loaded in drive B.
 
diff --git a/disks/pcx86/shareware/pctj/README.md b/disks/pcx86/shareware/pctj/README.md
index 374a07363..b7f285c20 100644
--- a/disks/pcx86/shareware/pctj/README.md
+++ b/disks/pcx86/shareware/pctj/README.md
@@ -43,12 +43,14 @@ to recreate from multiple ZIP archives.  It includes this note from the magazine
 	Editor                                  Editorial Director
 
 We've gone through those ZIP archives, filtered out the duplicates, organized them chronologically, and then put
-their contents onto diskette images that you can easily "Load" and "Save" in any [PCjs Machine](devices/pcx86/machine/).
+their contents onto diskette images that you can easily "Load" and "Save" in any [PCjs Machine](/devices/pcx86/machine/).
+In fact, if you click on the name of any diskette in the headings below, a machine should automatically launch
+with that diskette loaded in drive B.
 
 Looking at the dates alone, you can tell that this collection is woefully incomplete, but perhaps more will surface
 over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 
-### Directory of PC Tech Journal (1985-12)
+### Directory of [PC Tech Journal (1985-12)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281985-12%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8512   
 	 Directory of A:\
@@ -66,7 +68,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	       10 file(s)      22913 bytes
 	                      134656 bytes free
 
-### Directory of PC Tech Journal (1986-03)
+### Directory of [PC Tech Journal (1986-03)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281986-03%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8603   
 	 Directory of A:\
@@ -82,7 +84,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	        8 file(s)      30132 bytes
 	                      127488 bytes free
 
-### Directory of PC Tech Journal (1986-10)
+### Directory of [PC Tech Journal (1986-10)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281986-10%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8610   
 	 Directory of A:\
@@ -110,7 +112,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	       20 file(s)     125400 bytes
 	                       30208 bytes free
 
-### Directory of PC Tech Journal (1986-12)
+### Directory of [PC Tech Journal (1986-12)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281986-12%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8612   
 	 Directory of A:\
@@ -120,7 +122,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	        2 file(s)      11668 bytes
 	                      147968 bytes free
 
-### Directory of PC Tech Journal (1987-02)
+### Directory of [PC Tech Journal (1987-02)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281987-02%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8702   
 	 Directory of A:\
@@ -154,7 +156,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	       26 file(s)     131172 bytes
 	                       23040 bytes free
 
-### Directory of PC Tech Journal (1987-06)
+### Directory of [PC Tech Journal (1987-06)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281987-06%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8706   
 
@@ -177,7 +179,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	       11 file(s)      26069 bytes
 	                      132096 bytes free
 
-### Directory of PC Tech Journal (1987-07)
+### Directory of [PC Tech Journal (1987-07)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281987-07%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8707   
 
@@ -202,7 +204,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	       13 file(s)      21226 bytes
 	                      136192 bytes free
 
-### Directory of PC Tech Journal (1987-10)
+### Directory of [PC Tech Journal (1987-10)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281987-10%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8710   
 
@@ -220,7 +222,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	        9 file(s)      47379 bytes
 	                      110080 bytes free
 
-### Directory of PC Tech Journal (1987-11)
+### Directory of [PC Tech Journal (1987-11)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281987-11%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8711   
 	 Directory of A:\
@@ -232,7 +234,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	        4 file(s)      12349 bytes
 	                      146944 bytes free
 
-### Directory of PC Tech Journal (1988-04)
+### Directory of [PC Tech Journal (1988-04)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281988-04%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8804   
 	 Directory of A:\
@@ -250,7 +252,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	       10 file(s)      48016 bytes
 	                      109568 bytes free
 
-### Directory of PC Tech Journal (1988-05)
+### Directory of [PC Tech Journal (1988-05)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281988-05%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8805   
 	 Directory of A:\
@@ -275,7 +277,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	       17 file(s)     167280 bytes
 	                      144384 bytes free
 
-### Directory of PC Tech Journal (1988-06)
+### Directory of [PC Tech Journal (1988-06)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281988-06%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8806   
 	 Directory of A:\
@@ -289,7 +291,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	        6 file(s)      74692 bytes
 	                       83968 bytes free
 
-### Directory of PC Tech Journal (1988-07)
+### Directory of [PC Tech Journal (1988-07)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281988-07%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8807   
 	 Directory of A:\
@@ -304,7 +306,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	        7 file(s)      78053 bytes
 	                       79872 bytes free
 
-### Directory of PC Tech Journal (1988-08)
+### Directory of [PC Tech Journal (1988-08)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281988-08%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8808   
 	 Directory of A:\
@@ -321,7 +323,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	        9 file(s)      86690 bytes
 	                       71168 bytes free
 
-### Directory of PC Tech Journal (1988-09)
+### Directory of [PC Tech Journal (1988-09)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281988-09%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8809   
 
@@ -348,7 +350,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	       11 file(s)      10529 bytes
 	                      147456 bytes free
 
-### Directory of PC Tech Journal (1988-11)
+### Directory of [PC Tech Journal (1988-11)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281988-11%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8811   
 
@@ -369,7 +371,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	       12 file(s)      92715 bytes
 	                       64512 bytes free
 
-### Directory of PC Tech Journal (1988-12)
+### Directory of [PC Tech Journal (1988-12)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281988-12%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8812   
 
@@ -380,7 +382,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	        2 file(s)      11408 bytes
 	                      148480 bytes free
 
-### Directory of PC Tech Journal (1989-01)
+### Directory of [PC Tech Journal (1989-01)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %281989-01%29"%7D%7D)
 
 	 Volume in drive A is PCTJ8901   
 
@@ -391,7 +393,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	        2 file(s)       7754 bytes
 	                      152064 bytes free
 
-### Directory of PC Tech Journal (Benchmarks)
+### Directory of [PC Tech Journal (Benchmarks)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %28Benchmarks%29"%7D%7D)
 
 	 Volume in drive A is PCTBENCH   
 
@@ -436,7 +438,7 @@ over time.  [Let us know](mailto:Jeff@pcjs.org) if you find more.  Thanks.
 	       36 file(s)     472914 bytes
 	                      735744 bytes free
 
-### Directory of PC Tech Journal (Best Of)
+### Directory of [PC Tech Journal (Best Of)](/devices/pcx86/machine/5170/ega/640kb/rev1/?autoMount=%7B"B":%7B"name":"PC Tech Journal %28Best Of%29"%7D%7D)
 
 	 Volume in drive A is PCTJBEST