diff --git a/nhentai/command.py b/nhentai/command.py
index 8b05406..bc987fb 100644
--- a/nhentai/command.py
+++ b/nhentai/command.py
@@ -65,11 +65,11 @@ def main():
     if options.is_download and doujinshis:
         doujinshi_ids = [i['id'] for i in doujinshis]
 
-        if options.is_save_download_history:
-            with DB() as db:
-                data = map(int, db.get_all())
+    if options.is_save_download_history:
+        with DB() as db:
+            data = map(int, db.get_all())
 
-            doujinshi_ids = list(set(doujinshi_ids) - set(data))
+        doujinshi_ids = list(set(map(int, doujinshi_ids)) - set(data))
 
     if doujinshi_ids:
         for i, id_ in enumerate(doujinshi_ids):
diff --git a/nhentai/constant.py b/nhentai/constant.py
index 39c6f3e..b960d13 100644
--- a/nhentai/constant.py
+++ b/nhentai/constant.py
@@ -36,3 +36,9 @@ CONFIG = {
     'language': '',
     'template': '',
 }
+ LANGUAGEISO ={
+    'english' : 'en',
+    'chinese' : 'zh',
+    'japanese' : 'ja',
+    'translated' : 'translated'
+ }
diff --git a/nhentai/serializer.py b/nhentai/serializer.py
index d8839a5..30b4493 100644
--- a/nhentai/serializer.py
+++ b/nhentai/serializer.py
@@ -2,7 +2,7 @@
 import json
 import os
 from xml.sax.saxutils import escape
-
+from constant import LANGUAGEISO
 
 def serialize_json(doujinshi, dir):
     metadata = {'title': doujinshi.name,
@@ -65,7 +65,8 @@ def serialize_comicxml(doujinshi, dir):
         if doujinshi.info.languages:
             languages = [i.strip() for i in doujinshi.info.languages.split(',')]
             xml_write_simple_tag(f, 'Translated', 'Yes' if 'translated' in languages else 'No')
-            [xml_write_simple_tag(f, 'Language', i) for i in languages if i != 'translated']
+            [xml_write_simple_tag(f, 'LanguageISO', LANGUAGEISO[i]) for i in languages \
+                if (i != 'translated' & i in LANGUAGEISO)]
 
         f.write('</ComicInfo>')
 
diff --git a/nhentai/utils.py b/nhentai/utils.py
index c28a3ee..6977297 100644
--- a/nhentai/utils.py
+++ b/nhentai/utils.py
@@ -166,7 +166,7 @@ def generate_main_html(output_dir='./'):
         logger.warning('Writing Main Viewer failed ({})'.format(str(e)))
 
 
-def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False, write_comic_info=False):
+def generate_cbz(output_dir='.', doujinshi_obj=None, rm_origin_dir=False, write_comic_info=True):
     if doujinshi_obj is not None:
         doujinshi_dir = os.path.join(output_dir, doujinshi_obj.filename)
         if write_comic_info: