diff --git a/README.md b/README.md
index 0b8db57f9..af350beb4 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ includes:
 
 * [PCx86](/docs/pcx86/), an x86-based IBM PC and PC-compatible emulator
 * [PC8080](/modules/pc8080/), an 8080 machine emulator (e.g., [Space Invaders](/devices/pc8080/machine/invaders/), [VT100 Terminal](/devices/pc8080/machine/vt100/))
-* [C1Pjs](/docs/c1pjs/), an emulation of the 6502-based Ohio Scientific [Challenger 1P](/devices/c1p/)
+* [C1Pjs](/docs/c1pjs/), an emulation of the 6502-based [Ohio Scientific Challenger 1P](/devices/c1p/)
 * [PDPjs](/modules/pdp11/), a PDP-11 machine emulator currently in development (e.g., [PDP-11/20 and PDP-11/70](/devices/pdp11/machine/))
 
 All PCjs computer simulations are written entirely in [JavaScript](/modules/).  No Flash, Java or other plugins are
diff --git a/_config.yml b/_config.yml
index 40d602be6..52b879803 100644
--- a/_config.yml
+++ b/_config.yml
@@ -63,6 +63,7 @@ pcjs:
     - /modules/shared/lib/dumpapi.js
     - /modules/shared/lib/reportapi.js
     - /modules/shared/lib/userapi.js
+    - /modules/shared/lib/keys.js
     - /modules/shared/lib/strlib.js
     - /modules/shared/lib/usrlib.js
     - /modules/shared/lib/weblib.js
@@ -94,6 +95,7 @@ pcjs:
     - /modules/pcx86/lib/disk.js
     - /modules/pcx86/lib/fdc.js
     - /modules/pcx86/lib/hdc.js
+    - /modules/shared/lib/debugger.js
     - /modules/pcx86/lib/debugger.js
     - /modules/pcx86/lib/computer.js
     - /modules/shared/lib/state.js
@@ -104,6 +106,7 @@ pcjs:
     - /modules/shared/lib/dumpapi.js
     - /modules/shared/lib/reportapi.js
     - /modules/shared/lib/userapi.js
+    - /modules/shared/lib/keys.js
     - /modules/shared/lib/strlib.js
     - /modules/shared/lib/usrlib.js
     - /modules/shared/lib/weblib.js
@@ -123,11 +126,11 @@ pcjs:
     - /modules/pc8080/lib/keyboard.js
     - /modules/pc8080/lib/video.js
     - /modules/pc8080/lib/serialport.js
+    - /modules/shared/lib/debugger.js
     - /modules/pc8080/lib/debugger.js
     - /modules/pc8080/lib/computer.js
     - /modules/shared/lib/state.js
     - /modules/shared/lib/embed.js
-    - /modules/shared/lib/save.js
   pdp11_scripts:
     - /modules/shared/lib/defines.js
     - /modules/shared/lib/dumpapi.js
diff --git a/_posts/2016-10-06-introducing-pdpjs-a-pdp-11-emulator.md b/_posts/2016-10-06-introducing-pdpjs-a-pdp-11-emulator.md
index deb4977f6..194095857 100644
--- a/_posts/2016-10-06-introducing-pdpjs-a-pdp-11-emulator.md
+++ b/_posts/2016-10-06-introducing-pdpjs-a-pdp-11-emulator.md
@@ -44,8 +44,8 @@ The first new device component is
 only means PDPjs has of communicating with the outside world.  So you can try
 [PDPjs connected to a VT100 Terminal](http://www.pcjs.org/devices/pdp11/machine/1170/vt100/), by clicking the "Run"
 button on the test machine.  The test machine is running
-[custom boot code](https://github.com/jeffpar/pcjs/blob/master/devices/pdp11/rom/custom/boot.mac) written by Paul,
-but due to the lack of other device support, nothing can be booted yet.
+[custom boot code](https://github.com/jeffpar/pcjs/blob/master/apps/pdp11/boot/test/BOOTTEST.mac), adapted from boot code
+written by Paul, but due to the lack of other device support, nothing can be booted yet.
 
 Obviously PDPjs is very much a work-in-progress.  Before I proceed much farther, I really want to put the CPU through
 some rigorous testing, so I'll be on the lookout for some comprehensive PDP-11 instruction tests.  Or I'll write my own,
diff --git a/index.md b/index.md
index 5aec3230c..38aa59eb9 100644
--- a/index.md
+++ b/index.md
@@ -17,8 +17,8 @@ includes:
 
 * [PCx86](/docs/pcx86/), an x86-based IBM PC and PC-compatible emulator
 * [PC8080](/modules/pc8080/), an 8080 machine emulator (e.g., [Space Invaders](/devices/pc8080/machine/invaders/), [VT100 Terminal](/devices/pc8080/machine/vt100/))
-* [C1Pjs](/docs/c1pjs/), an emulation of the 6502-based Ohio Scientific [Challenger 1P](/devices/c1p/)
-* [PDPjs](/modules/pdp11/), a PDP-11 machine emulator currently in development (e.g., [PDP-11/70](/devices/pdp11/machine/1170/))
+* [C1Pjs](/docs/c1pjs/), an emulation of the 6502-based [Ohio Scientific Challenger 1P](/devices/c1p/)
+* [PDPjs](/modules/pdp11/), a PDP-11 machine emulator currently in development (e.g., [PDP-11/20 and PDP-11/70](/devices/pdp11/machine/))
 
 All PCjs computer simulations are written entirely in [JavaScript](/modules/).  No Flash, Java or other plugins are
 required.  Supported browsers include modern versions of Chrome, Safari, Firefox, Internet Explorer (v9.0 and up), Edge,
diff --git a/package.json b/package.json
index f5171f3ce..716da6f99 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,7 @@
   ],
   "c1pJSFiles": [
     "./modules/shared/lib/defines.js",
+    "./modules/shared/lib/nodebug.js",
     "./modules/shared/lib/dumpapi.js",
     "./modules/shared/lib/reportapi.js",
     "./modules/shared/lib/strlib.js",
@@ -100,6 +101,7 @@
   ],
   "pcX86Files": [
     "./modules/shared/lib/defines.js",
+    "./modules/shared/lib/nodebug.js",
     "./modules/shared/lib/diskapi.js",
     "./modules/shared/lib/dumpapi.js",
     "./modules/shared/lib/reportapi.js",
@@ -145,6 +147,7 @@
   ],
   "pc8080Files": [
     "./modules/shared/lib/defines.js",
+    "./modules/shared/lib/nodebug.js",
     "./modules/shared/lib/dumpapi.js",
     "./modules/shared/lib/reportapi.js",
     "./modules/shared/lib/userapi.js",
@@ -176,6 +179,7 @@
   ],
   "pdp11Files": [
     "./modules/shared/lib/defines.js",
+    "./modules/shared/lib/nodebug.js",
     "./modules/shared/lib/dumpapi.js",
     "./modules/shared/lib/reportapi.js",
     "./modules/shared/lib/userapi.js",