diff --git a/components/jvcllaz/design/JvDB/JvDBReg.pas b/components/jvcllaz/design/JvDB/JvDBReg.pas
index b6b4fe0ec..43fbc8c8f 100644
--- a/components/jvcllaz/design/JvDB/JvDBReg.pas
+++ b/components/jvcllaz/design/JvDB/JvDBReg.pas
@@ -9,6 +9,7 @@ uses
 
 procedure Register;
 
+
 implementation
 
 {$R ../../resource/jvdbreg.res}
@@ -37,9 +38,9 @@ const
 begin
   RegisterComponents(RsPaletteJvclDB, [     // was: TsPaletteDBVisual
     TJvDBSearchEdit,
- //   TJvDBSearchCombobox,
+//    TJvDBSearchCombobox,
+//    TJvDBTreeView,
     TJvDBHtLabel
-  //  TJvDBTreeView
   ]);
                 (*
   RegisterPropertyEditor(TypeInfo(string), TJvDBTreeView, cItemField, TFieldProperty); //TJvDataFieldProperty);
diff --git a/components/jvcllaz/packages/JvDBLazD.lpk b/components/jvcllaz/packages/JvDBLazD.lpk
index fc8cd21e2..eb483b0ab 100644
--- a/components/jvcllaz/packages/JvDBLazD.lpk
+++ b/components/jvcllaz/packages/JvDBLazD.lpk
@@ -4,7 +4,7 @@
     <PathDelim Value="\"/>
     <Name Value="JvDBLazD"/>
     <Type Value="RunAndDesignTime"/>
-    <Author Value="Lazarus port by: Michał Gawrycki"/>
+    <Author Value="Various authors - see header of each unit for original author. Lazarus port by Michał Gawrycki"/>
     <CompilerOptions>
       <Version Value="11"/>
       <PathDelim Value="\"/>
@@ -14,6 +14,7 @@
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Database controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (designtime code):
+- Search edit
 - Hypertext components "/>
     <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/>
     <Version Major="1" Release="4"/>
diff --git a/components/jvcllaz/packages/JvDBLazR.lpk b/components/jvcllaz/packages/JvDBLazR.lpk
index 375884afe..86b3cbf4c 100644
--- a/components/jvcllaz/packages/JvDBLazR.lpk
+++ b/components/jvcllaz/packages/JvDBLazR.lpk
@@ -3,7 +3,7 @@
   <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="JvDBLazR"/>
-    <Author Value="Lazarus port by: Michał Gawrycki"/>
+    <Author Value="Various authors - see header of each unit for original author. Lazarus port by Michał Gawrycki"/>
     <CompilerOptions>
       <Version Value="11"/>
       <PathDelim Value="\"/>
@@ -13,6 +13,7 @@
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Database controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code):
+- Search edit
 - Hypertext components "/>
     <License Value="The JVCL is released in accordance with the MPL 1.1 license. To get your own copy or read it, go to http://www.mozilla.org/MPL/MPL-1.1.html. "/>
     <Version Major="1" Release="4"/>
diff --git a/components/jvcllaz/packages/jvcmpr.lpk b/components/jvcllaz/packages/jvcmpr.lpk
index d91c17d36..a27f6ae8f 100644
--- a/components/jvcllaz/packages/jvcmpr.lpk
+++ b/components/jvcllaz/packages/jvcmpr.lpk
@@ -10,7 +10,7 @@
       <SearchPaths>
         <IncludeFiles Value="..\run\JvCmp"/>
         <OtherUnitFiles Value="..\run\JvCmp"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\run\JvCmp"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Custom controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code):
diff --git a/components/jvcllaz/packages/jvcustomlazd.lpk b/components/jvcllaz/packages/jvcustomlazd.lpk
index 807ab7e94..9312cfc11 100644
--- a/components/jvcllaz/packages/jvcustomlazd.lpk
+++ b/components/jvcllaz/packages/jvcustomlazd.lpk
@@ -10,7 +10,7 @@
       <PathDelim Value="\"/>
       <SearchPaths>
         <OtherUnitFiles Value="..\design\JvCustomControls"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\design\JvCustom"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Custom controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (designtime code):
diff --git a/components/jvcllaz/packages/jvjanslazd.lpk b/components/jvcllaz/packages/jvjanslazd.lpk
index 974e5f0fb..6a26ddbb8 100644
--- a/components/jvcllaz/packages/jvjanslazd.lpk
+++ b/components/jvcllaz/packages/jvjanslazd.lpk
@@ -10,8 +10,8 @@
       <PathDelim Value="\"/>
       <SearchPaths>
         <IncludeFiles Value="..\run\JvJans"/>
-        <OtherUnitFiles Value="..\run\JvJans;..\design\JvJans"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <OtherUnitFiles Value="..\design\JvJans"/>
+        <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\design\JvJans"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Custom controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (designtime code of Jan's Components):
diff --git a/components/jvcllaz/packages/jvjanslazr.lpk b/components/jvcllaz/packages/jvjanslazr.lpk
index 2f773cae8..42edee6d5 100644
--- a/components/jvcllaz/packages/jvjanslazr.lpk
+++ b/components/jvcllaz/packages/jvjanslazr.lpk
@@ -9,7 +9,7 @@
       <PathDelim Value="\"/>
       <SearchPaths>
         <OtherUnitFiles Value="..\run\JvJans"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)\run\JvJans"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Custom controls of the JVCL library (https://sourceforge.net/projects/jvcl/) (runtime code of Jan's Components):
diff --git a/components/jvcllaz/run/JvJans/JvSimLogic.pas b/components/jvcllaz/run/JvJans/JvSimLogic.pas
index b679ecfea..eb65c9cbc 100644
--- a/components/jvcllaz/run/JvJans/JvSimLogic.pas
+++ b/components/jvcllaz/run/JvJans/JvSimLogic.pas
@@ -46,8 +46,7 @@ interface
 uses
   LCLIntf, Types,
   Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls,
-  SysUtils, Classes,
-  JvTypes;
+  SysUtils, Classes;
 
 type
   TJvLogic = class;
diff --git a/components/jvcllaz/run/JvJans/JvSimScope.pas b/components/jvcllaz/run/JvJans/JvSimScope.pas
index 170cb7bb0..048256ba6 100644
--- a/components/jvcllaz/run/JvJans/JvSimScope.pas
+++ b/components/jvcllaz/run/JvJans/JvSimScope.pas
@@ -226,8 +226,6 @@ type
 
 implementation
 
-uses
-  Math;
 
 //=== { TJvScopeLineValues } =================================================