diff --git a/DocGen/images/dtm.png b/DocGen/images/dtm.png
new file mode 100644
index 000000000..b229ffc4d
Binary files /dev/null and b/DocGen/images/dtm.png differ
diff --git a/Source/editor/simba.editor_autocomplete.pas b/Source/editor/simba.editor_autocomplete.pas
index 5729953ec..e6f4d493a 100644
--- a/Source/editor/simba.editor_autocomplete.pas
+++ b/Source/editor/simba.editor_autocomplete.pas
@@ -334,7 +334,7 @@ constructor TSimbaAutoComplete_Form.Create(AOwner: TComponent);
 
 procedure TSimbaAutoComplete.ContinueCompletion(Data: PtrInt);
 begin
-  Editor.CommandProcessor(ecChar, Char(Byte(Data)), nil);
+  Editor.CommandProcessor(TSynEditorCommand(Data), #0, nil);
 end;
 
 procedure TSimbaAutoComplete.DoCodeCompletion(var Value: String; SourceValue: String; var SourceStart, SourceEnd: TPoint; KeyChar: TUTF8Char; Shift: TShiftState);
@@ -346,10 +346,11 @@ procedure TSimbaAutoComplete.DoCodeCompletion(var Value: String; SourceValue: St
     Value := SourceValue
   else
     Value := Decl.Name;
+  Value := Value + KeyChar;
 
   case KeyChar of
-    '.': Application.QueueAsyncCall(@ContinueCompletion, Ord('.'));
-    ',': Application.QueueAsyncCall(@ContinueCompletion, Ord(','));
+    '.': Application.QueueAsyncCall(@ContinueCompletion, TSimbaEditor(Editor).AutoComplete.AutoCompleteCommand);
+    ',','(': Application.QueueAsyncCall(@ContinueCompletion, TSimbaEditor(Editor).ParamHint.ParamHintCommand);
   end;
 end;
 
diff --git a/Source/forms/simba.functionlistform.pas b/Source/forms/simba.functionlistform.pas
index bcc757328..b3ae059f0 100644
--- a/Source/forms/simba.functionlistform.pas
+++ b/Source/forms/simba.functionlistform.pas
@@ -154,6 +154,7 @@ function GetURL(const Section: String): String;
     'Matrix':         Result := 'https://villavu.github.io/Simba/Matrix.html';
     'Misc':           Result := 'https://villavu.github.io/Simba/Misc.html';
     'Dialogs':        Result := 'https://villavu.github.io/Simba/Dialogs.html';
+    'DTM':            Result := 'https://villavu.github.io/Simba/DTM.html';
   end;
 end;
 
diff --git a/Source/script/imports/simbaclasses/simba.import_class_dtm.pas b/Source/script/imports/simbaclasses/simba.import_class_dtm.pas
index 805ac8b40..72e8076d1 100644
--- a/Source/script/imports/simbaclasses/simba.import_class_dtm.pas
+++ b/Source/script/imports/simbaclasses/simba.import_class_dtm.pas
@@ -20,6 +20,8 @@ implementation
 DTM
 ===
 DTM related methods
+
+Image:: ../images/dtm.png
 *)
 
 (*
diff --git a/Source/simba.bitmap.pas b/Source/simba.bitmap.pas
index e412e23ba..7221cf85d 100644
--- a/Source/simba.bitmap.pas
+++ b/Source/simba.bitmap.pas
@@ -220,10 +220,10 @@   TSimbaImage = class(TSimbaBaseClass)
 implementation
 
 uses
-  BMPcomn,
+  BMPcomn, fpqoi_simba,
   simba.overallocatearray, simba.geometry, simba.tpa, simba.datetime,
   simba.encoding, simba.compress, simba.math,
-  simba.nativeinterface, simba.singlematrix, fpqoi_simba,
+  simba.nativeinterface, simba.singlematrix,
   simba.image_lazbridge, simba.rgbsumtable;
 
 function GetDistinctColor(const Color, Index: Integer): Integer; inline;