Index: oup/current/Global/RawList.pas
===================================================================
--- oup/current/Global/RawList.pas	(revision 176)
+++ oup/current/Global/RawList.pas	(revision 177)
@@ -427,5 +427,5 @@
 initialization
   RawLists := TRawLists.Create;
-  RawLists.InsertRawListHandler('AGDB', False, AGDB);
+  RawLists.InsertRawListHandler('AGDB', True, AGDB);
   RawLists.InsertRawListHandler('AKVA', True, AKVA);
   RawLists.InsertRawListHandler('BINA', True, BINA);
Index: oup/current/Tools/BinEdit.dfm
===================================================================
--- oup/current/Tools/BinEdit.dfm	(revision 176)
+++ oup/current/Tools/BinEdit.dfm	(revision 177)
@@ -62,5 +62,5 @@
       Colors.EvenColumn = clNavy
       Colors.CurrentOffsetBackground = clBtnShadow
-      Colors.OffsetBackground = clBtnFace
+      Colors.OffsetBackGround = clBtnFace
       Colors.CurrentOffset = clBtnHighlight
       Colors.Grid = clBtnFace
@@ -71,5 +71,5 @@
       AllowInsertMode = False
       DrawGridLines = False
-      Version = 'december 06, 2006; '#169' markus stephany, vcl[at]mirkes[dot]de'
+      Version = 'May 23, 2005; '#169' markus stephany, vcl[at]mirkes[dot]de'
       OnChange = hexChange
       ShowPositionIfNotFocused = True
Index: oup/current/Tools/BinEdit.pas
===================================================================
--- oup/current/Tools/BinEdit.pas	(revision 176)
+++ oup/current/Tools/BinEdit.pas	(revision 177)
@@ -59,4 +59,5 @@
     fileid: Integer;
     ConID: Integer;
+    rawlist: TRawDataList;
   public
   end;
@@ -67,5 +68,5 @@
 implementation
 
-uses ValueEdit, Main, Functions, DatStructureLoader{, RawEdit};
+uses ValueEdit, Main, Functions, DatStructureLoader, RawEdit;
 {$R *.dfm}
 
@@ -161,4 +162,5 @@
     mem := nil;
     ConManager.Connection[ConID].LoadDatFile(fileid, TStream(mem));
+    rawlist := ConManager.Connection[ConID].GetRawList(fileid);
     hex.LoadFromStream(mem);
     mem.Free;
@@ -173,4 +175,5 @@
     ClearValues;
     hex.DataSize := 0;
+    SetLength(rawlist, 0);
   end;
 end;
@@ -181,5 +184,5 @@
 var
   Data: TByteData;
-  i:    Word;
+  i:    Integer;
   tempi: Integer;
   floatformat: TFormatSettings;
@@ -219,9 +222,14 @@
     11:
     begin
-      tempi := ConManager.Connection[ConID].GetRawInfo(fileid, offset).RawAddr;
-      if tempi >= 0 then
-        Result := '0x' + IntToHex(tempi, 8)
-      else
-        Result := 'unused';
+      if Length(rawlist) > 0 then
+        for i := 0 to High(rawlist) do
+          if rawlist[i].SrcOffset = offset then
+          begin
+            if rawlist[i].RawAddr > 0 then
+              Result := '0x' + IntToHex(rawlist[i].RawAddr, 8)
+            else
+              Result := 'unused';
+            Break;
+          end;
     end;
     12:
@@ -745,4 +753,5 @@
   node: PVirtualNode;
   nodedata: PNodeData;
+  rawinfo: TRawDataInfo;
   form: TForm_ToolTemplate;
 begin
@@ -762,6 +771,12 @@
       if (nodedata.DataType = 11) and (nodedata.Value <> 'unused') then
       begin
-        if ConManager.Connection[ConID].GetRawInfo(fileid, nodedata.offset).RawSize > 0 then
-          Form_Main.open_child('rawedit', ConID, fileid);
+        rawinfo := ConManager.Connection[ConID].GetRawInfo(fileid, nodedata.offset);
+        if rawinfo.RawSize > 0 then
+        begin
+          form := nil;
+          form := Form_Main.open_child('rawedit', ConID, fileid);
+          if Assigned(form) then
+            TForm_RawEdit(form).LoadRaw(rawinfo);
+        end;
       end;
       if (nodedata.DataType = 12) and (nodedata.Value <> 'no link') then
Index: oup/current/Tools/RawEdit.dfm
===================================================================
--- oup/current/Tools/RawEdit.dfm	(revision 176)
+++ oup/current/Tools/RawEdit.dfm	(revision 177)
@@ -118,5 +118,5 @@
       Colors.EvenColumn = clNavy
       Colors.CurrentOffsetBackground = clBtnShadow
-      Colors.OffsetBackground = clBtnFace
+      Colors.OffsetBackGround = clBtnFace
       Colors.CurrentOffset = clBtnHighlight
       Colors.Grid = clBtnFace
@@ -127,5 +127,5 @@
       AllowInsertMode = False
       DrawGridLines = False
-      Version = 'december 06, 2006; '#169' markus stephany, vcl[at]mirkes[dot]de'
+      Version = 'May 23, 2005; '#169' markus stephany, vcl[at]mirkes[dot]de'
       OnChange = hexChange
       ShowPositionIfNotFocused = True
Index: oup/current/Tools/RawEdit.pas
===================================================================
--- oup/current/Tools/RawEdit.pas	(revision 176)
+++ oup/current/Tools/RawEdit.pas	(revision 177)
@@ -102,51 +102,52 @@
 var
   i:    Integer;
+begin
+  if hex.Modified then
+  begin
+    if not Save then
+    begin
+      Exit;
+    end;
+  end;
+  for i := 0 to filelist.Count - 1 do
+  begin
+    if ConManager.Connection[ConnectionID].ExtractFileIDOfName(filelist.Items.Strings[i]) = Raw_Info.SrcID then
+    begin
+      filelist.ItemIndex := i;
+      listClick(Self);
+      Break;
+    end;
+  end;
+  for i := 0 to list_offset.Count - 1 do
+  begin
+    if MidStr(list_offset.Items.Strings[i], 3, 8) = IntToHex(raw_info.SrcOffset, 8) then
+    begin
+      list_offset.ItemIndex := i;
+      list_offsetClick(Self);
+      Break;
+    end;
+  end;
+end;
+
+
+
+
+
+
+procedure TForm_RawEdit.list_offsetClick(Sender: TObject);
+var
   mem: TMemoryStream;
-begin
-  if hex.Modified then
-  begin
-    if not Save then
-    begin
-      Exit;
-    end;
-  end;
-  if list_offset.Count = 0 then
-  begin
-    for i := 0 to filelist.Count - 1 do
-    begin
-      if ConManager.Connection[ConnectionID].ExtractFileIDOfName(filelist.Items.Strings[i]) = Raw_Info.SrcID then
-      begin
-        filelist.ItemIndex := i;
-        listClick(Self);
-        Break;
-      end;
-    end;
-    for i := 0 to list_offset.Count - 1 do
-    begin
-      if MidStr(list_offset.Items.Strings[i], 3, 8) = IntToHex(raw_info.SrcOffset, 8) then
-      begin
-        list_offset.ItemIndex := i;
-        Break;
-      end;
-    end;
-  end;
+  rawinfo: TRawDataInfo;
+begin
+  datoffset := StrToInt('$' + MidStr(
+    list_offset.Items.Strings[list_offset.ItemIndex], 3, 8));
+
+  rawinfo := ConManager.Connection[ConnectionID].GetRawInfo(fileid, datoffset);
+
   mem := nil;
-  ConManager.Connection[ConnectionID].LoadRawFile(raw_info.SrcID, raw_info.SrcOffset, TStream(mem));
+  ConManager.Connection[ConnectionID].LoadRawFile(rawinfo.SrcID, rawinfo.SrcOffset, TStream(mem));
   hex.LoadFromStream(mem);
   ClearValues;
   hexSelectionChanged(Self);
-end;
-
-
-
-
-
-
-procedure TForm_RawEdit.list_offsetClick(Sender: TObject);
-begin
-  ClearValues;
-  datoffset := StrToInt('$' + MidStr(
-    list_offset.Items.Strings[list_offset.ItemIndex], 3, 8));
-  LoadRaw(ConManager.Connection[ConnectionID].GetRawInfo(fileid, datoffset));
 end;
 
Index: oup/current/Tools/TxmpReplace.dfm
===================================================================
--- oup/current/Tools/TxmpReplace.dfm	(revision 176)
+++ oup/current/Tools/TxmpReplace.dfm	(revision 177)
@@ -2,4 +2,6 @@
   Caption = 'TxmpReplace'
   OnCreate = FormCreate
+  ExplicitWidth = 500
+  ExplicitHeight = 450
   PixelsPerInch = 96
   TextHeight = 13
@@ -39,5 +41,13 @@
     end
     inherited panel_extension: TPanel
-      Visible = False
+      inherited label_ext: TLabel
+        Visible = False
+      end
+      inherited combo_extension: TComboBox
+        Visible = False
+      end
+      inherited check_zerobyte: TCheckBox
+        Visible = False
+      end
     end
     object panel_txmppreview: TPanel