diff --git a/system/scripts/actors/character-generator-dialog.js b/system/scripts/actors/character-generator-dialog.js
index ac3d24c..de189a8 100644
--- a/system/scripts/actors/character-generator-dialog.js
+++ b/system/scripts/actors/character-generator-dialog.js
@@ -99,9 +99,9 @@ export class CharacterGeneratorDialog extends FormApplication {
         return {
             ...super.getData(options),
             isNpc: this.actor.type === "npc",
-            clanList: [{ id: "random", label: game.i18n.localize("l5r5e.random") }, ...clans],
+            clanList: [{ id: "random", label: game.i18n.localize("l5r5e.global.random") }, ...clans],
             genderList: [
-                { id: "random", label: game.i18n.localize("l5r5e.random") },
+                { id: "random", label: game.i18n.localize("l5r5e.global.random") },
                 { id: "male", label: game.i18n.localize("l5r5e.social.gender.male") },
                 { id: "female", label: game.i18n.localize("l5r5e.social.gender.female") },
             ],
diff --git a/system/scripts/actors/character-generator.js b/system/scripts/actors/character-generator.js
index 4fb823a..ee5f42a 100644
--- a/system/scripts/actors/character-generator.js
+++ b/system/scripts/actors/character-generator.js
@@ -93,13 +93,17 @@ export class CharacterGenerator {
             console.log(`L5R5E | Pack not found[${packName}]`);
             return;
         }
+        let document;
         if (id) {
-            return comp.getDocument(id);
+            document = await comp.getDocument(id);
+        } else {
+            if (!comp.indexed) {
+                await comp.getDocuments();
+            }
+            document = comp.getDocument(CharacterGenerator._getRandomArrayValue(Array.from(comp.keys())));
         }
-        if (!comp.indexed) {
-            await comp.getDocuments();
-        }
-        return comp.getDocument(CharacterGenerator._getRandomArrayValue(Array.from(comp.keys())));
+        await game.l5r5e.HelpersL5r5e.refreshItemProperties(document);
+        return document;
     }
 
     /**
diff --git a/system/scripts/config.js b/system/scripts/config.js
index 1ac5d13..61354dc 100644
--- a/system/scripts/config.js
+++ b/system/scripts/config.js
@@ -125,11 +125,11 @@ L5R5E.symbols.set("(shugenja)", { class: "i_shugenja", label: "" });
 L5R5E.families = new Map();
 // Majors
 L5R5E.families.set("imperial", ["Miya", "Otomo", "Seppun"]);
-L5R5E.families.set("crab", ["Hida", "Kaiu", "Hiruma", "Yasuki", "Kuni"]);
+L5R5E.families.set("crab", ["Hida", "Hiruma", "Kaiu", "Kuni", "Yasuki"]);
 L5R5E.families.set("crane", ["Asahina", "Daidoji", "Doji", "Kakita"]);
-L5R5E.families.set("dragon", ["Kitsuki", "Mirumoto", "Togashi"]);
+L5R5E.families.set("dragon", ["Agasha", "Kitsuki", "Mirumoto", "Togashi"]);
 L5R5E.families.set("lion", ["Akodo", "Ikoma", "Kitsu", "Matsu"]);
-L5R5E.families.set("phoenix", ["Agasha", "Asako", "Isawa", "Shiba"]);
+L5R5E.families.set("phoenix", ["Asako", "Isawa", "Shiba", "Kaito"]);
 L5R5E.families.set("scorpion", ["Bayushi", "Shosuro", "Soshi", "Yogo"]);
 L5R5E.families.set("unicorn", ["Ide", "Iuchi", "Moto", "Shinjo", "Utaku"]);
 // Minors