diff --git a/cetodo/cetodo.d b/cetodo/cetodo.d
index 9c85027d..269c34e2 100644
--- a/cetodo/cetodo.d
+++ b/cetodo/cetodo.d
@@ -7,7 +7,7 @@ TODO source code analyzer for Coedit projects/files
 // TODO [fields] : text
 ``
 
-- TODO: used to detect that the comment is a "TODO" comment. The keyword is not
+- TODO/FIXME: used to detect that the comment is a "TODO" comment. The keyword is not
 case sensitive.
 
 - fields: an optional list of property with a format similar to the execution argument 
@@ -28,6 +28,8 @@ possible fields include:
 
 ``// TODO-cannnotations-p8: annotate the members of the module with @safe and if possible nothrow.``
 
+``// FIXME-p8: This won't work if all the flags are OR-ed.``
+
 ## Widget-to-tool IPC:
 
 The widget calls the tool with a file list as argument and reads the process
@@ -158,8 +160,9 @@ void main(string[] args)
 
     // "TODO" 
     while (true) {
-        if (pos == text.length) break;  
-        if (identifier.strip.toUpper == "TODO") {
+        if (pos == text.length) break; 
+        auto upIdent = identifier.strip.toUpper;  
+        if (upIdent == "TODO" || upIdent == "FIXME"){
             isTodoComment = true;
             text = text[pos..$];
             break;
@@ -206,6 +209,7 @@ void main(string[] args)
 
 // samples for testing the program as a runnable module with <CFF>
 
+// fixme-p8: fixme also handled
 // TODO-cINVALID_because_no_content:              
 // TODO: set this property as const() to set it read only.
 // TODO-cfeature-sDone: save this property in the inifile.
diff --git a/src/ce_dcd.pas b/src/ce_dcd.pas
index 3f25b58f..bbe28234 100644
--- a/src/ce_dcd.pas
+++ b/src/ce_dcd.pas
@@ -194,6 +194,7 @@ procedure TCEDcdWrapper.addImportFolder(const aFolder: string);
 begin
   if not fAvailable then exit;
   //
+  while fClient.Running do sleep(1);
   fClient.Parameters.Clear;
   fClient.Parameters.Add('-I' + aFolder);
   fClient.Execute;
diff --git a/src/ce_staticexplorer.lfm b/src/ce_staticexplorer.lfm
index b8706dc2..e78fafd4 100644
--- a/src/ce_staticexplorer.lfm
+++ b/src/ce_staticexplorer.lfm
@@ -38,18 +38,19 @@ inherited CEStaticExplorerWidget: TCEStaticExplorerWidget
         OnKeyPress = TreeKeyPress
         Options = [tvoAutoItemHeight, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoRowSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
         Items.Data = {
-          F9FFFFFF02000A000000000000000000000000000000FFFFFFFF000000000000
-          00000005000000416C6961730100000001000000FFFFFFFFFFFFFFFF00000000
+          F9FFFFFF02000B000000000000000000000000000000FFFFFFFF000000000000
+          00000005000000416C696173010000000100000001000000FFFFFFFF00000000
           000000000007000000436C6173736573020000000200000002000000FFFFFFFF
-          00000000000000000005000000456E756D730300000003000000FFFFFFFFFFFF
-          FFFF0000000000000000000800000046756E6374696F6E0400000004000000FF
-          FFFFFFFFFFFFFF00000000000000000007000000496D706F7274730500000005
-          000000FFFFFFFFFFFFFFFF00000000000000000009000000496E746572666163
-          650600000006000000FFFFFFFFFFFFFFFF000000000000000000050000004D69
-          78696E0700000007000000FFFFFFFFFFFFFFFF00000000000000000007000000
-          537472756374730800000008000000FFFFFFFFFFFFFFFF000000000000000000
-          0900000054656D706C617465730000000000000000FFFFFFFFFFFFFFFF000000
-          000000000000080000005661726961626C65
+          00000000000000000005000000456E756D73030000000300000003000000FFFF
+          FFFF0000000000000000000800000046756E6374696F6E040000000400000004
+          000000FFFFFFFF00000000000000000007000000496D706F7274730500000005
+          00000005000000FFFFFFFF00000000000000000009000000496E746572666163
+          65060000000600000006000000FFFFFFFF000000000000000000050000004D69
+          78696E070000000700000007000000FFFFFFFF00000000000000000007000000
+          53747275637473080000000800000008000000FFFFFFFF000000000000000000
+          0900000054656D706C61746573000000000000000000000000FFFFFFFF000000
+          00000000000005000000556E696F6E010000000100000001000000FFFFFFFF00
+          0000000000000000080000005661726961626C65
         }
         TreeLineColor = 14671839
         TreeLinePenStyle = psSolid
diff --git a/src/ce_staticexplorer.pas b/src/ce_staticexplorer.pas
index e4c87e7d..c440e30c 100644
--- a/src/ce_staticexplorer.pas
+++ b/src/ce_staticexplorer.pas
@@ -37,7 +37,7 @@ type
     fRefreshOnChange: boolean;
     fRefreshOnFocus: boolean;
     fJsonFname: string;
-    ndAlias, ndClass, ndEnum, ndFunc: TTreeNode;
+    ndAlias, ndClass, ndEnum, ndFunc, ndUni: TTreeNode;
     ndImp, ndIntf, ndMix, ndStruct, ndTmp, ndVar: TTreeNode;
     procedure TreeDblClick(Sender: TObject);
     procedure actRefreshExecute(Sender: TObject);
@@ -138,7 +138,8 @@ begin
   ndMix     := Tree.Items[6];
   ndStruct  := Tree.Items[7];
   ndTmp     := Tree.Items[8];
-  ndVar     := Tree.Items[9];
+  ndUni     := Tree.Items[9];
+  ndVar     := Tree.Items[10];
   //
   png := TPortableNetworkGraphic.Create;
   try
@@ -360,6 +361,7 @@ begin
     ndMix.Visible   := ndMix.Count > 0;
     ndStruct.Visible:= ndStruct.Count > 0;
     ndTmp.Visible   := ndTmp.Count > 0;
+    ndUni.Visible   := ndUni.Count > 0;
     ndVar.Visible   := ndVar.Count > 0;
   end else
   begin
@@ -372,6 +374,7 @@ begin
     ndMix.Visible   := true;
     ndStruct.Visible:= true;
     ndTmp.Visible   := true;
+    ndUni.Visible   := true;
     ndVar.Visible   := true;
   end;
 end;
@@ -387,6 +390,7 @@ begin
   ndMix.DeleteChildren;
   ndStruct.DeleteChildren;
   ndTmp.DeleteChildren;
+  ndUni.DeleteChildren;
   ndVar.DeleteChildren;
 end;
 
@@ -548,6 +552,7 @@ begin
         'mixin'     :ndCat := Tree.Items.AddChildObject(ndMix, nme, ln);
         'struct'    :ndCat := Tree.Items.AddChildObject(ndStruct, nme, ln);
         'template'  :ndCat := Tree.Items.AddChildObject(ndTmp, nme, ln);
+        'union'     :ndCat := Tree.Items.AddChildObject(ndUni, nme, ln);
         'variable'  :ndCat := Tree.Items.AddChildObject(ndVar, nme, ln);
         else subjLmFromString(fLogMessager, 'static explorer does not handle this kind: '
           + knd, nil, amcApp, amkWarn);