diff --git a/dub-integration-status.txt b/dub-integration-status.txt
deleted file mode 100644
index 61f3a9cb..00000000
--- a/dub-integration-status.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-branch 'dub-integration' was merged in 'master'.
-
-- 'master' is still stable
-- a DUB json project can be opened and compiled.
-- no error will happen because of a dub project, when a feature is not implemented for a DUB project (and there is a lot of them) what will happen is "nothing".
-- in case of bug in version 1, this will not be included. Fixes are put in the '1_fixes' branch.
-- a PR for the version 1 should be submitted to the '1_fixes' branch.
\ No newline at end of file
diff --git a/src/ce_d2syn.pas b/src/ce_d2syn.pas
index 7d7d3f50..f07a42ae 100644
--- a/src/ce_d2syn.pas
+++ b/src/ce_d2syn.pas
@@ -449,7 +449,7 @@ begin
   next;
 end;
 
-//TODO-ccomments: nested comments with multiple nesting on the same line.
+//TODO-cD2Syn: nested comments with multiple nesting on the same line.
 procedure TSynD2Syn.next;
 var
   reader: PChar;
diff --git a/src/ce_dubprojeditor.pas b/src/ce_dubprojeditor.pas
index 9606a9a9..0e4aa5fe 100644
--- a/src/ce_dubprojeditor.pas
+++ b/src/ce_dubprojeditor.pas
@@ -11,6 +11,8 @@ uses
 
 type
 
+  //TODO-cDUB: add new properties from UI
+
  { TCEDubProjectEditorWidget }
 
   TCEDubProjectEditorWidget = class(TCEWidget, ICEProjectObserver)
diff --git a/src/ce_editoroptions.pas b/src/ce_editoroptions.pas
index fdfdb300..53b06df0 100644
--- a/src/ce_editoroptions.pas
+++ b/src/ce_editoroptions.pas
@@ -500,7 +500,7 @@ begin
         except
           kst.ShortCut := 0;
           shc.shortcut := 0;
-          // TODO-cfeaure: manage shortcuts conflicts
+          // TODO-cimprovement: manage shortcuts conflicts
           // either here or in the shortcut editor.
           // by default and if a conflict exists synedit will raise an exception here.
         end;
diff --git a/src/ce_main.pas b/src/ce_main.pas
index 74a51571..17a84063 100644
--- a/src/ce_main.pas
+++ b/src/ce_main.pas
@@ -213,12 +213,6 @@ type
     fInfoWidg: TCEInfoWidget;
     fDubProjWidg: TCEDubProjectEditorWidget;
 
-    //TODO-cDUB: widget to edit and view, select config of, a DUB project.
-    // DUB format can't be wrapped as published prop so...
-    // ...visually: displayed as a tree. node = prop name.
-    // prop value editor in sync with slected node,
-    // treeview filter. add node, etc.
-
     fInitialized: boolean;
     fRunnableSw: string;
     fRunProc: TCEProcess;
@@ -226,7 +220,7 @@ type
     fMainMenuSubj: TCEMainMenuSubject;
     fAppliOpts: TCEApplicationOptions;
     procedure updateMainMenuProviders;
-    procedure updateFloatingWidgetOnTop(onTOp: boolean);
+    procedure updateFloatingWidgetOnTop(onTop: boolean);
 
     // action provider handling;
     procedure clearActProviderEntries;
@@ -1432,7 +1426,7 @@ end;
 procedure TCEMainForm.actFileAddToProjExecute(Sender: TObject);
 begin
   if fDoc = nil then exit;
-  if fDoc.isProjectSource then exit; // TODO: rename this abiguous property name to 'isProjectFile'
+  if fDoc.isProjectSource then exit; // TODO: rename this ambiguous property name to 'isProjectFile'
   if fProjectInterface = nil then exit;
   //
   if fProjectInterface.getFormat = pfNative then
@@ -1965,7 +1959,7 @@ begin
   layoutUpdateMenu;
 end;
 
-procedure TCEMainForm.updateFloatingWidgetOnTop(onTOp: boolean);
+procedure TCEMainForm.updateFloatingWidgetOnTop(onTop: boolean);
 var
   widg: TCEWidget;
 const
@@ -1974,9 +1968,9 @@ begin
   for widg in fWidgList do if (widg.Parent <> nil) and
     (widg.Parent.Parent = nil) and widg.isDockable then
   begin
-    TForm(widg.Parent).FormStyle := fstyle[onTOp];
-    //TODO: floating widg on top from true to false, widg remains on top
-    if TForm(widg.Parent).Visible then if not onTOp then
+    TForm(widg.Parent).FormStyle := fstyle[onTop];
+    //TODO-bugfix: floating widg on top from true to false, widg remains on top
+    if TForm(widg.Parent).Visible then if not onTop then
       TForm(widg.Parent).SendToBack;
   end;
 end;
diff --git a/src/ce_todolist.pas b/src/ce_todolist.pas
index 9c80802c..59e59116 100644
--- a/src/ce_todolist.pas
+++ b/src/ce_todolist.pas
@@ -12,6 +12,8 @@ uses
 
 type
 
+  //TODO-cDUB: adapt todo list to DUB projects
+
   TCETodoOptions = class(TWritableLfmTextComponent)
   private
     fAutoRefresh: boolean;