diff --git a/include/unicode.h b/include/unicode.h
index b50065f..104dd4d 100644
--- a/include/unicode.h
+++ b/include/unicode.h
@@ -29,9 +29,9 @@
 
 #include "common.h"
 
-ssize_t strulen(const u16 *, ssize_t);
+size_t strulen(const u16 *, ssize_t);
 void struacat(u16 * input, const char * addition);
 void printu(u16 * input);
-u16 * strucat(u16 * destination, const u16 * source);
+size_t strucat(u16 * destination, const u16 * source);
 
 #endif
\ No newline at end of file
diff --git a/source/badges.c b/source/badges.c
index d6b82fa..14f9c1a 100644
--- a/source/badges.c
+++ b/source/badges.c
@@ -115,7 +115,7 @@ u64 getShortcut(char *filename)
     if (sscanf(p1, "%08x", &lowpath) != 1) return shortcut;
 
     shortcut = 0x0004001000000000 + lowpath;
-    DEBUG("Shortcut %llu found for %s\n", shortcut, filename);
+    DEBUG("Shortcut %08lx found for %s\n", shortcut, filename);
     return shortcut;
 }
 
@@ -237,7 +237,7 @@ int install_badge_dir(FS_DirectoryEntry set_dir, int *badge_count, int set_id)
             strucat(path, badge_files[i].name);
             if (!memcmp(set_icon, badge_files[i].name, 16))
             {
-                DEBUG("Found set icon\n");
+                DEBUG("Found set icon for folder set %d\n", set_id);
                 icon_size = file_to_buf(fsMakePath(PATH_UTF16, path), ArchiveSD, &icon_buf);
                 continue;
             }
@@ -299,6 +299,7 @@ int install_badge_dir(FS_DirectoryEntry set_dir, int *badge_count, int set_id)
     badgeMngBuffer[0x3D8 + set_index/8] |= 0 << (set_index % 8);
     end:
     free(badge_files);
+    FSDIR_Close(folder);
     return badges_in_set;
 }
 
@@ -349,17 +350,23 @@ SetNode * extract_sets(char *badgeMngBuffer, Handle backupDataHandle)
 
         if (cursor->set_id != 0xEFBE) // 0xEFBE is GYTB Set ID; GYTB doesn't properly create sets, so skip
         {
+            DEBUG("Processing icon for set %lu at index %lu\n", cursor->set_id, cursor->set_index);
             u16 utf16SetName[0x46] = {0};
             FSFILE_Read(backupDataHandle, NULL, cursor->set_index * 16 * 0x8A, utf16SetName, 0x8A);
             u16 set_path[256] = {0};
             struacat(set_path, "/3ds/" APP_TITLE "/BadgeBackups/");
-            strucat(set_path, utf16SetName);
+            size_t set_name_len = strucat(set_path, utf16SetName);
+            if (!set_name_len)
+            {
+                struacat(set_path, "Unknown Set");
+            }
             FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_UTF16, set_path), FS_ATTRIBUTE_DIRECTORY);
             memset(icon_alpha_buf, 255, 64 * 64 * 0.5);
             FSFILE_Read(backupDataHandle, NULL, 0x250F80 + cursor->set_index * 0x2000, icon_rgb_buf, 0x2000);
             char filename[256] = {0};
             utf16_to_utf8((u8 *) filename, set_path, 256);
             strcat(filename, "/_seticon.png");
+            DEBUG("%s\n", filename);
             rgb565ToPngFile(filename, icon_rgb_buf, icon_alpha_buf, 48, 48);
         }
 
@@ -396,7 +403,9 @@ Result extract_badges(void)
             free(badgeMngBuffer);
             free(badge_rgb_buf);
             free(badge_alpha_buf);
-            throw_error(language.badges.extdata_locked, ERROR_LEVEL_WARNING);
+            char err_string[128] = {0};
+            sprintf(err_string, language.badges.extdata_locked, res);
+            throw_error(err_string, ERROR_LEVEL_WARNING);
             DEBUG("backupDataHandle open failed\n");
             return -1;
         }
@@ -437,6 +446,8 @@ Result extract_badges(void)
                 FSFILE_Read(backupDataHandle, NULL, set_index * 16 * 0x8A, utf16SetName, 0x8A);
                 char utf8SetName[128] = {0};
                 res = utf16_to_utf8((u8 *) utf8SetName, utf16SetName, 128);
+                if (!res)
+                    strncpy(utf8SetName, "Unknown Set", 128);
                 DEBUG("UTF-8 Set Name: %s; ID: %lx\n", utf8SetName, badgeSetId);
                 sprintf(dir, "/3ds/" APP_TITLE "/BadgeBackups/%s", utf8SetName);
             }
@@ -461,6 +472,7 @@ Result extract_badges(void)
     free(badge_rgb_buf);
     free(badge_alpha_buf);
     free_list(head);
+    FSFILE_Close(backupDataHandle);
 
     return res;
 }
@@ -551,7 +563,9 @@ Result install_badges(void)
     if (R_FAILED(res))
     {
         badgeDataHandle = 0;
-        throw_error(language.badges.extdata_locked, ERROR_LEVEL_WARNING);
+        char err_string[128] = {0};
+        sprintf(err_string, language.badges.extdata_locked, res);
+        throw_error(err_string, ERROR_LEVEL_WARNING);
         DEBUG("badgeDataHandle open failed\n");
         goto end;
     }
@@ -682,7 +696,9 @@ Result install_badges(void)
     if (res)
     {
         DEBUG("Error writing badge manage data! %lx\n", res);
-        throw_error(language.badges.extdata_locked, ERROR_LEVEL_WARNING);
+        char err_string[128] = {0};
+        sprintf(err_string, language.badges.extdata_locked, res);
+        throw_error(err_string, ERROR_LEVEL_WARNING);
         goto end; 
     }
 
diff --git a/source/fs.c b/source/fs.c
index ad9025a..d836c4a 100644
--- a/source/fs.c
+++ b/source/fs.c
@@ -113,7 +113,6 @@ Result open_archives(void)
     FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/3ds/"  APP_TITLE), FS_ATTRIBUTE_DIRECTORY);
     FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/3ds/"  APP_TITLE  "/cache"), FS_ATTRIBUTE_DIRECTORY);
     FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/3ds/" APP_TITLE "/BadgeBackups"), FS_ATTRIBUTE_DIRECTORY);
-    FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/3ds/" APP_TITLE "/BadgeBackups/Unknown Set"), FS_ATTRIBUTE_DIRECTORY);
 
     u32 homeMenuPath[3] = {MEDIATYPE_SD, archive2, 0};
     home.type = PATH_BINARY;
@@ -229,7 +228,7 @@ u32 file_to_buf(FS_Path path, FS_Archive archive, char ** buf)
     Result res = 0;
     if (R_FAILED(res = FSUSER_OpenFile(&file, archive, path, FS_OPEN_READ, 0)))
     {
-        DEBUG("file_to_buf failed - 0x%08ld\n", res);
+        DEBUG("file_to_buf failed - 0x%08lx\n", res);
         return 0;
     }
 
diff --git a/source/ui_strings.c b/source/ui_strings.c
index 6e1983d..7baba56 100644
--- a/source/ui_strings.c
+++ b/source/ui_strings.c
@@ -429,7 +429,7 @@ const Language_s language_english = {
     },
     .badges = 
     {
-        .extdata_locked = "Ext Data Locked\nTry pressing the Home Button and then returning\nto Anemone3DS, or using the CIA version instead."
+        .extdata_locked = "Ext Data Locked\nTry pressing the Home Button and then returning\nto Anemone3DS, or using the CIA version instead.\nDebug: 0x%08lx"
     }
 };
 
@@ -835,7 +835,7 @@ const Language_s language_spanish = {
     },
     .badges =
     {
-        .extdata_locked = "Datos Adicionales Bloqueados\nIntenta presionando el botón Home y vuelve a\nAnemone3DS, o usa la version CIA en su lugar."
+        .extdata_locked = "Datos Adicionales Bloqueados\nIntenta presionando el botón Home y vuelve a\nAnemone3DS, o usa la version CIA en su lugar.\nDebug: 0x%08lx"
     }
 };
 
@@ -1242,7 +1242,7 @@ const Language_s language_french = {
     },
     .badges = 
     {
-        .extdata_locked = "L'archive des badges est vérouillée.\nEssayez de redémarrer Anemone3DS,\nou utilisez la version CIA."
+        .extdata_locked = "L'archive des badges est vérouillée.\nEssayez de redémarrer Anemone3DS,\nou utilisez la version CIA.\nDebug: 0x%08lx"
     }
 };
 
@@ -1648,7 +1648,7 @@ const Language_s language_portuguese = {
     },
     .badges = 
     {
-        .extdata_locked = "Ext Data Bloqueado\nTente apertar o botão HOME e retornar\nao Anemone3DS, ou use a versão CIA."
+        .extdata_locked = "Ext Data Bloqueado\nTente apertar o botão HOME e retornar\nao Anemone3DS, ou use a versão CIA.\nDebug: 0x%08lx"
     }
 };
 
@@ -2057,7 +2057,7 @@ const Language_s language_korean = {
     },
     .badges = 
     {
-        .extdata_locked = "Ext Data Locked\nTry pressing the Home Button\nand then returning to Anemone3DS,\nor using the CIA version instead."
+        .extdata_locked = "Ext Data Locked\nTry pressing the Home Button\nand then returning to Anemone3DS,\nor using the CIA version instead.\nDebug: 0x%08lx"
     }
 };
 
diff --git a/source/unicode.c b/source/unicode.c
index 5dcf3e7..f5d38e6 100644
--- a/source/unicode.c
+++ b/source/unicode.c
@@ -26,7 +26,7 @@
 
 #include "unicode.h"
 
-ssize_t strulen(const u16 * input, ssize_t max_len)
+size_t strulen(const u16 * input, ssize_t max_len)
 {
     for (int i = 0; i < max_len; i++) if (input[i] == 0) return i;
     return max_len;
@@ -55,13 +55,13 @@ void printu(u16 * input)
     free(buf);
 }
 
-u16 * strucat(u16 * destination, const u16 * source)
+size_t strucat(u16 * destination, const u16 * source)
 {
-    ssize_t dest_len = strulen(destination, 0x106);
+    size_t dest_len = strulen(destination, 0x106);
 
-    ssize_t source_len = strulen(source, 0x106);
+    size_t source_len = strulen(source, 0x106);
 
     memcpy(&destination[dest_len], source, source_len * sizeof(u16));
     destination[min(dest_len + source_len, 0x106 - 1)] = 0;
-    return destination;
+    return source_len;
 }
\ No newline at end of file