diff --git a/IDE/src/Commands.bf b/IDE/src/Commands.bf
index 4c2ccb6f..a7c6ee0d 100644
--- a/IDE/src/Commands.bf
+++ b/IDE/src/Commands.bf
@@ -184,7 +184,7 @@ namespace IDE
 			Add("Breakpoint Symbol", new () => { gApp.mBreakpointPanel.AddSymbolBreakpoint(gApp.[Friend]GetCurrentWindow()); });
 			Add("Breakpoint Toggle Thread", new => gApp.[Friend]ToggleThreadBreakpoint, .Editor);
 			Add("Breakpoint Toggle", new => gApp.[Friend]ToggleBreakpoint, .Editor);
-			Add("Build Solution", new => gApp.[Friend]Compile);
+			Add("Build Workspace", new => gApp.[Friend]Compile);
 			Add("Cancel Build", new => gApp.[Friend]CancelBuild);
 			Add("Clean Beef", new => gApp.Cmd_CleanBeef);
 			Add("Clean", new => gApp.Cmd_Clean);
diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf
index c26ca89d..3f901863 100644
--- a/IDE/src/IDEApp.bf
+++ b/IDE/src/IDEApp.bf
@@ -5263,8 +5263,10 @@ namespace IDE
 			advancedEditMenu.AddMenuItem(null);
 			AddMenuItem(advancedEditMenu, "Make Uppercase", "Make Uppercase");
 			AddMenuItem(advancedEditMenu, "Make Lowercase", "Make Lowercase");
-			mViewWhiteSpace.mMenu = AddMenuItem(advancedEditMenu, "View White Space", "View White Space", null, null, true, mViewWhiteSpace.Bool ? 1 : 0);
+			AddMenuItem(advancedEditMenu, "Comment Selection", "Comment Selection");
+			AddMenuItem(advancedEditMenu, "Uncomment Selection", "Uncomment Selection");
 			AddMenuItem(advancedEditMenu, "Reformat Document", "Reformat Document");
+			mViewWhiteSpace.mMenu = AddMenuItem(advancedEditMenu, "View White Space", "View White Space", null, null, true, mViewWhiteSpace.Bool ? 1 : 0);
 
 			if (mSettings.mEnableDevMode)
 			{
@@ -5301,7 +5303,7 @@ namespace IDE
 			//////////
 
             subMenu = root.AddMenuItem("&Build");
-			AddMenuItem(subMenu, "&Build Solution", "Build Solution", new => UpdateMenuItem_HasWorkspace);
+			AddMenuItem(subMenu, "&Build Workspace", "Build Workspace", new => UpdateMenuItem_HasWorkspace);
             AddMenuItem(subMenu, "&Clean", "Clean", new => UpdateMenuItem_DebugStopped_HasWorkspace);
             AddMenuItem(subMenu, "Clean Beef", "Clean Beef", new => UpdateMenuItem_DebugStopped_HasWorkspace);
 			//subMenu.AddMenuItem("Compile Current File", null, new (menu) => { CompileCurrentFile(); });
@@ -13089,6 +13091,23 @@ namespace IDE
 			}
 		}
 
+		void VerifyModifiedBuffers()
+		{
+			mWorkspace.WithProjectItems(scope (projectItem) =>
+				{
+					var projectSource = projectItem as ProjectSource;
+					if (projectSource != null)
+					{
+						if ((projectSource.mEditData != null) && (projectSource.mEditData.HasTextChanged()))
+						{
+							var sourceViewPanel = projectSource.mEditData?.mEditWidget.mPanel as SourceViewPanel;
+							Debug.Assert(sourceViewPanel != null);
+						}
+					}
+				
+				});
+		}
+
         public override void Update(bool batchStart)
         {
 			scope AutoBeefPerf("IDEApp.Update");
@@ -13098,6 +13117,11 @@ namespace IDE
 
 			}*/
 
+#if DEBUG
+			if (mUpdateCnt % 120 == 0)
+				VerifyModifiedBuffers();
+#endif
+
 			if (mWantShowOutput)
 			{
 				ShowOutput();
diff --git a/IDE/src/Settings.bf b/IDE/src/Settings.bf
index 0ad71d9a..0327611d 100644
--- a/IDE/src/Settings.bf
+++ b/IDE/src/Settings.bf
@@ -718,7 +718,7 @@ namespace IDE
 				Add("Breakpoint Disable", "Ctrl+F9");
 				Add("Breakpoint Toggle", "F9");
 				Add("Breakpoint Toggle Thread", "Shift+F9");
-				Add("Build Solution", "F7");
+				Add("Build Workspace", "F7");
 				Add("Cancel Build", "Ctrl+Break");
 				Add("Close Document", "Ctrl+W");
 				Add("Compile File", "Ctrl+F7");