diff --git a/cetodo/cetodo.d b/cetodo/cetodo.d
index b368030e..9c85027d 100644
--- a/cetodo/cetodo.d
+++ b/cetodo/cetodo.d
@@ -43,7 +43,7 @@ import std.stdio, std.getopt, std.string;
 import std.array, std.conv, std.traits;
 import std.file, std.path, std.range;
 // libdparse
-import std.d.ast, std.d.lexer, std.d.parser;
+import std.d.lexer;
 
 /// Encapsulates the fields of a _TODO comment_.
 private struct TodoItem 
diff --git a/src/ce_editor.pas b/src/ce_editor.pas
index 9210a551..4907f184 100644
--- a/src/ce_editor.pas
+++ b/src/ce_editor.pas
@@ -36,7 +36,6 @@ type
   private
     fKeyChanged: boolean;
     fDoc: TCESynMemo;
-    // http://bugs.freepascal.org/view.php?id=26329
     // TODO-cbugfix: syncro-edit partially broken, undetermined condition
     // TODO-cbugfix: syncro-edit icon hidden after deletion, if doc is saved (as temp file, by the static explorer)
     fSyncEdit: TSynPluginSyncroEdit;
@@ -51,7 +50,6 @@ type
     procedure memoKeyPress(Sender: TObject; var Key: char);
     procedure memoKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure memoMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-    procedure memoChange(Sender: TObject);
     procedure memoCtrlClick(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
     procedure memoMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
     function getEditor(index: NativeInt): TCESynMemo;
@@ -59,15 +57,15 @@ type
     function getEditorIndex: NativeInt;
     procedure getCompletionList;
     procedure getSymbolLoc;
-  public
-    constructor create(aOwner: TComponent); override;
-    destructor destroy; override;
     procedure focusedEditorChanged;
     //
     procedure docNew(aDoc: TCESynMemo);
     procedure docClosing(aDoc: TCESynMemo);
     procedure docFocused(aDoc: TCESynMemo);
     procedure docChanged(aDoc: TCESynMemo);
+  public
+    constructor create(aOwner: TComponent); override;
+    destructor destroy; override;
     //
     property editor[index: NativeInt]: TCESynMemo read getEditor;
     property editorCount: NativeInt read getEditorCount;
@@ -80,7 +78,6 @@ implementation
 uses
   ce_main;
 
-
 procedure TCEEditorPage.SetVisible(Value: Boolean);
 var
   i: integer;
@@ -102,7 +99,7 @@ begin
   //
   completion.OnPaintItem := @completionItemPaint;
   fSyncEdit := TSynPluginSyncroEdit.Create(self);
-  //TODO: activate this after enxt Laz release
+  //TODO: activate this after next Laz release
   //fSyncEdit.CaseSensitive:=true;
   bmp := TBitmap.Create;
   try
@@ -295,10 +292,6 @@ begin
   UpdateByEvent;
 end;
 
-procedure TCEEditorWidget.memoChange(Sender: TObject);
-begin
-end;
-
 procedure TCEEditorWidget.memoCtrlClick(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
   getSymbolLoc;
@@ -358,8 +351,6 @@ end;
 
 procedure TCEEditorWidget.UpdateByDelay;
 var
-  //dt: PMessageItemData;
-  //err: TLexError;
   md: string;
 begin
   if fDoc = nil then exit;
diff --git a/src/ce_main.pas b/src/ce_main.pas
index 5ed8df74..1313591b 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -523,7 +523,7 @@ begin
 
   for i := 0 to fWidgList.Count-1 do
   begin
-    DockMaster.MakeDockable(fWidgList.widget[i],true);
+    DockMaster.MakeDockable(fWidgList.widget[i], false);
     DockMaster.GetAnchorSite(fWidgList.widget[i]).Header.HeaderPosition := adlhpTop;
   end;
 
diff --git a/src/ce_todolist.pas b/src/ce_todolist.pas
index 1ef14fed..35020ae3 100644
--- a/src/ce_todolist.pas
+++ b/src/ce_todolist.pas
@@ -292,6 +292,7 @@ begin
   fToolProcess.Executable := ToolExeName;
   fToolProcess.Options := [poUsePipes];
   fToolProcess.ShowWindow := swoHIDE;
+  fToolProcess.CurrentDirectory := ExtractFileDir(Application.ExeName);
 
   // Something not quite clear:
   // --------------------------