diff --git a/opponents/estelle/behaviour.xml b/opponents/estelle/behaviour.xml
index dfabccb6402d93dd54c9a8a19f3a8bf250d1d9a1..72794671e7b740812b8b12b79607861752fd348c 100644
--- a/opponents/estelle/behaviour.xml
+++ b/opponents/estelle/behaviour.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!--This file was machine generated using the Character Editor v4.3 at 1:27:43  on Mai 19, 2019. Please do not edit it directly without preserving your improvements elsewhere or your changes may be lost the next time this file is generated.-->
+<!--This file was machine generated using the Character Editor v4.3 at 9:27:01  on Mai 19, 2019. Please do not edit it directly without preserving your improvements elsewhere or your changes may be lost the next time this file is generated.-->
 <opponent>
     <version>v4.3</version>
     <first>Estelle</first>
@@ -189,7 +189,7 @@
             </case>
             <case tag="male_removed_accessory">
                 <state img="0-lecture.png">"A journey of a thousand miles begins with a single step", and that step is you losing your ~clothing~!</state>
-                <state img="0-pouting.png">I hope that ~clothing~ didn't mean too much to you... I'd hate for you to lose something so precious.</state>
+                <state img="0-pouting.png">I hope ~clothing.ifPlural(those|that)~ ~clothing~ didn't mean too much to you... I'd hate for you to lose something so precious.</state>
                 <state img="0-interested.png">There go~clothing.ifPlural(|es)~ the ~clothing~... how do you people comfortably carry so many accessories on your person?</state>
                 <state img="0-calm.png">Good! I suppose it &lt;i&gt;is&lt;/i&gt; too early to be losing big items anyway...</state>
                 <state img="0-lecture.png">It's still too early for the match to be decided here!</state>
@@ -451,7 +451,7 @@
                 <state img="0-insecure.png">I'm so far ahead of you... I shouldn't stare, not when you're doing so poorly.</state>
                 <state img="0-happy.png">Given the difference in our layers, I feel like a doctor examining her patient. With my powers though, I suppose that's not entirely inaccurate.</state>
                 <state img="0-surprised.png">&lt;i&gt;(Wait, what will I do if l stare too much at ~name~...?)&lt;/i&gt; I-it's pure curiosity, believe me!</state>
-                <state img="0-interested.png">I'm used to seeing mens' bare chests. A lot of men at Danghrest don't wear shirts, too show of their muscles. &lt;i&gt;(Why am I still so excited to see ~name~'s chest, though...?)&lt;/i&gt;</state>
+                <state img="0-interested.png">I'm used to seeing mens' bare chests. A lot of men at Danghrest don't wear shirts, to show off their muscles. &lt;i&gt;(Why am I still so excited to see ~name~'s chest, though...?)&lt;/i&gt;</state>
                 <state img="0-excited.png">I love the scene from "The Tale of the Jade Planet" where the Amber Knight takes off his shirt. Will ~name~'s chest reveal come close to that?</state>
                 <state img="0-pushing.png">It takes a special kind of bravery to be able to expose yourself like this, and I respect that!</state>
             </case>
@@ -486,7 +486,7 @@
                 <state img="0-interested.png">I wonder why it's so small... my books never mentioned why penises can differ so much in size.</state>
             </case>
             <case tag="male_medium_crotch_is_visible">
-                <state img="0-calm.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
+                <state img="0-insecure.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
                 <state img="0-happy.png">That's your..? Oh no, don't mind me! I think it looks cute!</state>
                 <state img="0-excited.png">I don't have much room for comparison, but you look good in my eyes, ~name~!</state>
                 <state img="0-interested.png">Oh my... I could stare at this for a while!</state>
@@ -570,7 +570,7 @@
                 <state img="0-pain.png">Never mind. You've stripped and I've uh... already seen everything. Sorry, Palutena.</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena">
-                <state img="0-determind.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
+                <state img="0-pushing.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena" targetSaidMarker="luna">
                 <state img="0-happy.png">She reminds me of an old fairy tale about two children who travel on a moon through the skies. Can she visit the "Brave Vesperia" on it?</state>
@@ -702,7 +702,7 @@
                 <state img="0-surprised.png">Wait, you were actually a girl all along?! It's like that one story where the ninja reveals herself as a lost princess, The Legend of… uh… what was the name?</state>
             </case>
             <case tag="opponent_stripped" totalRounds="0" priority="50">
-                <state img="0-insecure.png">So there's no denying it anymore... This really &lt;i&gt;is&lt;/i&gt; strip poker... &lt;i&gt;But it's too late to chicken out now, Estelle. You have to finish what you've started!&lt;/i&gt;</state>
+                <state img="0-insecure.png">So there's no denying it anymore... This really &lt;i&gt;is&lt;/i&gt; strip poker... &lt;i&gt;(But it's too late to chicken out now, Estelle. You have to finish what you've started!)&lt;/i&gt;</state>
             </case>
             <case tag="male_must_masturbate">
                 <state img="0-insecure.png">Another player has to do the forfeit... at least it won't be as awkward now that someone else has done it, I guess...</state>
@@ -897,7 +897,7 @@
             </case>
             <case tag="male_removed_accessory">
                 <state img="1-lecture.png">"A journey of a thousand miles begins with a single step", and that step is you losing your ~clothing~!</state>
-                <state img="1-pouting.png">I hope that ~clothing~ didn't mean too much to you... I'd hate for you to lose something so precious.</state>
+                <state img="1-pouting.png">I hope ~clothing.ifPlural(those|that)~ ~clothing~ didn't mean too much to you... I'd hate for you to lose something so precious.</state>
                 <state img="1-interested.png">There go~clothing.ifPlural(|es)~ the ~clothing~... how do you people comfortably carry so many accessories on your person?</state>
                 <state img="1-calm.png">Good! I suppose it &lt;i&gt;is&lt;/i&gt; too early to be losing big items anyway...</state>
                 <state img="1-lecture.png">It's still too early for the match to be decided here!</state>
@@ -1159,7 +1159,7 @@
                 <state img="1-insecure.png">I'm so far ahead of you... I shouldn't stare, not when you're doing so poorly.</state>
                 <state img="1-happy.png">Given the difference in our layers, I feel like a doctor examining her patient. With my powers though, I suppose that's not entirely inaccurate.</state>
                 <state img="1-surprised.png">&lt;i&gt;(Wait, what will I do if l stare too much at ~name~...?)&lt;/i&gt; I-it's pure curiosity, believe me!</state>
-                <state img="1-interested.png">I'm used to seeing mens' bare chests. A lot of men at Danghrest don't wear shirts, too show of their muscles. &lt;i&gt;(Why am I still so excited to see ~name~'s chest, though...?)&lt;/i&gt;</state>
+                <state img="1-interested.png">I'm used to seeing mens' bare chests. A lot of men at Danghrest don't wear shirts, to show off their muscles. &lt;i&gt;(Why am I still so excited to see ~name~'s chest, though...?)&lt;/i&gt;</state>
                 <state img="1-excited.png">I love the scene from "The Tale of the Jade Planet" where the Amber Knight takes off his shirt. Will ~name~'s chest reveal come close to that?</state>
                 <state img="1-pushing.png">It takes a special kind of bravery to be able to expose yourself like this, and I respect that!</state>
             </case>
@@ -1194,7 +1194,7 @@
                 <state img="1-interested.png">I wonder why it's so small... my books never mentioned why penises can differ so much in size.</state>
             </case>
             <case tag="male_medium_crotch_is_visible">
-                <state img="1-calm.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
+                <state img="1-insecure.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
                 <state img="1-happy.png">That's your..? Oh no, don't mind me! I think it looks cute!</state>
                 <state img="1-excited.png">I don't have much room for comparison, but you look good in my eyes, ~name~!</state>
                 <state img="1-interested.png">Oh my... I could stare at this for a while!</state>
@@ -1278,7 +1278,7 @@
                 <state img="1-pain.png">Never mind. You've stripped and I've uh... already seen everything. Sorry, Palutena.</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena">
-                <state img="1-determind.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
+                <state img="1-pushing.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena" targetSaidMarker="luna">
                 <state img="1-happy.png">She reminds me of an old fairy tale about two children who travel on a moon through the skies. Can she visit the "Brave Vesperia" on it?</state>
@@ -1587,7 +1587,7 @@
             </case>
             <case tag="male_removed_accessory">
                 <state img="2-lecture.png">"A journey of a thousand miles begins with a single step", and that step is you losing your ~clothing~!</state>
-                <state img="2-pouting.png">I hope that ~clothing~ didn't mean too much to you... I'd hate for you to lose something so precious.</state>
+                <state img="2-pouting.png">I hope ~clothing.ifPlural(those|that)~ ~clothing~ didn't mean too much to you... I'd hate for you to lose something so precious.</state>
                 <state img="2-interested.png">There go~clothing.ifPlural(|es)~ the ~clothing~... how do you people comfortably carry so many accessories on your person?</state>
                 <state img="2-calm.png">Good! I suppose it &lt;i&gt;is&lt;/i&gt; too early to be losing big items anyway...</state>
                 <state img="2-lecture.png">It's still too early for the match to be decided here!</state>
@@ -1845,7 +1845,7 @@
             <case tag="male_chest_will_be_visible">
                 <state img="2-interested.png">&lt;i&gt;(I can't help but wonder what he has under there...)&lt;/i&gt;</state>
                 <state img="2-surprised.png">&lt;i&gt;(Wait, what will I do if l stare too much at ~name~...?)&lt;/i&gt; I-it's pure curiosity, believe me!</state>
-                <state img="2-interested.png">I'm used to seeing mens' bare chests. A lot of men at Danghrest don't wear shirts, too show of their muscles. &lt;i&gt;(Why am I still so excited to see ~name~'s chest, though...?)&lt;/i&gt;</state>
+                <state img="2-interested.png">I'm used to seeing mens' bare chests. A lot of men at Danghrest don't wear shirts, to show off their muscles. &lt;i&gt;(Why am I still so excited to see ~name~'s chest, though...?)&lt;/i&gt;</state>
                 <state img="2-excited.png">I love the scene from "The Tale of the Jade Planet" where the Amber Knight takes off his shirt. Will ~name~'s chest reveal come close to that?</state>
                 <state img="2-pushing.png">It takes a special kind of bravery to be able to expose yourself like this, and I respect that!</state>
             </case>
@@ -1881,7 +1881,7 @@
                 <state img="2-interested.png">I wonder why it's so small... my books never mentioned why penises can differ so much in size.</state>
             </case>
             <case tag="male_medium_crotch_is_visible">
-                <state img="2-calm.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
+                <state img="2-insecure.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
                 <state img="2-happy.png">That's your..? Oh no, don't mind me! I think it looks cute!</state>
                 <state img="2-excited.png">I don't have much room for comparison, but you look good in my eyes, ~name~!</state>
                 <state img="2-interested.png">Oh my... I could stare at this for a while!</state>
@@ -1965,7 +1965,7 @@
                 <state img="2-pain.png">Never mind. You've stripped and I've uh... already seen everything. Sorry, Palutena.</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena">
-                <state img="2-determind.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
+                <state img="2-pushing.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena" targetSaidMarker="luna">
                 <state img="2-happy.png">She reminds me of an old fairy tale about two children who travel on a moon through the skies. Can she visit the "Brave Vesperia" on it?</state>
@@ -2532,7 +2532,7 @@
             <case tag="male_chest_will_be_visible">
                 <state img="3-interested.png">&lt;i&gt;(I can't help but wonder what he has under there...)&lt;/i&gt;</state>
                 <state img="3-surprised.png">&lt;i&gt;(Wait, what will I do if l stare too much at ~name~...?)&lt;/i&gt; I-it's pure curiosity, believe me!</state>
-                <state img="3-interested.png">I'm used to seeing mens' bare chests. A lot of men at Danghrest don't wear shirts, too show of their muscles. &lt;i&gt;(Why am I still so excited to see ~name~'s chest, though...?)&lt;/i&gt;</state>
+                <state img="3-interested.png">I'm used to seeing mens' bare chests. A lot of men at Danghrest don't wear shirts, to show off their muscles. &lt;i&gt;(Why am I still so excited to see ~name~'s chest, though...?)&lt;/i&gt;</state>
                 <state img="3-excited.png">I love the scene from "The Tale of the Jade Planet" where the Amber Knight takes off his shirt. Will ~name~'s chest reveal come close to that?</state>
                 <state img="3-pushing.png">It takes a special kind of bravery to be able to expose yourself like this, and I respect that!</state>
             </case>
@@ -2568,7 +2568,7 @@
                 <state img="3-interested.png">I wonder why it's so small... my books never mentioned why penises can differ so much in size.</state>
             </case>
             <case tag="male_medium_crotch_is_visible">
-                <state img="3-calm.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
+                <state img="3-insecure.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
                 <state img="3-happy.png">That's your..? Oh no, don't mind me! I think it looks cute!</state>
                 <state img="3-excited.png">I don't have much room for comparison, but you look good in my eyes, ~name~!</state>
                 <state img="3-interested.png">Oh my... I could stare at this for a while!</state>
@@ -2652,7 +2652,7 @@
                 <state img="3-pain.png">Never mind. You've stripped and I've uh... already seen everything. Sorry, Palutena.</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena">
-                <state img="3-determind.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
+                <state img="3-pushing.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena" targetSaidMarker="luna">
                 <state img="3-happy.png">She reminds me of an old fairy tale about two children who travel on a moon through the skies. Can she visit the "Brave Vesperia" on it?</state>
@@ -3222,7 +3222,7 @@
             <case tag="male_chest_will_be_visible">
                 <state img="4-interested.png">&lt;i&gt;(I can't help but wonder what he has under there...)&lt;/i&gt;</state>
                 <state img="4-surprised.png">&lt;i&gt;(Wait, what will I do if l stare too much at ~name~...?)&lt;/i&gt; I-it's pure curiosity, believe me!</state>
-                <state img="4-interested.png">I'm used to seeing mens' bare chests. A lot of men at Danghrest don't wear shirts, too show of their muscles. &lt;i&gt;(Why am I still so excited to see ~name~'s chest, though...?)&lt;/i&gt;</state>
+                <state img="4-interested.png">I'm used to seeing mens' bare chests. A lot of men at Danghrest don't wear shirts, to show off their muscles. &lt;i&gt;(Why am I still so excited to see ~name~'s chest, though...?)&lt;/i&gt;</state>
                 <state img="4-excited.png">I love the scene from "The Tale of the Jade Planet" where the Amber Knight takes off his shirt. Will ~name~'s chest reveal come close to that?</state>
                 <state img="4-pushing.png">It takes a special kind of bravery to be able to expose yourself like this, and I respect that!</state>
             </case>
@@ -3258,7 +3258,7 @@
                 <state img="4-interested.png">I wonder why it's so small... my books never mentioned why penises can differ so much in size.</state>
             </case>
             <case tag="male_medium_crotch_is_visible">
-                <state img="4-calm.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
+                <state img="4-insecure.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
                 <state img="4-happy.png">That's your..? Oh no, don't mind me! I think it looks cute!</state>
                 <state img="4-excited.png">I don't have much room for comparison, but you look good in my eyes, ~name~!</state>
                 <state img="4-interested.png">Oh my... I could stare at this for a while!</state>
@@ -3342,7 +3342,7 @@
                 <state img="4-pain.png">Never mind. You've stripped and I've uh... already seen everything. Sorry, Palutena.</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena">
-                <state img="4-determind.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
+                <state img="4-pushing.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena" targetSaidMarker="luna">
                 <state img="4-happy.png">She reminds me of an old fairy tale about two children who travel on a moon through the skies. Can she visit the "Brave Vesperia" on it?</state>
@@ -3854,9 +3854,13 @@
             </case>
             <case tag="male_removed_major">
                 <test expr="~clothing.position~" value="lower" />
-                <state img="5-pouting.png">Huh? Those shorts look like they don't leave much room for the imagination... I feel disappointed, for some reason.</state>
                 <state img="5-interested.png">So that's what a man wears to cover his penis?</state>
                 <state img="5-interested.png">I wonder... do any of the guys wear underwear like that?</state>
+                <state img="5-interested.png">Okay, judging by the bulge... I think I have a good idea what you're going to show us.</state>
+            </case>
+            <case tag="male_removed_major" filter="small_penis">
+                <test expr="~clothing.position~" value="lower" />
+                <state img="5-pouting.png">Huh? Those shorts look like they don't leave much room for the imagination... I feel disappointed, for some reason.</state>
             </case>
             <case tag="female_removing_major">
                 <state img="5-happy.png">Oh! Maybe this is a sign that things are looking up for me!</state>
@@ -3966,7 +3970,7 @@
                 <state img="5-interested.png">I wonder why it's so small... my books never mentioned why penises can differ so much in size.</state>
             </case>
             <case tag="male_medium_crotch_is_visible">
-                <state img="5-calm.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
+                <state img="5-insecure.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
                 <state img="5-happy.png">That's your..? Oh no, don't mind me! I think it looks cute!</state>
                 <state img="5-excited.png">I don't have much room for comparison, but you look good in my eyes, ~name~!</state>
                 <state img="5-interested.png">Oh my... I could stare at this for a while!</state>
@@ -4049,7 +4053,7 @@
                 <state img="5-pouting.png">I know I'd love to have a body like yours!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena">
-                <state img="5-determind.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
+                <state img="5-pushing.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena" targetSaidMarker="luna">
                 <state img="5-happy.png">She reminds me of an old fairy tale about two children who travel on a moon through the skies. Can she visit the "Brave Vesperia" on it?</state>
@@ -4528,9 +4532,13 @@
             </case>
             <case tag="male_removed_major">
                 <test expr="~clothing.position~" value="lower" />
-                <state img="6-pouting.png">Huh? Those shorts look like they don't leave much room for the imagination... I feel disappointed, for some reason.</state>
                 <state img="6-interested.png">So that's what a man wears to cover his penis?</state>
                 <state img="6-interested.png">I wonder... do any of the guys wear underwear like that?</state>
+                <state img="6-interested.png">Okay, judging by the bulge... I think I have a good idea what you're going to show us.</state>
+            </case>
+            <case tag="male_removed_major" filter="small_penis">
+                <test expr="~clothing.position~" value="lower" />
+                <state img="6-pouting.png">Huh? Those shorts look like they don't leave much room for the imagination... I feel disappointed, for some reason.</state>
             </case>
             <case tag="female_removing_major">
                 <state img="6-happy.png">Oh! Maybe this is a sign that things are looking up for me!</state>
@@ -4638,7 +4646,7 @@
                 <state img="6-interested.png">I wonder why it's so small... my books never mentioned why penises can differ so much in size.</state>
             </case>
             <case tag="male_medium_crotch_is_visible">
-                <state img="6-calm.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
+                <state img="6-insecure.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
                 <state img="6-happy.png">That's your..? Oh no, don't mind me! I think it looks cute!</state>
                 <state img="6-excited.png">I don't have much room for comparison, but you look good in my eyes, ~name~!</state>
                 <state img="6-interested.png">Oh my... I could stare at this for a while!</state>
@@ -4714,7 +4722,7 @@
                 <state img="6-pouting.png">I know I'd love to have a body like yours!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena">
-                <state img="6-determind.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
+                <state img="6-pushing.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena" targetSaidMarker="luna">
                 <state img="6-happy.png">She reminds me of an old fairy tale about two children who travel on a moon through the skies. Can she visit the "Brave Vesperia" on it?</state>
@@ -5174,9 +5182,13 @@
             </case>
             <case tag="male_removed_major">
                 <test expr="~clothing.position~" value="lower" />
-                <state img="7-pouting.png">Huh? Those shorts look like they don't leave much room for the imagination... I feel disappointed, for some reason.</state>
                 <state img="7-interested.png">So that's what a man wears to cover his penis?</state>
                 <state img="7-interested.png">I wonder... do any of the guys wear underwear like that?</state>
+                <state img="7-interested.png">Okay, judging by the bulge... I think I have a good idea what you're going to show us.</state>
+            </case>
+            <case tag="male_removed_major" filter="small_penis">
+                <test expr="~clothing.position~" value="lower" />
+                <state img="7-pouting.png">Huh? Those shorts look like they don't leave much room for the imagination... I feel disappointed, for some reason.</state>
             </case>
             <case tag="female_removing_major">
                 <state img="7-happy.png">Oh! Maybe this is a sign that things are looking up for me!</state>
@@ -5283,7 +5295,7 @@
                 <state img="7-interested.png">I wonder why it's so small... my books never mentioned why penises can differ so much in size.</state>
             </case>
             <case tag="male_medium_crotch_is_visible">
-                <state img="7-calm.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
+                <state img="7-insecure.png">That isn't too different to that one picture in my text book. &lt;i&gt;(...And some &lt;/i&gt;other&lt;i&gt; books I was reading...)&lt;/i&gt;</state>
                 <state img="7-happy.png">That's your..? Oh no, don't mind me! I think it looks cute!</state>
                 <state img="7-excited.png">I don't have much room for comparison, but you look good in my eyes, ~name~!</state>
                 <state img="7-interested.png">Oh my... I could stare at this for a while!</state>
@@ -5359,7 +5371,7 @@
                 <state img="7-pouting.png">I know I'd love to have a body like yours!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena">
-                <state img="7-determind.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
+                <state img="7-pushing.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena" targetSaidMarker="luna">
                 <state img="7-happy.png">She reminds me of an old fairy tale about two children who travel on a moon through the skies. Can she visit the "Brave Vesperia" on it?</state>
@@ -5745,6 +5757,16 @@
             <case tag="male_removed_major" filter="small_penis">
                 <state img="8-surprised.png">Judging by the bulge... Huh? It can't be that small, can it?</state>
             </case>
+            <case tag="male_removed_major">
+                <test expr="~clothing.position~" value="lower" />
+                <state img="8-interested.png">So that's what a man wears to cover his penis?</state>
+                <state img="8-interested.png">I wonder... do any of the guys wear underwear like that?</state>
+                <state img="8-interested.png">Okay, judging by the bulge... I think I have a good idea what you're going to show us.</state>
+            </case>
+            <case tag="male_removed_major" filter="small_penis">
+                <test expr="~clothing.position~" value="lower" />
+                <state img="8-pouting.png">Huh? Those shorts look like they don't leave much room for the imagination... I feel disappointed, for some reason.</state>
+            </case>
             <case tag="female_removing_major">
                 <state img="8-excited.png">Your ~clothing~? I love ~clothing.ifPlural(~clothing~|~clothing~s)~. Especially when they're worn by someone like you.</state>
                 <state img="8-interested.png">You're losing your ~clothing~? Will you let me watch? I'm curious as to how other women take something like that off.</state>
@@ -5881,7 +5903,7 @@
                 <state img="8-pouting.png">I know I'd love to have a body like yours!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena">
-                <state img="8-determind.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
+                <state img="8-pushing.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena" targetSaidMarker="luna">
                 <state img="8-happy.png">She reminds me of an old fairy tale about two children who travel on a moon through the skies. Can she visit the "Brave Vesperia" on it?</state>
@@ -6205,11 +6227,20 @@
             </case>
             <case tag="male_removed_major">
                 <state img="9-surprised.png">Wow, it's totally different to what I expected...</state>
-                <state img="9-determind.png">Okay, judging by the bulge... I think I have a good idea what you're going to show us.</state>
             </case>
             <case tag="male_removed_major" filter="small_penis">
                 <state img="9-surprised.png">Judging by the bulge... Huh? It can't be that small, can it?</state>
             </case>
+            <case tag="male_removed_major">
+                <test expr="~clothing.position~" value="lower" />
+                <state img="9-interested.png">So that's what a man wears to cover his penis?</state>
+                <state img="9-interested.png">I wonder... do any of the guys wear underwear like that?</state>
+                <state img="9-interested.png">Okay, judging by the bulge... I think I have a good idea what you're going to show us.</state>
+            </case>
+            <case tag="male_removed_major" filter="small_penis">
+                <test expr="~clothing.position~" value="lower" />
+                <state img="9-pouting.png">Huh? Those shorts look like they don't leave much room for the imagination... I feel disappointed, for some reason.</state>
+            </case>
             <case tag="female_removing_major">
                 <state img="9-surprised.png">You have to lose your ~clothing~ this time? I didn't notice. Maybe it's because you look so much more dressed than me...</state>
                 <state img="9-determind.png">You're wearing something under your ~clothing~, aren't you? Then it's not that bad to lose it. You still have time before you have to expose something important.</state>
@@ -6299,11 +6330,6 @@
                 <state img="9-surprised.png">You're going to...? O-of course I've seen naked men before! Even if it was only in a book...</state>
             </case>
             <case tag="male_small_crotch_is_visible">
-                <state img="9-interested.png">Huh? So, this is your penis? It's different to the drawing in the book I was reading...</state>
-                <state img="9-pushing.png">Don't look so ashamed! Even I can tell that it's small, but I think that just makes it even cuter!</state>
-                <state img="9-surprised.png">Hmm... the books said they're normally bigger... Oh no! I'm sorry, ~name~, I didn't mean to upset you!</state>
-                <state img="9-pushing.png">Not everyone has to look like some picturesque hero, ~name~, and I think you're fine just how you are!</state>
-                <state img="9-interested.png">I wonder why it's so small... my books never mentioned why penises can differ so much in size.</state>
                 <state img="9-surprised.png">Wow, I didn't imagined it would be this small... Oh, I mean... It looks pretty cute. Wait, no! Cute isn't the word you wanted to hear, right?</state>
             </case>
             <case tag="male_medium_crotch_is_visible">
@@ -6372,7 +6398,7 @@
                 <state img="9-pouting.png">I know I'd love to have a body like yours!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena">
-                <state img="9-determind.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
+                <state img="9-pushing.png">You have to tell me all about the differences between your Summon spirits and the spirits I know later, Sheena!</state>
             </case>
             <case tag="female_large_chest_is_visible" target="sheena" targetSaidMarker="luna">
                 <state img="9-happy.png">She reminds me of an old fairy tale about two children who travel on a moon through the skies. Can she visit the "Brave Vesperia" on it?</state>
@@ -6521,7 +6547,7 @@
                 <state img="9-happy.png">Maybe you didn't notice, but your moaning's getting louder and louder. Even &lt;i&gt;I&lt;/i&gt; know what that means!</state>
             </case>
             <case tag="female_finished_masturbating">
-                <state img="9-excited.png">Doesn't it feel amazing? It doesn't feel like a forfeit like all, does it, ~name~?</state>
+                <state img="9-excited.png">Doesn't it feel amazing? It doesn't feel like a forfeit at all, does it, ~name~?</state>
                 <state img="9-determind.png">That was amazing, ~name~! Now you can relax as well.</state>
             </case>
             <case tag="finished_masturbating">