Index: oup/current/DataAccess/Access_OUP_ADB.pas
===================================================================
--- oup/current/DataAccess/Access_OUP_ADB.pas	(revision 256)
+++ oup/current/DataAccess/Access_OUP_ADB.pas	(revision 321)
@@ -545,5 +545,4 @@
 var
   i: Integer;
-  rawlist: TRawDataList;
 begin
   SetLength(Result, 0);
Index: oup/current/DataAccess/Access_OniArchive.pas
===================================================================
--- oup/current/DataAccess/Access_OniArchive.pas	(revision 256)
+++ oup/current/DataAccess/Access_OniArchive.pas	(revision 321)
@@ -589,4 +589,6 @@
   begin
     raw_info := Self.GetRawInfo(FileID, DatOffset);
+    if raw_info.RawSize = 0 then
+      exit;
     if not raw_info.LocSep then
     begin
Index: oup/current/Global/Functions.pas
===================================================================
--- oup/current/Global/Functions.pas	(revision 256)
+++ oup/current/Global/Functions.pas	(revision 321)
@@ -151,5 +151,4 @@
 function ReadString(Stream: TStream; Offset: Integer): String;
 var
-  i: Integer;
   c: Char;
 begin
Index: oup/current/Tools/Extractor.dfm
===================================================================
--- oup/current/Tools/Extractor.dfm	(revision 256)
+++ oup/current/Tools/Extractor.dfm	(revision 321)
@@ -7,18 +7,29 @@
     inherited splitter_content: TSplitter
       Left = 300
+      ExplicitLeft = 300
     end
     inherited panel_files: TPanel
       Width = 300
       ExplicitWidth = 300
-      inherited filelist: TListBox
-        Width = 300
-      end
-      inherited panel_extension: TPanel
-        Width = 300
-        inherited combo_extension: TComboBox
-          Width = 296
-        end
-        inherited edit_filtername: TEdit
-          Width = 296
+      inherited FilePages: TPageControl
+        Width = 298
+        inherited tab_files: TTabSheet
+          ExplicitWidth = 290
+          inherited panel_extension: TPanel
+            Width = 290
+            ExplicitWidth = 290
+            inherited combo_extension: TComboBox
+              Width = 286
+              ExplicitWidth = 286
+            end
+            inherited edit_filtername: TEdit
+              Width = 286
+              ExplicitWidth = 286
+            end
+          end
+          inherited filelist: TListBox
+            Width = 290
+            ExplicitWidth = 290
+          end
         end
       end
@@ -27,4 +38,6 @@
       Left = 308
       Width = 290
+      ExplicitLeft = 308
+      ExplicitWidth = 290
       object group_extract: TGroupBox
         AlignWithMargins = True
@@ -38,6 +51,4 @@
         Caption = '2. Select extract-method'
         TabOrder = 0
-        ExplicitWidth = 138
-        ExplicitHeight = 374
         DesignSize = (
           278
@@ -112,5 +123,4 @@
           TabOrder = 5
           Text = 'C:\'
-          ExplicitWidth = 276
         end
         object btn_path: TButton
@@ -123,5 +133,4 @@
           TabOrder = 6
           OnClick = btn_pathClick
-          ExplicitLeft = 318
         end
         object btn_export: TButton
@@ -149,6 +158,4 @@
         TabOrder = 1
         Visible = False
-        ExplicitTop = 381
-        ExplicitWidth = 138
         DesignSize = (
           278
@@ -182,5 +189,4 @@
           Smooth = True
           TabOrder = 0
-          ExplicitWidth = 369
         end
         object btn_abort: TButton
Index: oup/current/Tools/Extractor.pas
===================================================================
--- oup/current/Tools/Extractor.pas	(revision 256)
+++ oup/current/Tools/Extractor.pas	(revision 321)
@@ -5,5 +5,6 @@
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, _TemplateFileList, Menus, StdCtrls, ExtCtrls, Buttons, ComCtrls;
+  Dialogs, _TemplateFileList, Menus, StdCtrls, ExtCtrls, Buttons, ComCtrls,
+  VirtualTrees;
 
 type
Index: oup/current/Tools/MetaEditor.dfm
===================================================================
--- oup/current/Tools/MetaEditor.dfm	(revision 256)
+++ oup/current/Tools/MetaEditor.dfm	(revision 321)
@@ -170,5 +170,5 @@
           Colors.EvenColumn = clNavy
           Colors.CurrentOffsetBackground = clBtnShadow
-          Colors.OffsetBackground = clBtnFace
+          Colors.OffsetBackGround = clBtnFace
           Colors.CurrentOffset = clBtnHighlight
           Colors.Grid = clBtnFace
@@ -179,5 +179,5 @@
           AllowInsertMode = False
           DrawGridLines = False
-          Version = 'september 30, 2007; '#169' markus stephany, vcl[at]mirkes[dot]de'
+          Version = 'May 23, 2005; '#169' markus stephany, vcl[at]mirkes[dot]de'
           ShowPositionIfNotFocused = True
         end
Index: oup/current/Tools/MetaEditor.pas
===================================================================
--- oup/current/Tools/MetaEditor.pas	(revision 256)
+++ oup/current/Tools/MetaEditor.pas	(revision 321)
@@ -150,7 +150,4 @@
   data: PNodeData;
   ffile: TResource;
-//*******************************************************************
-  fs: TFileStream;
-//*******************************************************************
 begin
   data := Sender.GetNodeData(Node);
@@ -169,9 +166,4 @@
       ffile.Opened := True;
     end;
-//*******************************************************************
-//    fs := TFileStream.Create('C:\Spiele\Oni\GameDataFolder\tests\'+IntToStr(ffile.FileInfo.ID)+'_recreated.hex', fmCreate);
-//    ffile.ReCreateFile(fs);
-//    fs.Free;
-//*******************************************************************
   end;
 end;
@@ -265,6 +257,4 @@
   CellText: WideString;
 
-  i: Integer;
-  links: TStrings;
   ifile: TResource;
 begin