diff --git a/source/cnmt.c b/source/cnmt.c
index ed91017..897c26b 100644
--- a/source/cnmt.c
+++ b/source/cnmt.c
@@ -333,7 +333,7 @@ void cnmtWriteNcaPatch(ContentMetaContext *cnmt_ctx, void *buf, u64 buf_size, u6
 
 bool cnmtGenerateAuthoringToolXml(ContentMetaContext *cnmt_ctx, NcaContext *nca_ctx, u32 nca_ctx_count)
 {
-    if (!cnmtIsValidContext(cnmt_ctx) || !nca_ctx || nca_ctx_count != ((u32)cnmt_ctx->packaged_header->content_count + 1))
+    if (!cnmtIsValidContext(cnmt_ctx) || !nca_ctx || !nca_ctx_count || nca_ctx_count > ((u32)cnmt_ctx->packaged_header->content_count + 1))
     {
         LOGFILE("Invalid parameters!");
         return false;
diff --git a/source/title.h b/source/title.h
index 89010dc..6ed143f 100644
--- a/source/title.h
+++ b/source/title.h
@@ -110,7 +110,7 @@ TitleInfo **titleGetInfoFromOrphanTitles(u32 *out_count);
 
 /// Checks if a gamecard status update has been detected by the background gamecard title info thread (e.g. after a new gamecard has been inserted, of after the current one has been taken out).
 /// If so, gamecard title info entries will be updated or freed during this call, depending on the current gamecard status.
-/// If this function returns true and titleGetApplicationMetadataEntries() has been previously called, its returned buffer should be freed and titleGetApplicationMetadataEntries() should be called again.
+/// If this function returns true and titleGetApplicationMetadataEntries() has been previously called, its returned buffer should be freed and it should be called again.
 bool titleIsGameCardInfoUpdated(void);
 
 /// Returns a pointer to a dynamically allocated buffer that holds a filename string suitable for output title dumps.
diff --git a/todo.txt b/todo.txt
index c7e14a3..48fb768 100644
--- a/todo.txt
+++ b/todo.txt
@@ -71,7 +71,6 @@ todo:
     gamecard: functions to display filelist
     
     pfs0: functions to display filelist
-    pfs0: full header aligned to 0x20 (nsp)
     
     romfs: functions to display filelist
     
@@ -81,4 +80,8 @@ todo:
     title: more functions for content lookup? (based on id)
     title: parse the update partition from gamecards (if available) to generate ncmcontentinfo data for all update titles
     
+    others: config load/save using json
+    others: dump verification via nswdb / no-intro
+    others: update application feature
+    others: fatfs browser for emmc partitions
     
\ No newline at end of file