diff --git a/lazproj/coedit.lpi b/lazproj/coedit.lpi
index 5f770df9..1059579c 100644
--- a/lazproj/coedit.lpi
+++ b/lazproj/coedit.lpi
@@ -140,7 +140,7 @@
         <PackageName Value="LCL"/>
       </Item6>
     </RequiredPackages>
-    <Units Count="34">
+    <Units Count="33">
       <Unit0>
         <Filename Value="coedit.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -336,23 +336,18 @@
         <UnitName Value="ce_writableComponent"/>
       </Unit30>
       <Unit31>
-        <Filename Value="..\src\ce_icons.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="ce_icons"/>
-      </Unit31>
-      <Unit32>
         <Filename Value="..\src\ce_todolist.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CETodoListWidget"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ce_todolist"/>
-      </Unit32>
-      <Unit33>
+      </Unit31>
+      <Unit32>
         <Filename Value="..\src\ce_inspectors.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ce_inspectors"/>
-      </Unit33>
+      </Unit32>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/lazproj/coedit.lpr b/lazproj/coedit.lpr
index 5de38527..ec5a945e 100644
--- a/lazproj/coedit.lpr
+++ b/lazproj/coedit.lpr
@@ -8,11 +8,12 @@ uses
   {$ENDIF}{$ENDIF}
   Interfaces, Forms, lazcontrols, runtimetypeinfocontrols, ce_observer, ce_libman,
   ce_tools, ce_dcd, ce_main, ce_writableComponent, ce_options, ce_symstring,
-  ce_staticmacro, ce_icons, ce_inspectors;
+  ce_staticmacro, ce_inspectors, LResources;
 
 {$R *.res}
 
 begin
+  {$I ../src/ce_icons.inc}
   Application.Initialize;
   Application.CreateForm(TCEMainForm, CEMainForm);
   Application.Run;
diff --git a/src/ce_d2syn.pas b/src/ce_d2syn.pas
index 365bb2ec..d13913b2 100644
--- a/src/ce_d2syn.pas
+++ b/src/ce_d2syn.pas
@@ -430,8 +430,6 @@ begin
 end;
 
 //TODO-ccomments: nested comments with multiple nesting on the same line.
-
-{$BOOLEVAL ON}
 procedure TSynD2Syn.next;
 var
   reader: PChar;
@@ -801,7 +799,6 @@ begin
   // Should not happend
   assert(false);
 end;
-{$BOOLEVAL OFF}
 
 function TSynD2Syn.GetEol: Boolean;
 begin
diff --git a/src/ce_editor.pas b/src/ce_editor.pas
index bc952904..a1f8caa3 100644
--- a/src/ce_editor.pas
+++ b/src/ce_editor.pas
@@ -99,7 +99,7 @@ begin
   //
   completion.OnPaintItem := @completionItemPaint;
   fSyncEdit := TSynPluginSyncroEdit.Create(self);
-  //TODO: activate this after next Laz release
+  //TODO-ccLCL&LAZ-specific: activate this after next Laz release
   //fSyncEdit.CaseSensitive:=true;
   bmp := TBitmap.Create;
   try
@@ -289,9 +289,7 @@ end;
 procedure TCEEditorWidget.memoMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
 begin
   if not (ssLeft in Shift) then exit;
-  //
   beginUpdateByDelay;
-  UpdateByEvent;
 end;
 
 procedure TCEEditorWidget.memoCtrlClick(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
@@ -356,6 +354,7 @@ var
   md: string;
 begin
   if fDoc = nil then exit;
+  UpdateByEvent;
   if not fKeyChanged then exit;
   //
   fKeyChanged := false;
diff --git a/src/ce_icons.pas b/src/ce_icons.pas
deleted file mode 100644
index d26a3802..00000000
--- a/src/ce_icons.pas
+++ /dev/null
@@ -1,16 +0,0 @@
-unit ce_icons;
-
-{$I ce_defines.inc}
-
-interface
-
-uses
-  Classes, SysUtils, LResources;
-
-implementation
-
-
-initialization
-  {$I ce_icons.inc}
-end.
-
diff --git a/src/ce_main.pas b/src/ce_main.pas
index fcfd9f13..3316b68c 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -539,7 +539,7 @@ begin
   if not Visible then exit;
   //
   if WindowState = wsMinimized then WindowState := wsNormal;
-  // TODO-cbugfix: check new docking persistence behaviour on new Laz release.
+  // TODO-cLCL&LAZ-specific: check new docking persistence behaviour on new Laz release.
   // does not save minimized/undocked windows to prevent bugs
   for i:= 0 to fWidgList.Count-1 do
   begin
@@ -1353,8 +1353,6 @@ label
 begin
   if fProject.currentConfiguration.outputOptions.binaryKind <> executable then
   begin
-    // TODO-cfeature: define an alternative exe name for shared lib:
-    // e.g: the dll produced by the proj. is the input filename of an host app.
     dlgOkInfo('Non executable projects cant be run');
     exit;
   end;
@@ -1425,7 +1423,7 @@ var
   xcfg: TXMLConfigStorage;
   i: NativeInt;
 begin
-  // TODO-cbugfix: possible loading AV, xml saved after undocking some widgets, xml file abnormal size.
+  // TODO-cLCL&LAZ-specific: possible loading AV, xml saved after undocking some widgets, xml file abnormal size.
   for i:= 0 to fWidgList.Count-1 do
   begin
     if DockMaster.GetAnchorSite(fWidgList.widget[i]).WindowState = wsMinimized then
diff --git a/src/ce_miniexplorer.pas b/src/ce_miniexplorer.pas
index c90ebdc8..01bd839f 100644
--- a/src/ce_miniexplorer.pas
+++ b/src/ce_miniexplorer.pas
@@ -112,8 +112,8 @@ begin
   Tree.OnExpanding := @treeExpanding;
 
   // http://bugs.freepascal.org/view.php?id=27137
-  // TODO-cCleanup: remove comment after next Laz release
-  // TODO-cfeature, try the new TListViewFilterEdit here.
+  // TODO-cLCL&LAZ-specific: remove comment after next Laz release
+  // TODO-cLCL&LAZ-specific, try the new TListViewFilterEdit here.
   lstFilter.FilteredListbox := nil;
   lstFilter.onChange := @lstFilterChange;
   //
diff --git a/src/ce_todolist.pas b/src/ce_todolist.pas
index a5cb088a..0efd9cb4 100644
--- a/src/ce_todolist.pas
+++ b/src/ce_todolist.pas
@@ -179,8 +179,8 @@ begin
   fAutoRefresh := true;
   mnuAutoRefresh.Checked := true;
   // http://bugs.freepascal.org/view.php?id=27137
-  // TODO-cCleanup: remove comment after next Laz release
-  // TODO-cfeature, try the new TListViewFilterEdit here.
+  // TODO-cLCL&LAZ-specific: remove comment after next Laz release
+  // TODO-cLCL&LAZ-specific, try the new TListViewFilterEdit here.
   lstfilter.OnChange:= @filterItems;
   //
   png := TPortableNetworkGraphic.Create;