diff --git a/fanficdownloader/adapters/adapter_fannation.py b/fanficdownloader/adapters/adapter_fannation.py
index 3bb0b8c..da04059 100644
--- a/fanficdownloader/adapters/adapter_fannation.py
+++ b/fanficdownloader/adapters/adapter_fannation.py
@@ -40,7 +40,9 @@ class FanNationAdapter(BaseEfictionAdapter):
     def handleMetadataPair(self, key, value):
         if key == 'Romance':
             for val in re.split("\s*,\s*", value):
-                self.story.addToList('categories', val)
+                self.story.addToList('romance', val)
+        elif key == 'Read':
+            self.story.setMetadata('readings', value)
         else:
             super(FanNationAdapter, self).handleMetadataPair(key, value)
 
diff --git a/fanficdownloader/adapters/adapter_trekiverseorg.py b/fanficdownloader/adapters/adapter_trekiverseorg.py
index b12e7e8..0eec94a 100644
--- a/fanficdownloader/adapters/adapter_trekiverseorg.py
+++ b/fanficdownloader/adapters/adapter_trekiverseorg.py
@@ -37,12 +37,20 @@ class TrekiverseOrgAdapter(BaseEfictionAdapter):
 
     @classmethod
     def getHighestWarningLevel(cls):
-        return 6
+        return 4
 
     @classmethod
     def getDateFormat(cls):
         return "%d %b %Y"
 
     @classmethod
-    def getDecode(cls):
+    def getEncoding(cls):
         return ["ISO-8859-1", "utf8"]
+
+    def handleMetadataPair(self, key, value):
+        if key == 'Awards':
+            self.story.setMetadata('awards', value)
+        if key == 'Read':
+            self.story.setMetadata('readings', value)
+        else:
+            super(TrekiverseOrgAdapter, self).handleMetadataPair(key, value)