diff --git a/SourceGen/AppForms/ProjectView.Designer.cs b/SourceGen/AppForms/ProjectView.Designer.cs
index 6fa73d7..e98feda 100644
--- a/SourceGen/AppForms/ProjectView.Designer.cs
+++ b/SourceGen/AppForms/ProjectView.Designer.cs
@@ -92,6 +92,7 @@ namespace SourceGen.AppForms
             this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripSeparator();
             this.formatSplitAddressTableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toggleSingleBytesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.formatAsWordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.deleteNoteCommentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripSeparator();
             this.showHexDumpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -175,7 +176,6 @@ namespace SourceGen.AppForms
             this.symbolNameColumnHeader = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.infoGroupBox = new System.Windows.Forms.GroupBox();
             this.infoTextBox = new System.Windows.Forms.TextBox();
-            this.formatAsWordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.mainMenuStrip.SuspendLayout();
             this.mainStatusStrip.SuspendLayout();
             this.mainToolStrip.SuspendLayout();
@@ -604,6 +604,14 @@ namespace SourceGen.AppForms
             this.toggleSingleBytesToolStripMenuItem.Text = "Toggle Single-Byte Format";
             this.toggleSingleBytesToolStripMenuItem.Click += new System.EventHandler(this.ToggleSingleBytes_Click);
             // 
+            // formatAsWordToolStripMenuItem
+            // 
+            this.formatAsWordToolStripMenuItem.Name = "formatAsWordToolStripMenuItem";
+            this.formatAsWordToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
+            this.formatAsWordToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
+            this.formatAsWordToolStripMenuItem.Text = "Format As Word";
+            this.formatAsWordToolStripMenuItem.Click += new System.EventHandler(this.formatAsWordToolStripMenuItem_Click);
+            // 
             // deleteNoteCommentToolStripMenuItem
             // 
             this.deleteNoteCommentToolStripMenuItem.Name = "deleteNoteCommentToolStripMenuItem";
@@ -1453,14 +1461,6 @@ namespace SourceGen.AppForms
             this.infoTextBox.Size = new System.Drawing.Size(177, 120);
             this.infoTextBox.TabIndex = 0;
             // 
-            // formatAsWordToolStripMenuItem
-            // 
-            this.formatAsWordToolStripMenuItem.Name = "formatAsWordToolStripMenuItem";
-            this.formatAsWordToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
-            this.formatAsWordToolStripMenuItem.Size = new System.Drawing.Size(289, 22);
-            this.formatAsWordToolStripMenuItem.Text = "Format As Word";
-            this.formatAsWordToolStripMenuItem.Click += new System.EventHandler(this.formatAsWordToolStripMenuItem_Click);
-            // 
             // ProjectView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/SourceGen/AsmGen/AssemblerConfig.cs b/SourceGen/AsmGen/AssemblerConfig.cs
index 443397a..a9f6aa9 100644
--- a/SourceGen/AsmGen/AssemblerConfig.cs
+++ b/SourceGen/AsmGen/AssemblerConfig.cs
@@ -25,7 +25,7 @@ namespace SourceGen.AsmGen {
     /// application settings.
     /// </summary>
     public class AssemblerConfig {
-        // Fields are deserialized from JSON.  Changing the names will break compatibility.
+        // Public fields are deserialized from JSON.  Changing the names will break compatibility.
 
         /// <summary>
         /// Path to cross-assembler executable.  Will be null or empty if this assembler
diff --git a/SourceGen/DataAnalysis.cs b/SourceGen/DataAnalysis.cs
index a2c2292..75b5ee7 100644
--- a/SourceGen/DataAnalysis.cs
+++ b/SourceGen/DataAnalysis.cs
@@ -581,6 +581,12 @@ namespace SourceGen {
             // AnalyzeUncategorizedData=false reveals that most of the time is spent in
             // the caller, identifying the regions, so a significant improvement here won't
             // have much impact on the user experience.
+            //
+            // Vague idea: figure out how to re-use the results from the previous analysis
+            // pass.  At a superficial level we can cache the result of calling here with a
+            // particular (start, end) pair.  At a higher level we may be able to avoid
+            // the search for uncategorized data, certainly at the bank level, possibly within
+            // a bank.
 
             mDebugLog.LogI("Analyzing [+" + start.ToString("x6") + ",+" + end.ToString("x6") +"]");
 
diff --git a/SourceGen/NavStack.cs b/SourceGen/NavStack.cs
index 3beb06e..e89326d 100644
--- a/SourceGen/NavStack.cs
+++ b/SourceGen/NavStack.cs
@@ -33,6 +33,10 @@ namespace SourceGen {
         // that forward movement is always to places we've jumped to, and backward movement
         // is to places we jumped away from.
 
+        // TODO(someday): this can be simplified(?) to use a pair of stacks, one for moving
+        //   forward, one for moving backward.  Traversing the stack requires popping off one
+        //   and pushing onto the other, rather than moving the cursor.  No change in
+        //   behavior, but potentially easier to make sense of.
         // TODO(someday): record more about what was selected, so e.g. when we move back or
         //   forward to a Note we can highlight it appropriately.
         // TODO(someday): once we have the above, we can change the back button to a pop-up