diff --git a/Temple_of_Ro-Kan.cat b/Temple_of_Ro-Kan.cat
index 5869ddf..9b9864d 100644
--- a/Temple_of_Ro-Kan.cat
+++ b/Temple_of_Ro-Kan.cat
@@ -738,12 +738,25 @@
         </entryLink>
         <entryLink id="681a-6452-f07c-d7d2" name="Monkey" hidden="false" collective="false" targetId="2d4b-c276-7066-fc26" type="selectionEntry">
           <modifiers>
-            <modifier type="append" field="name" value="B"/>
+            <modifier type="append" field="name" value="B">
+              <conditions>
+                <condition field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2d4b-c276-7066-fc26" type="atLeast"/>
+              </conditions>
+            </modifier>
           </modifiers>
         </entryLink>
         <entryLink id="39af-b95c-917f-40df" name="Monkey" hidden="false" collective="false" targetId="2d4b-c276-7066-fc26" type="selectionEntry">
           <modifiers>
-            <modifier type="append" field="name" value="C"/>
+            <modifier type="append" field="name" value="C">
+              <conditions>
+                <condition field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2d4b-c276-7066-fc26" type="equalTo"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" field="name" value="B">
+              <conditions>
+                <condition field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2d4b-c276-7066-fc26" type="equalTo"/>
+              </conditions>
+            </modifier>
           </modifiers>
         </entryLink>
       </entryLinks>
@@ -1332,6 +1345,13 @@
       </categoryLinks>
     </entryLink>
     <entryLink id="3233-5576-e3ac-43bd" name="Hirota, Drunken Master" hidden="true" collective="false" targetId="f616-46d8-5907-fafd" type="selectionEntry">
+      <modifiers>
+        <modifier type="set" field="hidden" value="false">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="294d-a0fa-f437-2fca" type="equalTo"/>
+          </conditions>
+        </modifier>
+      </modifiers>
       <categoryLinks>
         <categoryLink id="d3e9-0c77-35bb-9b77" name="New CategoryLink" hidden="false" targetId="9fba-f50b-c8f7-8396" primary="true"/>
       </categoryLinks>
diff --git a/The_Savage_Wave.cat b/The_Savage_Wave.cat
index 13845ff..7f0ac99 100644
--- a/The_Savage_Wave.cat
+++ b/The_Savage_Wave.cat
@@ -1333,7 +1333,7 @@
           <modifiers>
             <modifier type="append" field="name" value="A">
               <conditions>
-                <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="18b4-f66e-14fe-d1a7" type="greaterThan"/>
+                <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" type="greaterThan"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -1343,65 +1343,71 @@
         </entryLink>
         <entryLink id="4239-8fac-4c24-ed00" name="Kaihei" hidden="false" collective="false" targetId="e952-63ec-527b-d407" type="selectionEntry">
           <modifiers>
-            <modifier type="append" field="name" value="B">
-              <conditions>
-                <condition field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="18b4-f66e-14fe-d1a7" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="append" field="name" value="D">
-              <conditions>
-                <condition field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="18b4-f66e-14fe-d1a7" type="equalTo"/>
-              </conditions>
-            </modifier>
-            <modifier type="append" field="name" value="C">
-              <conditions>
-                <condition field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="18b4-f66e-14fe-d1a7" type="equalTo"/>
-              </conditions>
-            </modifier>
+            <modifier type="set" field="name" value="Kaihei B"/>
           </modifiers>
         </entryLink>
         <entryLink id="5bf2-c37b-faf1-b69f" name="Kaihei" hidden="false" collective="false" targetId="e952-63ec-527b-d407" type="selectionEntry">
           <modifiers>
-            <modifier type="append" field="name" value="C">
-              <conditions>
-                <condition field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="18b4-f66e-14fe-d1a7" type="equalTo"/>
-              </conditions>
+            <modifier type="set" field="name" value="Kaihei B">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" type="atLeast"/>
+                    <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4239-8fac-4c24-ed00" type="equalTo"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
-            <modifier type="append" field="name" value="D">
-              <conditions>
-                <condition field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="18b4-f66e-14fe-d1a7" type="equalTo"/>
-              </conditions>
+            <modifier type="set" field="name" value="Kaihei C">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" type="equalTo"/>
+                    <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c2b9-fa8b-e305-9542" type="equalTo"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
-            <modifier type="append" field="name" value="B">
-              <conditions>
-                <condition field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="18b4-f66e-14fe-d1a7" type="equalTo"/>
-              </conditions>
+            <modifier type="set" field="name" value="Kaihei C">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" type="equalTo"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
           </modifiers>
         </entryLink>
         <entryLink id="c2b9-fa8b-e305-9542" name="Kaihei" hidden="false" collective="false" targetId="e952-63ec-527b-d407" type="selectionEntry">
           <modifiers>
-            <modifier type="append" field="name" value="D">
-              <conditions>
-                <condition field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="18b4-f66e-14fe-d1a7" type="equalTo"/>
-              </conditions>
+            <modifier type="set" field="name" value="Kaihei B">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" type="equalTo"/>
+                    <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4239-8fac-4c24-ed00" type="equalTo"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
-            <modifier type="append" field="name" value="B">
-              <conditions>
-                <condition field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="18b4-f66e-14fe-d1a7" type="equalTo"/>
-              </conditions>
+            <modifier type="set" field="name" value="Kaihei C">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" type="equalTo"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
-            <modifier type="append" field="name" value="C">
+            <modifier type="set" field="name" value="Kaihei D">
               <conditions>
-                <condition field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="18b4-f66e-14fe-d1a7" type="equalTo"/>
+                <condition field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" type="equalTo"/>
               </conditions>
             </modifier>
           </modifiers>
         </entryLink>
       </entryLinks>
-      <costs>
-        <cost name=" Rice" typeId="a111-8656-5c05-7415" value="7.0"/>
-      </costs>
     </selectionEntry>
     <selectionEntry id="4cb6-d647-87ed-6ce2" name="Deep Mushrooms" hidden="true" collective="false" type="upgrade">
       <modifiers>
@@ -1762,7 +1768,7 @@
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8b92-cbd7-678f-a82c" type="max"/>
       </constraints>
       <costs>
-        <cost name=" Rice" typeId="a111-8656-5c05-7415" value="0.0"/>
+        <cost name=" Rice" typeId="a111-8656-5c05-7415" value="7.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9d1d-34ce-2f1e-37ae" name="Tribal Brute" hidden="false" collective="false" type="model">