diff --git a/src/ce_customtools.pas b/src/ce_customtools.pas
index d679a6a2..a69c56ce 100644
--- a/src/ce_customtools.pas
+++ b/src/ce_customtools.pas
@@ -19,7 +19,7 @@ type
     fOpts: TProcessOptions;
     fParameters: TStringList;
     fToolAlias: string;
-    fShortcut: string;
+    //fShortcut: string;
     fLogMessager: TCELogMessageSubject;
     procedure setParameters(const aValue: TStringList);
     procedure processOUtput(sender: TObject);
diff --git a/src/ce_d2syn.pas b/src/ce_d2syn.pas
index 47167383..66bcc20e 100644
--- a/src/ce_d2syn.pas
+++ b/src/ce_d2syn.pas
@@ -727,7 +727,7 @@ begin
     exit;
   end;
 
-  // symbChars 1: ponctuation
+  // symbChars 1: punctuation
   if isSymbol(reader^) then
   begin
     fTokKind := tkSymbl;
diff --git a/src/ce_interfaces.pas b/src/ce_interfaces.pas
index 92be8bb0..d2b57882 100644
--- a/src/ce_interfaces.pas
+++ b/src/ce_interfaces.pas
@@ -5,7 +5,7 @@ unit ce_interfaces;
 interface
 
 uses
-  Classes, SysUtils, actnList, process, menus,
+  Classes, SysUtils, actnList, menus,
   ce_synmemo, ce_project, ce_observer;
 
 type
diff --git a/src/ce_main.pas b/src/ce_main.pas
index 47861530..324dc787 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, FileUtil, SynEditKeyCmds, SynHighlighterLFM, Forms, asyncprocess,
   AnchorDocking, AnchorDockStorage, AnchorDockOptionsDlg, Controls, Graphics,
-  Dialogs, Menus, ActnList, ExtCtrls, process, XMLPropStorage, ComCtrls, dynlibs,
+  Dialogs, Menus, ActnList, ExtCtrls, process, XMLPropStorage, dynlibs,
   ce_common, ce_dmdwrap, ce_project, ce_dcd, ce_plugin, ce_synmemo, ce_widget,
   ce_messages, ce_interfaces, ce_editor, ce_projinspect, ce_projconf, ce_search,
   ce_staticexplorer, ce_miniexplorer, ce_libman, ce_libmaneditor, ce_customtools,
@@ -292,7 +292,7 @@ implementation
 {$R *.lfm}
 
 uses
-  SynMacroRecorder, strutils, ce_options, ce_symstring;
+  SynMacroRecorder, ce_options, ce_symstring;
 
 {$REGION Standard Comp/Obj------------------------------------------------------}
 constructor TCEMainForm.create(aOwner: TComponent);
@@ -809,7 +809,6 @@ begin
       actFileSaveAll.Enabled := false;
       actFileOpenContFold.Enabled := false;
     end;
-
     hasProj := fProject <> nil;
     actProjSave.Enabled := hasProj;
     actProjSaveAs.Enabled := hasProj;
@@ -826,11 +825,10 @@ begin
       actProjRun.Enabled := fProject.canBeRun;
       actProjRunWithArgs.Enabled := fProject.canBeRun;
     end;
-
     actFileAddToProj.Enabled := hasEd and hasProj;
-
   finally
     Dec(fUpdateCount);
+    Handled := true;
   end;
 end;
 
@@ -1720,19 +1718,19 @@ end;
 {$ENDREGION}
 
 procedure PlugDispatchToHost(aPlugin: TCEPlugin; opCode: LongWord; data0: Integer; data1, data2: Pointer); cdecl;
-var
-  ctxt: NativeUint;
-  oper: NativeUint;
+//var
+  //ctxt: NativeUint;
+  //oper: NativeUint;
 begin
 
   if opCode = HELLO_PLUGIN then begin
       dlgOkInfo('Hello plugin');
       exit;
   end;
-
+{
   ctxt := opCode and $0F000000;
   oper := opCode and $000FFFFF;
-{
+
   case ctxt of
     CTXT_MSGS:
       case oper of
diff --git a/src/ce_messages.pas b/src/ce_messages.pas
index ceb81907..b49af714 100644
--- a/src/ce_messages.pas
+++ b/src/ce_messages.pas
@@ -6,9 +6,8 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, ComCtrls,
-  lcltype, ce_widget, ActnList, Menus, clipbrd, AnchorDocking, process,
-  asyncprocess, Buttons, ce_common, ce_project, ce_synmemo, ce_dlangutils,
-  ce_interfaces, ce_observer;
+  lcltype, ce_widget, ActnList, Menus, clipbrd, AnchorDocking, Buttons,
+  ce_common, ce_project, ce_synmemo, ce_dlangutils, ce_interfaces, ce_observer;
 
 type
 
diff --git a/src/ce_staticexplorer.pas b/src/ce_staticexplorer.pas
index cacc657a..a3acf7f3 100644
--- a/src/ce_staticexplorer.pas
+++ b/src/ce_staticexplorer.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, TreeFilterEdit, Forms, Controls, Graphics, ExtCtrls, Menus,
-  ComCtrls, ce_widget, jsonparser, fpjson, asyncprocess, process, actnlist, Buttons,
+  ComCtrls, ce_widget, jsonparser, fpjson, process, actnlist, Buttons,
   ce_common, ce_project, ce_observer, ce_synmemo, ce_interfaces;
 
 type
diff --git a/src/ce_symstring.pas b/src/ce_symstring.pas
index 671407e3..b403d697 100644
--- a/src/ce_symstring.pas
+++ b/src/ce_symstring.pas
@@ -9,7 +9,6 @@ uses
 
 type
 
-
   (**
    * Enumerates the symbol kinds, used to index an associative array.
    *)
diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index 098495d8..244c0148 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -65,6 +65,8 @@ constructor TCESynMemo.Create(aOwner: TComponent);
 begin
   inherited;
   Font.Quality := fqProof;
+  //Font.CharSet := OEM_CHARSET;
+  Font.Pitch := fpFixed;
   TabWidth := 4;
   BlockIndent := 4;
   Options :=