diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof
index 962f80d9..8727da16 100755
--- a/editor/studio/AMXX_Studio.dof
+++ b/editor/studio/AMXX_Studio.dof
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=3
 Release=0
-Build=32
+Build=35
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X Dev Team
 FileDescription=
-FileVersion=1.3.0.32
+FileVersion=1.3.0.35
 InternalName=
 LegalCopyright=
 LegalTrademarks=
diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe
index 6603a1fe..84a1b93a 100755
Binary files a/editor/studio/AMXX_Studio.exe and b/editor/studio/AMXX_Studio.exe differ
diff --git a/editor/studio/AMXX_Studio.res b/editor/studio/AMXX_Studio.res
index ab82884a..55c9d493 100755
Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ
diff --git a/editor/studio/UnitCodeUtils.pas b/editor/studio/UnitCodeUtils.pas
index ce5ff22d..aba9aa0d 100755
--- a/editor/studio/UnitCodeUtils.pas
+++ b/editor/studio/UnitCodeUtils.pas
@@ -473,7 +473,7 @@ begin
   if Pos('(', eStr) = 0 then
     Result := ''
   else
-    Result := Trim(Copy(eStr, 1, Pos('(', eStr)));
+    Result := Trim(Copy(eStr, 1, Pos('(', eStr) -1));
 end;
 
 end.
diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas
index a5f49221..873f24ac 100755
--- a/editor/studio/UnitfrmMain.pas
+++ b/editor/studio/UnitfrmMain.pas
@@ -517,6 +517,7 @@ begin
     frmSettings.lstFunctions.Items.Add(TACFunction(eACList.Items[i]).Name);
 
   if frmSettings.ShowModal = mrOk then begin
+    Screen.Cursor := crHourGlass;
     { Shortcuts }
     for i := 0 to frmSettings.lvShortcuts.Items.Count - 1 do
       TSciKeyCommand(frmSettings.lvShortcuts.Items[i].Data).ShortCut := (TextToShortCut(frmSettings.lvShortcuts.Items[i].SubItems[0]));
@@ -603,6 +604,7 @@ begin
     eConfig.WriteString('Misc', 'LangDir', frmSettings.txtLangDir.Text);
     eConfig.WriteBool('Misc', 'ShowStatusbar', frmSettings.chkShowStatusbar.Checked);
     eACList.SaveToFile(ExtractFilePath(ParamStr(0)) + 'config\ACList.cfg');
+    Screen.Cursor := crDefault;
   end
   else begin
     { Restore Code-Snippets }
@@ -2138,16 +2140,15 @@ var i: integer;
     eFunction: String;
 begin
   CancelDisplay := not Plugin_CallTipShow(ListToDisplay.GetText);
-  if (frmSettings.chkAutoHideCT.Checked) and (jviCode.Root.Items[0].DisplayName = 'Function Call') then begin
-    eFunction := GetCurrFunc;
-    if eFunction <> '' then begin
-      eFunction := LowerCase(eFunction);
-      for i := 0 to eACList.Count -1 do begin
-        if eFunction = LowerCase(Trim(TACFunction(eACList.Items[i]).Name)) then begin
-          if TACFunction(eACList.Items[i]).Items.Count > GetFunctionPos then begin
-            CancelDisplay := True;
-            break;
-          end;
+  eFunction := GetCurrFunc;
+  if (frmSettings.chkAutoHideCT.Checked) and (eFunction <> '') then begin
+    eFunction := LowerCase(eFunction);
+
+    for i := 0 to eACList.Count -1 do begin
+      if eFunction = LowerCase(Trim(TACFunction(eACList.Items[i]).Name)) then begin
+        if TACFunction(eACList.Items[i]).Items.Count > GetFunctionPos then begin
+          CancelDisplay := True;
+          break;
         end;
       end;
     end;
diff --git a/editor/studio/UnitfrmSettings.dfm b/editor/studio/UnitfrmSettings.dfm
index 1cf5b296..513e6ccb 100755
--- a/editor/studio/UnitfrmSettings.dfm
+++ b/editor/studio/UnitfrmSettings.dfm
@@ -64,7 +64,7 @@ object frmSettings: TfrmSettings
     Top = 0
     Width = 351
     Height = 260
-    ActivePage = jspCTSettings
+    ActivePage = jspAutocompleteCheck
     PropagateEnable = False
     Align = alClient
     OnChange = jplSettingsChange
@@ -110,7 +110,7 @@ object frmSettings: TfrmSettings
         Height = 21
         Style = csDropDownList
         Color = clWindow
-        ItemHeight = 13
+        ItemHeight = 0
         TabOrder = 0
         ItemIndex = -1
         OnChange = cboLanguageChange
diff --git a/editor/studio/UnitfrmSettings.pas b/editor/studio/UnitfrmSettings.pas
index 36bdb294..8e27f736 100755
--- a/editor/studio/UnitfrmSettings.pas
+++ b/editor/studio/UnitfrmSettings.pas
@@ -1088,11 +1088,13 @@ end;
 
 procedure TfrmSettings.lvParamsDblClick(Sender: TObject);
 begin
-  frmParamEdit.Caption := 'Edit parameter information';
   if (lstFunctions.ItemIndex <> -1) and (Assigned(lvParams.Selected)) then begin
-    frmParamEdit.txtInformation.Text := lvParams.Selected.SubItems[0];
+    frmParamEdit.Caption := 'Edit parameter information';
+    frmParamEdit.txtFunction.Text := lstFunctions.Items[lstFunctions.ItemIndex];
+    frmParamEdit.txtInformation.Text := StringReplace(lvParams.Selected.SubItems[0], '; ', #13#10, [rfReplaceAll]);
     if frmParamEdit.ShowModal = mrOk then begin
       lvParams.Selected.SubItems[0] := StringReplace(frmParamEdit.txtInformation.Lines.Text, #13#10, '; ', [rfReplaceAll]);
+      lstFunctions.Items[lstFunctions.ItemIndex] := frmParamEdit.txtFunction.Text;
 
       with TACFunction(eACList.Items[lstFunctions.ItemIndex]) do begin
         Name := lstFunctions.Items[lstFunctions.ItemIndex];