diff --git a/gcdcompile.py b/gcdcompile.py
index 0f50395..271a221 100644
--- a/gcdcompile.py
+++ b/gcdcompile.py
@@ -18,5 +18,5 @@ OUTFILE = sys.argv[2]
 print("Opening recipe {}".format(RECIPE))
 gcd = Gcd.from_recipe(RECIPE)
 gcd.print_struct()
-#print("Dumping to {}".format(OUTFILE))
-#gcd.write_to_file(OUTFILE)
+print("Dumping to {}".format(OUTFILE))
+gcd.save(OUTFILE)
diff --git a/grmn/gcd.py b/grmn/gcd.py
index 82ee9de..af02492 100644
--- a/grmn/gcd.py
+++ b/grmn/gcd.py
@@ -108,6 +108,18 @@ class Gcd:
                 print("☒ ONE OR MORE CHECKSUMS INVALID!")
         return all_ok
 
+    def fix_checksums(self):
+        chksum = ChkSum()
+        chksum.add(GCD_SIG)
+        for tlv in self.struct:
+            if tlv.type_id == 0x0001:
+                chksum.add(b"\x01\x00\x01\x00")
+                expected_cs = chksum.get()
+                tlv.value = bytes([expected_cs])
+                chksum.add(bytes([expected_cs]))
+            else:
+                chksum.add(tlv.get())
+
     def write_dump_block(self, f, name):
         f.write("\n[BLOCK_{}]\n".format(name))
     
@@ -193,12 +205,17 @@ class Gcd:
                         if len(read_bytes) < 0xff00:
                             break
                     bf.close()
-                
-                print("Binary block")
             else:
                 tlv = TLV.create_from_dump(params)
                 gcd.struct.append(tlv)
+        gcd.fix_checksums()
         return gcd
 
     def save(self, filename):
         self.filename = filename
+        with open(filename, "wb") as f:
+            f.write(GCD_SIG)
+            for tlv in self.struct:
+                f.write(tlv.get())
+            f.write(b"\xff\xff\x00\x00")   # footer
+            f.close()
diff --git a/grmn/tlv.py b/grmn/tlv.py
index 6bf77bf..ad01b0a 100644
--- a/grmn/tlv.py
+++ b/grmn/tlv.py
@@ -140,6 +140,7 @@ class TLV2(TLV):
             if k == "length":
                 self.value = b"\x00" * int(v)
                 self.length = len(self.value)
+                break
 
 class TLV5(TLV):
     def dump(self):