@@ -3,6 +3,7 @@
 from ..streams import EndianBinaryWriter
 from ..enums import ClassIDType
 
+
 class GameObject(EditorExtension):
     m_Components: list
     m_Layer: int
@@ -23,7 +24,6 @@ def __init__(self, reader):
         self.m_MeshRenderer = None
         self.m_SkinnedMeshRenderer = None
         self.m_MeshFilter = None
-        self.m_MonoBehaviour = None
 
         components_size = reader.read_int()
         self.m_Components = [None] * components_size
@@ -45,15 +45,24 @@ def __init__(self, reader):
                 self.m_SkinnedMeshRenderer = component
             elif component.type == ClassIDType.MeshFilter:
                 self.m_MeshFilter = component
-            elif component.type == ClassIDType.MonoBehaviour:
-                self.m_MonoBehaviour = component
 
         self.m_Layer = reader.read_int()
         self.m_Name = reader.read_aligned_string()
         if self.version > (2019, ):
             self.m_Tag = reader.read_u_short()
             self.m_IsActive = reader.read_boolean()
-        
+
+    def __key(self):
+        return (self.assets_file, self.path_id)
+
+    def __hash__(self):
+        return hash(self.__key())
+
+    def __eq__(self, other):
+        if isinstance(other, GameObject):
+            return self.__key() == other.__key()
+        return NotImplemented
+
     def save(self, writer: EndianBinaryWriter = None, intern_call=True):
         if not writer:
             writer = EndianBinaryWriter(endian=self.reader.endian)
 
@@ -12,7 +12,6 @@ class Object(object):
 
     def __init__(self, reader: ObjectReader):
         self.reader = reader
-        self.assets_file = reader.assets_file
         self.type = reader.type
         self.path_id = reader.path_id
         self.version = reader.version
 
@@ -39,6 +39,7 @@ def image(self, img):
         self.m_MipCount = 1
         # img.width * img.height * (cahnnel count = len(img.getbands()))
         self.m_TextureFormat = tex_format
+        #print(tex_format.name)
 
     @property
     def image_data(self):
 
@@ -124,6 +124,7 @@ def load_file(
                 str(file.__hash__()) if hasattr(file, "__hash__") else "",
         ))
 
+        f = None
         if typ == FileType.AssetsFile:
             f = files.SerializedFile(reader, parent, name=stream_name)
             self.register_cab(stream_name, f)
@@ -154,14 +155,17 @@ def load_zip_file(self, value):
         self.load_assets(z.namelist(), lambda x: z.open(x, "r"))
         z.close()
 
-    def save(self, pack: str = "none", writer_generator: Callable = None):
+    def save(self, pack: str = "none", writer_generator: Callable = None, out_path=None):
         """Saves all changed assets.
         Mark assets as changed using `.mark_changed()`.
         pack = "none" (default) or "lz4"
         """
         for f in self.files:
-            if self.files[f].is_changed:
-                fn = os.path.join(self.out_path, os.path.basename(f))
+            opath = self.out_path
+            if out_path:
+                opath = out_path
+            if hasattr(self.files[f], "is_changed") and self.files[f].is_changed:
+                fn = os.path.join(opath, os.path.basename(f))
                 with open(fn, "wb") as out:
                     out.write(self.files[f].save(packer=pack, writer=writer_generator(fn) if writer_generator else None))
 
 
@@ -159,7 +159,7 @@ def __repr__(self):
         return f"<{self.__class__.__name__}>"
 
     def mark_changed(self):
-        if isinstance(self.parent, File):
+        if self.parent is not None and hasattr(self.parent, "is_changed"):
             self.parent.mark_changed()
         self.is_changed = True
 
 
@@ -6,7 +6,6 @@
 from ..helpers.Tpk import get_typetree_nodes
 from ..exceptions import TypeTreeError
 
-DEBUG = False
 
 class ObjectReader:
     byte_start: int
@@ -172,8 +171,8 @@ def read(self, return_typetree_on_error: bool=False):
             obj = self.read_typetree(wrap=True)
         self._last_read_pos = self.reader.Position
         end_pos = self.byte_start + self.byte_size
-        if DEBUG and self._last_read_pos < end_pos and obj:
-            raise Exception(f"self._last_read_pos < end_pos: {self._last_read_pos} < {end_pos} (diff = {end_pos-self._last_read_pos})")
+        if False and self._last_read_pos < end_pos and obj and obj.type == ClassIDType.MonoBehaviour:
+            raise Exception(f"self._last_read_pos < end_pos: {self._last_read_pos} < {end_pos} (diff = {end_pos-self._last_read_pos}) in {obj}")
         return obj
 
     def get(self, key, default=None):
 
@@ -166,7 +166,7 @@ def write(self, serialized_file, writer, is_ref_type):
                     writer.write_string_to_null(self.m_NameSpace)
                     writer.write_string_to_null(self.m_AssemblyName)
                 else:
-                    writer.write_int_array(self.type_dependencies)
+                    writer.write_int_array(self.type_dependencies, True)
 
 
 class SerializedFile(File.File):
@@ -370,8 +370,8 @@ def read_type_tree(self):
 
     def read_type_tree_blob(self):
         reader = self.reader
-        number_of_nodes = self.reader.read_int()
-        string_buffer_size = self.reader.read_int()
+        number_of_nodes = self.reader.read_u_int()
+        string_buffer_size = self.reader.read_u_int()
 
         type = f"{reader.endian}hBBIIiii"
         keys = [
@@ -615,9 +615,9 @@ def save_type_tree5(self, nodes: list, writer: EndianBinaryWriter, str_data=b'')
         ]
 
         # number of nodes
-        writer.write_int(len(nodes))
+        writer.write_u_int(len(nodes))
         # string buffer size
-        writer.write_int(string_buffer.Length)
+        writer.write_u_int(string_buffer.Length)
 
         # nodes
         for i, node in enumerate(nodes):
@@ -643,10 +643,10 @@ def save_type_tree5(self, nodes: list, writer: EndianBinaryWriter, str_data=b'')
 
         # string buffer
         writer.write(string_buffer.bytes)
-
         if self.header.version >= 21:
-            writer.write_bytes(b"\x00" * 4)
-
+            #writer.align_stream() # TOFIX: maybe align stream?
+            writer.write_bytes(b"\0" * 4)
+            pass
 
 def read_string(string_buffer_reader: EndianBinaryReader, value: int) -> str:
     is_offset = (value & 0x80000000) == 0
 
@@ -143,5 +143,5 @@ def parse_file(
     elif typ == FileType.WebFile:
         f = files.WebFile(reader, parent, name=name, is_dependency=is_dependency)
     else:
-        f = reader
+        f = None
     return f
@@ -4,8 +4,8 @@
 import tabulate
 from ..exceptions import TypeTreeError as TypeTreeError
 
-kAlignBytes = 0x4000
 
+kAlignBytes = 0x4000
 
 class TypeTreeNode(object):
     __slots__ = (
@@ -236,6 +236,7 @@ def read_value(nodes: List[TypeTreeNode], reader: EndianBinaryReader, i: c_uint3
 
     if align:
         reader.align_stream()
+    if False: print(f"Reading {typ} = {value}")
     return value