diff --git a/src/main.py b/src/main.py
index c2ffbbd..e44f2ca 100644
--- a/src/main.py
+++ b/src/main.py
@@ -11,7 +11,7 @@ def run(config):
     config_dir = os.path.dirname(config)
     data = read_one_block_of_yaml_data(config)
     if isinstance(data, list):
-        for idx, track in enumerate(data):
+        for track in data:
             print(track["title"])
             audiofile = eyed3.load(f"{config_dir}/{track["file"]}")
 
@@ -21,11 +21,13 @@ def run(config):
             audiofile.tag.artist = track["artist"]
             audiofile.tag.album = track["album"]
             audiofile.tag.title = track["title"]
-            audiofile.tag.track_num = idx + 1
-            audiofile.tag.comment = track["comment"]
+            audiofile.tag.track_num = track["number"]
+            audiofile.tag.copyright = track["copyright"]
+            audiofile.tag.comments.set(track["comment"])
             date_str = track["release_date"]
             date_obj = Date.parse(date_str)
             audiofile.tag.original_release_date = date_obj
+            audiofile.tag.release_date = date_obj
             with open(f"{config_dir}/{track["cover"]}", "rb") as cover_art:
                 audiofile.tag.images.set(
                     3, cover_art.read(), "image/png", "Cover (front)"