diff --git a/.editorconfig b/.editorconfig
index 0e59231a7..5395899c4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,7 +17,12 @@ indent_style = tab
 indent_size = 8
 trim_trailing_whitespace = true
 
-[*.{C,H,c,h,xml,xsl}]
+[*.{C,CPP,H,c,cpp,h}]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{xml,xsl}]
 indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
diff --git a/modules/pc8080/lib/chipset.js b/modules/pc8080/lib/chipset.js
index 3b07b5b8b..4b2a63544 100644
--- a/modules/pc8080/lib/chipset.js
+++ b/modules/pc8080/lib/chipset.js
@@ -440,7 +440,19 @@ ChipSet.VT100.INIT = [
         ChipSet.VT100.DC011.INIT
     ],
     [
-        0, 0, 0, 0, new Array(100)
+        0, 0, 0, 0,
+        [
+            0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80,
+            0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80,
+            0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80,
+            0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e80, 0x2e00,
+            0x2e08, 0x2e8e, 0x2e00, 0x2e50, 0x2e30, 0x2e40, 0x2e20, 0x2e00, 0x2ee0, 0x2ee0,
+            0x2e51, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+        ]
     ]
 ];
 
@@ -794,7 +806,7 @@ ChipSet.prototype.doNVRCommand = function()
         addr = this.getNVRAddr();
         data = this.aNVRWords[addr];
         /*
-         * Since we don't explicitly initialize aNVRWords[], we pretend any uninitialized words contains WORDMASK.
+         * If we don't explicitly initialize aNVRWords[], pretend any uninitialized words contains WORDMASK.
          */
         if (data == null) data = ChipSet.VT100.NVR.WORDMASK;
         this.wNVRData = data;