diff --git a/codemirror b/codemirror
index 4334727f..7ecf62fa 160000
--- a/codemirror
+++ b/codemirror
@@ -1 +1 @@
-Subproject commit 4334727f0e07acd4541b0a7b8f81a5984cd4aafe
+Subproject commit 7ecf62faa30fb0de99b76609f16c58a7bf032820
diff --git a/doc/notes.txt b/doc/notes.txt
index 1ce0a3d6..c066a3d0 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -119,6 +119,9 @@ TODO:
   - CPU debugging
   - use $readmem for inline asm programs?
   - can't add control instructions b/c of split
+  - bad error msg if >2 moduels and top module doesn't match filename
+  - separate Scope View
+  - keyboard interface
 - single-stepping vector games makes screen fade
 - break on stack overflow, illegal op, bad access, BRK, etc
 - nes
@@ -163,6 +166,8 @@ TODO:
   - make sure to flatten subdirs
   - re-publish repo (bug: doesn't put all files in local repo after publishing)
   - allow text/binary change
+  - importing from subtree commits to root anyway
+  - after publishing, only one file remaining
 - astrocade
 - keyboard shortcuts
   - ctrl+alt+l on ubuntu locks screen
diff --git a/src/worker/workermain.ts b/src/worker/workermain.ts
index 988ab59f..62ff94d5 100644
--- a/src/worker/workermain.ts
+++ b/src/worker/workermain.ts
@@ -1682,7 +1682,7 @@ function compileReadmemStmts(code, errors) {
       for (var i=0; i<lines.length; i++) {
         var line = lines[i].trim();
         if (line !== '') {
-          out += 'mem[' + i + ']=\'' + type + line + ';'
+          out += mem + '[' + i + ']=\'' + type + line + ';'
         }
       }
       return out;
@@ -1703,6 +1703,7 @@ function compileVerilator(step:BuildStep) {
   // compile verilog if files are stale
   var outjs = "main.js";
   if (staleFiles(step, [outjs])) {
+    // TODO: %Error: Specified --top-module 'ALU' isn't at the top level, it's under another cell 'cpu'
     var match_fn = makeErrorMatcher(errors, /%(.+?): (.+?):(\d+)?[:]?\s*(.+)/i, 3, 4, step.path, 2);
     var verilator_mod = emglobal.verilator_bin({
       instantiateWasm: moduleInstFn('verilator_bin'),