diff --git a/opponents/caulifla/behaviour.xml b/opponents/caulifla/behaviour.xml
index c414c9755887f240759498e9da5e8eb03cc9abd3..532df05257eeb853e4c88df69d9d8cd25e9196f1 100644
--- a/opponents/caulifla/behaviour.xml
+++ b/opponents/caulifla/behaviour.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!--This file was machine generated using the Character Editor v5.0 at 6:45:14 PM on July 30, 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 v5.0 at 4:39:06 AM on July 31, 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>v5.0</version>
     <first>Caulifla</first>
@@ -770,7 +770,7 @@
             </case>
             <case tag="swap_cards" hasHand="Royal Flush" priority="20">
                 <state img="0-Excited.png">Oh...oh &lt;i&gt;heck&lt;/i&gt; yeah! You guys are toast this round!</state>
-                <state>Wait...hold up, is this hand what I think it is!?</state>
+                <state img="0-Shocked.png">Wait...hold up, is this hand what I think it is!?</state>
                 <state img="0-Laughing.png">Okay, gimme...no, shit! Give me absolutely nothing at all! Almost missed what I got right here, what with your weird Earth cards and all.</state>
             </case>
             <case tag="good_hand">
@@ -849,7 +849,7 @@
                 <state img="0-Embarassed.png">Ugh. Thanks. That's just what I wanted right now. Dammit.</state>
                 <state img="0-Annoyed.png">Hmm. Brave of ya, giving me this crap right off the bat. It's like you're looking to get punched or something, dealer.</state>
                 <state img="0-Annoyed.png">Huh. Anyone else gotten complete crap right outta the gate? Or just me?</state>
-                <state img="0-Bored.png">Well, ain't this a bucket of piss. And this hand's pretty bad if I'm being honest.</state>
+                <state img="0-Bored.png">Well, ain't this a bucket of piss. Yeah, talking about my crappy hand right here.</state>
                 <state img="0-Angry.png">Hey! Dealer. What's your deal? You not heard of a warm up round? I'm still getting used to these stupid Earth cards and you're already giving me complete crap to work with!</state>
             </case>
             <case tag="hand" id="0-6" alsoPlaying="saki_zls" alsoPlayingStage="6" alsoPlayingTimeInStage="1">
@@ -895,9 +895,9 @@
                 <state img="0-Bored.png">So, start of your week is it down here on Earth? Don't ya got something better to do than playing this?</state>
                 <state img="0-Distracted.png">So, "Monday" huh? Kinda weird that you even have weeks here. What's with all the universe knowing what weeks, years and all that crap is anyway?</state>
             </case>
-            <case tag="hand" totalRounds="2" notSaidMarker="Sixth Universe" priority="35">
-                <state img="0-Distracted.png">So hey, are we still in the Sixth universe? Or we in the Seventh right now? There being two Earths gets confusing sometimes.</state>
-                <state img="0-Distracted.png">Hey, which Earth are we playing on right now? I overheard Champa saying that there's two of them. Wanna know if I'm in my home universe or not.</state>
+            <case tag="hand" totalRounds="2" notSaidMarker="Sixth_Universe" priority="35">
+                <state img="0-Distracted.png" marker="Sixth_Universe">So hey, are we still in the Sixth universe? Or we in the Seventh right now? There being two Earths gets confusing sometimes.</state>
+                <state img="0-Distracted.png" marker="Sixth_Universe">Hey, which Earth are we playing on right now? I overheard Champa saying that there's two of them. Wanna know if I'm in my home universe or not.</state>
             </case>
             <case tag="must_strip_winning">
                 <state img="0-Bored.png">Seems I'm ahead of the pack at least.</state>
@@ -962,9 +962,9 @@
                 <state img="0-Laughing.png">You nervous or something? Well, I bet having to drop ya clothes in front of me would be pretty nerve-racking, haha.</state>
                 <state img="0-Excited.png">Ha! Ya like that, huh?</state>
             </case>
-            <case tag="male_must_strip" target="jin" targetStage="0-4">
-                <state img="0-Confident.png">Huh. Here I'm just surprised to see a human with a full head of hair. Thought you were all a bunch of chrome domes.</state>
-                <state img="0-Happy.png">Man, that head of hair wouldn't be outta place on a Saiyan. I thought humans were bald. How about that.</state>
+            <case tag="male_must_strip" target="jin" targetStage="0">
+                <state img="0-Happy.png">Huh. Here I'm just surprised to see a human with a full head of hair. Thought you were all a bunch of walking cue balls or something.</state>
+                <state img="0-Confident.png">Man, that head of hair wouldn't be outta place on a Saiyan. I thought humans were bald. How about that.</state>
                 <state img="0-Confident.png">Huh. You have hair. Some humans beings have hair apparently. Learn something new every day.</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="0">
@@ -974,11 +974,11 @@
                 <state img="0-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy about him.</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="1">
-                <state img="0-Angry.png">. . .</state>
+                <state img="0-Annoyed.png">. . .</state>
                 <state img="0-Confident.png">&lt;i&gt;(This is where we find out if my hunch was right or not.)&lt;/i&gt;</state>
-                <state img="0-Angry.png">&lt;i&gt;(Come on, buddy. Pull that trick again. Let's see if I'm right about you.)&lt;/i&gt;</state>
+                <state img="0-Annoyed.png">&lt;i&gt;(Come on, buddy. Pull that trick again. Let's see if I'm right about you.)&lt;/i&gt;</state>
                 <state img="0-Happy.png">Oh, don't mind me, Skippy. I'm just waiting for something over here. None of ya business as to what that is.</state>
-                <state img="0-Angry.png">&lt;i&gt;(If I'm right about this, I'm only gonna need to see it one more time to know.)&lt;/i&gt;</state>
+                <state img="0-Annoyed.png">&lt;i&gt;(If I'm right about this, I'm only gonna need to see it one more time to know.)&lt;/i&gt;</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="2">
                 <state img="0-Laughing.png">Think you could &lt;i&gt;skip&lt;/i&gt; to the best bit already?</state>
@@ -989,11 +989,11 @@
             <case tag="male_must_strip" target="jotaro" targetStage="3">
                 <state img="0-Smug.png">Come on then, Skippy. we doing this one more time then?</state>
                 <state img="0-Laughing.png">On with the skip-tease then? Haha.</state>
-                <state img="0-Confident.png">Come on then, human Hit. Think you can do your time-skip again for little old me?</state>
+                <state img="0-Confident.png">Come on then, human Hit. Think you can do your time-skip again for me? Pretty please?</state>
             </case>
             <case tag="male_must_strip" target="pit" targetStage="0">
-                <state img="0-Confident.png">Cute wings. Kinda redundant though, wouldn't you agree?</state>
-                <state img="0-Smug.png">Hmm. You remind me of the battle royal I was involved in. Talking about the flyers specifically. I don't remember them being all that strong, but they were annoying to deal with.</state>
+                <state img="0-Confident.png">Cute wings. Kinda redundant though, wouldn't you agree? Anyone with half a brain can learn how to fly.</state>
+                <state img="0-Smug.png">You remind me of the battle royal I was involved in. Talking about the flyers specifically. I don't remember them being all that strong, but they were annoying to deal with.</state>
                 <state img="0-Smug.png">Sure is Cabba in here right now. Oh, don't mind me, you just remind me a little of someone I know.</state>
             </case>
             <case tag="female_must_strip">
@@ -1012,81 +1012,77 @@
                 <state img="0-Smug.png">Guess I tagged you there, honey.</state>
                 <state img="0-Laughing.png">Looks like I tagged you there no problem.</state>
             </case>
-            <case tag="female_must_strip" target="aella" targetStage="0">
-                <state img="0-Combat.png">You're big at least. But that doesn't count for anything when you're faced with me.</state>
-                <state img="0-Distracted.png">Well you're a big girl, &lt;i&gt;buuut&lt;/i&gt; your energy is basically nothing from what I can tell. Sorry lady, you ain't no threat to me.</state>
-            </case>
             <case tag="female_must_strip" target="amalia" targetStage="0">
                 <state img="0-Happy.png">Wait, so you use plants for clothes where you come from? Psh, I'll take my threads over that green stuff any day.</state>
                 <state img="0-Stretching.png">Smells like a garden in here. You sure love your greenery, lady.</state>
                 <state img="0-Confident.png">Heh. You seem kinda interesting. Your battle power seems a bit weedy though.</state>
             </case>
             <case tag="female_must_strip" target="chun-li" targetStage="2">
-                <state img="0-Confident.png">That's your third strike right there. Whatcha got for us then, hmm?</state>
-                <state img="0-Confident.png">Looks like you're on your third strike. You got some special moment planned for this round?</state>
+                <state img="0-Confident.png">That's your third strike right there, Chun-Li. Whatcha got for us then, hmm?</state>
+                <state img="0-Happy.png">Looks like you're on your third strike. You got some special moment planned for this round?</state>
                 <state img="0-Laughing.png">You weren't gonna parry that hit away.</state>
             </case>
             <case tag="female_must_strip" target="erufuda" targetStage="0">
-                <state img="0-Annoyed.png">Hey. You ain't gonna start sprouting off about the power of love and junk, are ya? The last girl I ran into who was your size was nuts about that.</state>
+                <state img="0-Annoyed.png">Hey. You ain't gonna start sprouting off about the power of love and junk, are ya? The last girl I ran into who was your size was nuts about all that.</state>
                 <state img="0-Bored.png">Don't think anything of this, but your figure's making me remember someone I'd prefer to forget. &lt;i&gt;(Pretty Cannon...ugh, sends shivers down my spine.)&lt;/i&gt;</state>
                 <state img="0-Distracted.png">Well whatever ya do, don't start summoning magical love hearts or something like that. Would rather not see any of that crap today.</state>
-                <state img="0-Happy.png">Y'know I actually have met bigger girls than you before. Just don't ask me about that. Really, please don't.</state>
-                <state img="0-Confident.png">Hmm. You seem a little outta shape. I ain't gonna mince my words, you think I'm the type who cares about offending people?</state>
+                <state img="0-Happy.png">Y'know, I've actually met bigger girls than you before. &lt;i&gt;Juuust&lt;/i&gt; don't ask me about them. Really, please don't.</state>
                 <state img="0-Combat.png">I take it you're looking to lose a few pounds. Well, I bet I could help ya there, if you can keep up. Think you can handle my kinda workout?</state>
                 <state img="0-Distracted.png">Pointy ears and a...robust constitution. You remind me of the Supreme Kai.</state>
             </case>
             <case tag="female_must_strip" target="florina" targetStage="0">
                 <state img="0-Distracted.png">Hey. You seem nervous. Like, really, &lt;really&gt; nervous.</state>
                 <state img="0-Confident.png">You've gotten yourself worked up over something. Is it the game, or something else that's bothering ya?</state>
-                <state img="0-Confident.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
+                <state img="0-Happy.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
                 <state img="0-Confident.png">Hmm. Something's eating you up. Whatever's going through you mind right now, trust me, it ain't as bad as you think.</state>
-                <state img="0-Confident.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
+                <state img="0-Happy.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
             </case>
-            <case tag="female_must_strip" target="florina" targetStage="1-2">
+            <case tag="female_must_strip" target="florina" targetStage="1">
                 <state img="0-Excited.png">Alright, let's do this again. Come on, I know you've got this, you've &lt;i&gt;totally&lt;/i&gt; got this one!</state>
                 <state img="0-Combat.png">Alright Florina, don't think too hard about this next one. Just get it over with and feel proud for having done it.</state>
                 <state img="0-Happy.png">No need to be shy. Do ya see me doubting ya confidence? No? Then what're ya doubting yourself for?</state>
             </case>
             <case tag="female_must_strip" target="florina" targetStage="2">
-                <state img="0-Confident.png">Remember what I said before. Don't overthink it. Just focus on getting it right rather than worrying about getting it wrong.</state>
-                <state img="0-Excited.png">I'd say you're doing pretty well, all things considered. I mean you're still here, right?</state>
+                <state img="0-Happy.png">Remember what I said before. Don't overthink it. Just focus on getting it right rather than worrying about getting it wrong.</state>
+                <state img="0-Confident.png">I'd say you're doing pretty well, all things considered. I mean you're still here, right?</state>
+                <state img="0-Excited.png">Alright! You ready? You're young, you're pretty, and you ain't got nothing to worry about! Let's see what you've got!</state>
             </case>
             <case tag="female_must_strip" target="jura" targetStage="0">
                 <state img="0-Confident.png">So, who are you supposed to be, queen of the space pirates or something? Find it hard to believe that some low-life would doll up as fancy as you're dressed.</state>
-                <state img="0-Distracted.png">Wait, you're a space pirate? Hmm, maybe I'm in the wrong business, running my outfit down on Sadala. You must be making bank if you've got the time to doll up all flashy like that.</state>
+                <state img="0-Distracted.png">Wait, so you're a space pirate? Hmm, maybe I'm in the wrong business, running my outfit down on Sadala. You must be making bank if you've got the time to doll up all flashy like that.</state>
                 <state img="0-Smug.png">What are you, the queen of the space warriors or something? Has a harem of some hundred guys ready to attend to her every need?</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="0">
                 <state img="0-Combat.png">You've got a wild streak to ya. Hehehe, I like that. You're my kinda person lady, I can tell.</state>
                 <state img="0-Happy.png">Looking at you is like looking into a human-shaped mirror. We gotta similar sorta attitude to things it seems.</state>
-                <state img="0-Confident.png">Heh. Besides the toy and your weedy battle power, I think I can see a few similarities between us both.</state>
+                <state img="0-Confident.png">Heh. Besides the toy and your teenie-weenie battle power, I think I can see a few similarities between us both.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="1">
                 <state img="0-Smug.png">Heheh. Gazoontite.</state>
-                <state img="0-Stretching.png">The smell in here's gotten close to making me sneeze once or twice. Ya can tell this place don't get cleaned often enough.</state>
-                <state img="0-Combat.png">Heh. Someone must be talking smack about ya or something. Girls like us tend to get that a lot, hehehe.</state>
+                <state img="0-Bored.png">The smell in here's gotten close to making me sneeze once or twice. Ya can tell this place don't get cleaned often enough.</state>
+                <state img="0-Combat.png">Heh. Someone must be talking smack about ya or something. Girls like us get that a lot.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="3">
                 <state img="0-Thinking.png">Wait, is that why humans shave their heads? Stops them from becoming complete pushovers when they sneeze? Ain't gonna change ya character if you've got no hair to change color.</state>
                 <state img="0-Thinking.png">So, are all humans like you? Hair turns blue and ya become all weak and frightened? Nah, that can't be right. There's Meia and that other girl, Sei. They're both alright.</state>
-                <state img="0-Bored.png">So do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
-                <state img="0-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a loser just because you changed your hair somehow?</state>
+                <state img="0-Bored.png">Do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
+                <state img="0-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a total loser just because you changed your hair somehow?</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="4">
-                <state img="0-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya piss yourself or something.</state>
-                <state img="0-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on for some reason.</state>
+                <state img="0-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya pee your pants or something.</state>
+                <state img="0-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on.</state>
                 <state img="0-Bored.png">Maybe ya should've stayed blonde. Ya seemed to have more smarts for this kinda thing than you do right now.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="5">
                 <state img="0-Bored.png">Wow. Who didn't see &lt;i&gt;this&lt;/i&gt; coming.</state>
                 <state img="0-Distracted.png">Pft. What color hair we gonna get now? Make it multi-colored or something, maybe then you'll impress me.</state>
-                <state img="0-Distracted.png">I'd love to know the crazy thought process which lead to coming up with this act. .</state>
-                <state img="0-Confident.png">Psh. Back to this gag are we? Can't wait to see the A material. Gonna drop your pants for me or something? That could be fun.</state>
+                <state img="0-Distracted.png">I'd love to know the crazy thought process behind coming up with a character like you.</state>
+                <state img="0-Happy.png">Back to this gag are we? What other material have ya got? Gonna drop your pants for me or something? That could be fun.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="6">
                 <state img="0-Combat.png">Alright. Now that you've decided to be fun again, let's see what you've got for us.</state>
-                <state img="0-Confident.png">Yeah. blonde hair you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
-                <state img="0-Happy.png">Ready to have some fun again? Good. Now let's get cracking!</state>
+                <state img="0-Confident.png">Yeah. blonde haired you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
+                <state img="0-Laughing.png">Ready to have some fun again? Good. Now let's get cracking!</state>
             </case>
             <case tag="female_must_strip" target="leggy" targetStage="0">
                 <state img="0-Happy.png">Heh. Ain't you a fuzzy little thing. Are ya from Universe Nine or something? Hmm, nah. Seem a bit soft for that place if ya ask me.</state>
@@ -1101,6 +1097,7 @@
             <case tag="female_must_strip" target="meia" targetStage="0">
                 <state img="0-Confident.png">Who are you, some kinda human space warrior? Whatever you're supposed to be, you don't exactly look happy about being here.</state>
                 <state img="0-Laughing.png">Wait, do some humans live in space? I thought they all lived on just one planet or something strange like that.</state>
+                <state img="0-Smug.png">Hmm. Seems you're taking this seriously. Little too seriously maybe. We're supposed to be having fun here, y'know?</state>
             </case>
             <case tag="female_must_strip" target="nagisa" targetStage="0">
                 <state img="0-Stretching.png">Uhh, kid? What in the world are you doing so far from home?</state>
@@ -1111,7 +1108,7 @@
                 <state img="0-Confident.png">Hmm. I saw that staff of yours ya had earlier. You remind me of Vados, are you an angel or something like that?</state>
                 <state img="0-Confident.png">You sure are tall and elegant, lady. Definitely sensing something godly about you.</state>
                 <state img="0-Thinking.png">Hmm. I didn't see you at the Tournament of Power. So, not an angel, a Destroyer or a Kai. What exactly are you then, lady?</state>
-                <state img="0-Thinking.png">Huh. That's weird. Can't sense no energy coming from ya. And judging by all your bling, you've gotta be a deity or something like that.</state>
+                <state img="0-Thinking.png">Huh. That's weird. Can't sense no energy coming from ya. And judging by all your bling, you've gotta be a deity or something.</state>
             </case>
             <case tag="female_must_strip" target="palutena" targetStage="1">
                 <state img="0-Happy.png">You seem to have a bit more...dignity than the other Gods I've met. Reckon I'd have a little more respect for them if more of them were like you.</state>
@@ -1132,7 +1129,7 @@
                 <state img="0-Confident.png">Hey, what do ya call it, your sensu thingie? Whatever it's name is, it seems angry for some reason.</state>
             </case>
             <case tag="female_must_strip" target="sayaka" targetStage="0">
-                <state img="0-Angry.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
+                <state img="0-Annoyed.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
                 <state img="0-Angry.png">Oh I know your type, ~name~. It's all sunshine and rainbows and obnoxiously long transformations. You really think that crap has any place on the battlefield?</state>
             </case>
             <case tag="tie">
@@ -1260,6 +1257,7 @@
             <case tag="female_removing_accessory" target="marinette" targetStage="0">
                 <state img="0-Laughing.png">You call &lt;i&gt;that&lt;/i&gt; a weapon? Hah! That's hilarious!</state>
                 <state img="0-Laughing.png">You call that a weapon? Well...I guess you could clonk someone on the head with that or something, haha.</state>
+                <state img="0-Thinking.png">Hmm. Well I guess you could try to snare someone up with it. That goes out the window if your opponent can fly though.</state>
             </case>
             <case tag="female_removing_accessory" target="meia" targetStage="0">
                 <state img="0-Distracted.png">Also, hold up, that a scouter you're wearing? Looks kinda beat up, any reason you ain't had it repaired?</state>
@@ -1340,6 +1338,10 @@
                 <state img="0-Thinking.png">Stranger things have happened though Sometimes the most harmless looking people are actually the most dangerous.</state>
                 <state img="0-Combat.png">Still. I'm gonna keep my wits about me. Never know what an opponent has in store for ya.</state>
             </case>
+            <case tag="female_removed_accessory" target="marinette" targetStage="1">
+                <state img="0-Thinking.png">&lt;i&gt;Buuut&lt;/i&gt; I suppose you could try to snare someone up with it. Goes out the window if your opponent can fly though.</state>
+                <state img="0-Laughing.png">You're gonna have to work on your combat moves if your best stuff involves twiddling some string around.</state>
+            </case>
             <case tag="female_removed_accessory" target="meia" targetStage="1">
                 <state img="0-Distracted.png">Oh, uhh, sentimental or something is it? I ain't gonna judge. They're just kinda common where I'm from is all.</state>
                 <state img="0-Stretching.png">You seem kinda precious about it, whatever the reason for that is. Don't worry lady, I won't pry. Not if you don't want me to.</state>
@@ -1962,7 +1964,7 @@
             </case>
             <case tag="swap_cards" hasHand="Royal Flush" priority="20">
                 <state img="1-Excited.png">Oh...oh &lt;i&gt;heck&lt;/i&gt; yeah! You guys are toast this round!</state>
-                <state>Wait...hold up, is this hand what I think it is!?</state>
+                <state img="1-Shocked.png">Wait...hold up, is this hand what I think it is!?</state>
                 <state img="1-Laughing.png">Okay, gimme...no, shit! Give me absolutely nothing at all! Almost missed what I got right here, what with your weird Earth cards and all.</state>
             </case>
             <case tag="good_hand">
@@ -2041,7 +2043,7 @@
                 <state img="1-Embarassed.png">Ugh. Thanks. That's just what I wanted right now. Dammit.</state>
                 <state img="1-Annoyed.png">Hmm. Brave of ya, giving me this crap right off the bat. It's like you're looking to get punched or something, dealer.</state>
                 <state img="1-Annoyed.png">Huh. Anyone else gotten complete crap right outta the gate? Or just me?</state>
-                <state img="1-Bored.png">Well, ain't this a bucket of piss. And this hand's pretty bad if I'm being honest.</state>
+                <state img="1-Bored.png">Well, ain't this a bucket of piss. Yeah, talking about my crappy hand right here.</state>
                 <state img="1-Angry.png">Hey! Dealer. What's your deal? You not heard of a warm up round? I'm still getting used to these stupid Earth cards and you're already giving me complete crap to work with!</state>
             </case>
             <case tag="hand" id="1-6" alsoPlaying="saki_zls" alsoPlayingStage="6" alsoPlayingTimeInStage="1">
@@ -2055,9 +2057,9 @@
                 <state img="1-Laughing.png">Hey, look at that. I got a pair of Corrins! Haha.</state>
                 <state img="1-Distracted.png">So, you're both called Corrin? That's kinda funny. I'd have guessed you were twins if ya hadn't said anything.</state>
             </case>
-            <case tag="hand" totalRounds="2" notSaidMarker="Sixth Universe" priority="35">
-                <state img="1-Distracted.png">So hey, are we still in the Sixth universe? Or we in the Seventh right now? There being two Earths gets confusing sometimes.</state>
-                <state img="1-Distracted.png">Hey, which Earth are we playing on right now? I overheard Champa saying that there's two of them. Wanna know if I'm in my home universe or not.</state>
+            <case tag="hand" totalRounds="2" notSaidMarker="Sixth_Universe" priority="35">
+                <state img="1-Distracted.png" marker="Sixth_Universe">So hey, are we still in the Sixth universe? Or we in the Seventh right now? There being two Earths gets confusing sometimes.</state>
+                <state img="1-Distracted.png" marker="Sixth_Universe">Hey, which Earth are we playing on right now? I overheard Champa saying that there's two of them. Wanna know if I'm in my home universe or not.</state>
             </case>
             <case tag="must_strip_winning">
                 <state img="1-Meditating.png">I just got an idea. And trust me, you're gonna love this.</state>
@@ -2077,10 +2079,10 @@
                 <state img="1-Meditating.png">&lt;i&gt;(This lot ain't slouches at this. Though, I've got just the thing that'll throw them off their game.)&lt;/i&gt;</state>
                 <state img="1-Meditating.png">Hmm. I reckon I could get a bit of training in right now. Don't let it be said that I can't multitask.</state>
             </case>
-            <case tag="must_strip_normal" consecutiveLosses="2" notSaidMarker="lost twice">
-                <state img="1-Angry.png">Agh, crap! Again!? That's twice now, what the hell!?</state>
-                <state img="1-Angry.png">Piss off! No damn way I've lost two rounds back to back. The hell's going on here?</state>
-                <state img="1-Annoyed.png">Wait, ain't that twice? That's &lt;i&gt;twice&lt;/i&gt; now back to back?! Dammit!</state>
+            <case tag="must_strip_normal" consecutiveLosses="2" notSaidMarker="lost_twice">
+                <state img="1-Angry.png" marker="lost_twice">Agh, crap! Again!? That's twice now, what the hell!?</state>
+                <state img="1-Angry.png" marker="lost_twice">Piss off! No damn way I've lost two rounds back to back. The hell's going on here?</state>
+                <state img="1-Annoyed.png" marker="lost_twice">Wait, ain't that twice? That's &lt;i&gt;twice&lt;/i&gt; now back to back?! Dammit!</state>
             </case>
             <case tag="must_strip_losing">
                 <state img="1-Meditating.png">Getting a little antsy. And I know just what to do about it.</state>
@@ -2127,9 +2129,9 @@
                 <state img="1-Laughing.png">You nervous or something? Well, I bet having to drop ya clothes in front of me would be pretty nerve-racking, haha.</state>
                 <state img="1-Excited.png">Ha! Ya like that, huh?</state>
             </case>
-            <case tag="male_must_strip" target="jin" targetStage="0-4">
-                <state img="1-Confident.png">Huh. Here I'm just surprised to see a human with a full head of hair. Thought you were all a bunch of chrome domes.</state>
-                <state img="1-Happy.png">Man, that head of hair wouldn't be outta place on a Saiyan. I thought humans were bald. How about that.</state>
+            <case tag="male_must_strip" target="jin" targetStage="0">
+                <state img="1-Happy.png">Huh. Here I'm just surprised to see a human with a full head of hair. Thought you were all a bunch of walking cue balls or something.</state>
+                <state img="1-Confident.png">Man, that head of hair wouldn't be outta place on a Saiyan. I thought humans were bald. How about that.</state>
                 <state img="1-Confident.png">Huh. You have hair. Some humans beings have hair apparently. Learn something new every day.</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="0">
@@ -2139,11 +2141,11 @@
                 <state img="1-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy about him.</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="1">
-                <state img="1-Angry.png">. . .</state>
+                <state img="1-Annoyed.png">. . .</state>
                 <state img="1-Confident.png">&lt;i&gt;(This is where we find out if my hunch was right or not.)&lt;/i&gt;</state>
-                <state img="1-Angry.png">&lt;i&gt;(Come on, buddy. Pull that trick again. Let's see if I'm right about you.)&lt;/i&gt;</state>
+                <state img="1-Annoyed.png">&lt;i&gt;(Come on, buddy. Pull that trick again. Let's see if I'm right about you.)&lt;/i&gt;</state>
                 <state img="1-Happy.png">Oh, don't mind me, Skippy. I'm just waiting for something over here. None of ya business as to what that is.</state>
-                <state img="1-Angry.png">&lt;i&gt;(If I'm right about this, I'm only gonna need to see it one more time to know.)&lt;/i&gt;</state>
+                <state img="1-Annoyed.png">&lt;i&gt;(If I'm right about this, I'm only gonna need to see it one more time to know.)&lt;/i&gt;</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="2">
                 <state img="1-Laughing.png">Think you could &lt;i&gt;skip&lt;/i&gt; to the best bit already?</state>
@@ -2154,11 +2156,11 @@
             <case tag="male_must_strip" target="jotaro" targetStage="3">
                 <state img="1-Smug.png">Come on then, Skippy. we doing this one more time then?</state>
                 <state img="1-Laughing.png">On with the skip-tease then? Haha.</state>
-                <state img="1-Confident.png">Come on then, human Hit. Think you can do your time-skip again for little old me?</state>
+                <state img="1-Confident.png">Come on then, human Hit. Think you can do your time-skip again for me? Pretty please?</state>
             </case>
             <case tag="male_must_strip" target="pit" targetStage="0">
-                <state img="1-Confident.png">Cute wings. Kinda redundant though, wouldn't you agree?</state>
-                <state img="1-Smug.png">Hmm. You remind me of the battle royal I was involved in. Talking about the flyers specifically. I don't remember them being all that strong, but they were annoying to deal with.</state>
+                <state img="1-Confident.png">Cute wings. Kinda redundant though, wouldn't you agree? Anyone with half a brain can learn how to fly.</state>
+                <state img="1-Smug.png">You remind me of the battle royal I was involved in. Talking about the flyers specifically. I don't remember them being all that strong, but they were annoying to deal with.</state>
                 <state img="1-Smug.png">Sure is Cabba in here right now. Oh, don't mind me, you just remind me a little of someone I know.</state>
             </case>
             <case tag="female_must_strip">
@@ -2177,81 +2179,77 @@
                 <state img="1-Smug.png">Guess I tagged you there, honey.</state>
                 <state img="1-Laughing.png">Looks like I tagged you there no problem.</state>
             </case>
-            <case tag="female_must_strip" target="aella" targetStage="0">
-                <state img="1-Combat.png">You're big at least. But that doesn't count for anything when you're faced with me.</state>
-                <state img="1-Distracted.png">Well you're a big girl, &lt;i&gt;buuut&lt;/i&gt; your energy is basically nothing from what I can tell. Sorry lady, you ain't no threat to me.</state>
-            </case>
             <case tag="female_must_strip" target="amalia" targetStage="0">
                 <state img="1-Happy.png">Wait, so you use plants for clothes where you come from? Psh, I'll take my threads over that green stuff any day.</state>
                 <state img="1-Stretching.png">Smells like a garden in here. You sure love your greenery, lady.</state>
                 <state img="1-Confident.png">Heh. You seem kinda interesting. Your battle power seems a bit weedy though.</state>
             </case>
             <case tag="female_must_strip" target="chun-li" targetStage="2">
-                <state img="1-Confident.png">That's your third strike right there. Whatcha got for us then, hmm?</state>
-                <state img="1-Confident.png">Looks like you're on your third strike. You got some special moment planned for this round?</state>
+                <state img="1-Confident.png">That's your third strike right there, Chun-Li. Whatcha got for us then, hmm?</state>
+                <state img="1-Happy.png">Looks like you're on your third strike. You got some special moment planned for this round?</state>
                 <state img="1-Laughing.png">You weren't gonna parry that hit away.</state>
             </case>
             <case tag="female_must_strip" target="erufuda" targetStage="0">
-                <state img="1-Annoyed.png">Hey. You ain't gonna start sprouting off about the power of love and junk, are ya? The last girl I ran into who was your size was nuts about that.</state>
+                <state img="1-Annoyed.png">Hey. You ain't gonna start sprouting off about the power of love and junk, are ya? The last girl I ran into who was your size was nuts about all that.</state>
                 <state img="1-Bored.png">Don't think anything of this, but your figure's making me remember someone I'd prefer to forget. &lt;i&gt;(Pretty Cannon...ugh, sends shivers down my spine.)&lt;/i&gt;</state>
                 <state img="1-Distracted.png">Well whatever ya do, don't start summoning magical love hearts or something like that. Would rather not see any of that crap today.</state>
-                <state img="1-Happy.png">Y'know I actually have met bigger girls than you before. Just don't ask me about that. Really, please don't.</state>
-                <state img="1-Confident.png">Hmm. You seem a little outta shape. I ain't gonna mince my words, you think I'm the type who cares about offending people?</state>
+                <state img="1-Happy.png">Y'know, I've actually met bigger girls than you before. &lt;i&gt;Juuust&lt;/i&gt; don't ask me about them. Really, please don't.</state>
                 <state img="1-Combat.png">I take it you're looking to lose a few pounds. Well, I bet I could help ya there, if you can keep up. Think you can handle my kinda workout?</state>
                 <state img="1-Distracted.png">Pointy ears and a...robust constitution. You remind me of the Supreme Kai.</state>
             </case>
             <case tag="female_must_strip" target="florina" targetStage="0">
                 <state img="1-Distracted.png">Hey. You seem nervous. Like, really, &lt;really&gt; nervous.</state>
                 <state img="1-Confident.png">You've gotten yourself worked up over something. Is it the game, or something else that's bothering ya?</state>
-                <state img="1-Confident.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
+                <state img="1-Happy.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
                 <state img="1-Confident.png">Hmm. Something's eating you up. Whatever's going through you mind right now, trust me, it ain't as bad as you think.</state>
-                <state img="1-Confident.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
+                <state img="1-Happy.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
             </case>
-            <case tag="female_must_strip" target="florina" targetStage="1-2">
+            <case tag="female_must_strip" target="florina" targetStage="1">
                 <state img="1-Excited.png">Alright, let's do this again. Come on, I know you've got this, you've &lt;i&gt;totally&lt;/i&gt; got this one!</state>
                 <state img="1-Combat.png">Alright Florina, don't think too hard about this next one. Just get it over with and feel proud for having done it.</state>
                 <state img="1-Happy.png">No need to be shy. Do ya see me doubting ya confidence? No? Then what're ya doubting yourself for?</state>
             </case>
             <case tag="female_must_strip" target="florina" targetStage="2">
-                <state img="1-Confident.png">Remember what I said before. Don't overthink it. Just focus on getting it right rather than worrying about getting it wrong.</state>
-                <state img="1-Excited.png">I'd say you're doing pretty well, all things considered. I mean you're still here, right?</state>
+                <state img="1-Happy.png">Remember what I said before. Don't overthink it. Just focus on getting it right rather than worrying about getting it wrong.</state>
+                <state img="1-Confident.png">I'd say you're doing pretty well, all things considered. I mean you're still here, right?</state>
+                <state img="1-Excited.png">Alright! You ready? You're young, you're pretty, and you ain't got nothing to worry about! Let's see what you've got!</state>
             </case>
             <case tag="female_must_strip" target="jura" targetStage="0">
                 <state img="1-Confident.png">So, who are you supposed to be, queen of the space pirates or something? Find it hard to believe that some low-life would doll up as fancy as you're dressed.</state>
-                <state img="1-Distracted.png">Wait, you're a space pirate? Hmm, maybe I'm in the wrong business, running my outfit down on Sadala. You must be making bank if you've got the time to doll up all flashy like that.</state>
+                <state img="1-Distracted.png">Wait, so you're a space pirate? Hmm, maybe I'm in the wrong business, running my outfit down on Sadala. You must be making bank if you've got the time to doll up all flashy like that.</state>
                 <state img="1-Smug.png">What are you, the queen of the space warriors or something? Has a harem of some hundred guys ready to attend to her every need?</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="0">
                 <state img="1-Combat.png">You've got a wild streak to ya. Hehehe, I like that. You're my kinda person lady, I can tell.</state>
                 <state img="1-Happy.png">Looking at you is like looking into a human-shaped mirror. We gotta similar sorta attitude to things it seems.</state>
-                <state img="1-Confident.png">Heh. Besides the toy and your weedy battle power, I think I can see a few similarities between us both.</state>
+                <state img="1-Confident.png">Heh. Besides the toy and your teenie-weenie battle power, I think I can see a few similarities between us both.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="1">
                 <state img="1-Smug.png">Heheh. Gazoontite.</state>
-                <state img="1-Stretching.png">The smell in here's gotten close to making me sneeze once or twice. Ya can tell this place don't get cleaned often enough.</state>
-                <state img="1-Combat.png">Heh. Someone must be talking smack about ya or something. Girls like us tend to get that a lot, hehehe.</state>
+                <state img="1-Bored.png">The smell in here's gotten close to making me sneeze once or twice. Ya can tell this place don't get cleaned often enough.</state>
+                <state img="1-Combat.png">Heh. Someone must be talking smack about ya or something. Girls like us get that a lot.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="3">
                 <state img="1-Thinking.png">Wait, is that why humans shave their heads? Stops them from becoming complete pushovers when they sneeze? Ain't gonna change ya character if you've got no hair to change color.</state>
                 <state img="1-Thinking.png">So, are all humans like you? Hair turns blue and ya become all weak and frightened? Nah, that can't be right. There's Meia and that other girl, Sei. They're both alright.</state>
-                <state img="1-Bored.png">So do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
-                <state img="1-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a loser just because you changed your hair somehow?</state>
+                <state img="1-Bored.png">Do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
+                <state img="1-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a total loser just because you changed your hair somehow?</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="4">
-                <state img="1-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya piss yourself or something.</state>
-                <state img="1-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on for some reason.</state>
+                <state img="1-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya pee your pants or something.</state>
+                <state img="1-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on.</state>
                 <state img="1-Bored.png">Maybe ya should've stayed blonde. Ya seemed to have more smarts for this kinda thing than you do right now.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="5">
                 <state img="1-Bored.png">Wow. Who didn't see &lt;i&gt;this&lt;/i&gt; coming.</state>
                 <state img="1-Distracted.png">Pft. What color hair we gonna get now? Make it multi-colored or something, maybe then you'll impress me.</state>
-                <state img="1-Distracted.png">I'd love to know the crazy thought process which lead to coming up with this act. .</state>
-                <state img="1-Confident.png">Psh. Back to this gag are we? Can't wait to see the A material. Gonna drop your pants for me or something? That could be fun.</state>
+                <state img="1-Distracted.png">I'd love to know the crazy thought process behind coming up with a character like you.</state>
+                <state img="1-Happy.png">Back to this gag are we? What other material have ya got? Gonna drop your pants for me or something? That could be fun.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="6">
                 <state img="1-Combat.png">Alright. Now that you've decided to be fun again, let's see what you've got for us.</state>
-                <state img="1-Confident.png">Yeah. blonde hair you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
-                <state img="1-Happy.png">Ready to have some fun again? Good. Now let's get cracking!</state>
+                <state img="1-Confident.png">Yeah. blonde haired you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
+                <state img="1-Laughing.png">Ready to have some fun again? Good. Now let's get cracking!</state>
             </case>
             <case tag="female_must_strip" target="leggy" targetStage="0">
                 <state img="1-Happy.png">Heh. Ain't you a fuzzy little thing. Are ya from Universe Nine or something? Hmm, nah. Seem a bit soft for that place if ya ask me.</state>
@@ -2266,6 +2264,7 @@
             <case tag="female_must_strip" target="meia" targetStage="0">
                 <state img="1-Confident.png">Who are you, some kinda human space warrior? Whatever you're supposed to be, you don't exactly look happy about being here.</state>
                 <state img="1-Laughing.png">Wait, do some humans live in space? I thought they all lived on just one planet or something strange like that.</state>
+                <state img="1-Smug.png">Hmm. Seems you're taking this seriously. Little too seriously maybe. We're supposed to be having fun here, y'know?</state>
             </case>
             <case tag="female_must_strip" target="nagisa" targetStage="0">
                 <state img="1-Stretching.png">Uhh, kid? What in the world are you doing so far from home?</state>
@@ -2276,7 +2275,7 @@
                 <state img="1-Confident.png">Hmm. I saw that staff of yours ya had earlier. You remind me of Vados, are you an angel or something like that?</state>
                 <state img="1-Confident.png">You sure are tall and elegant, lady. Definitely sensing something godly about you.</state>
                 <state img="1-Thinking.png">Hmm. I didn't see you at the Tournament of Power. So, not an angel, a Destroyer or a Kai. What exactly are you then, lady?</state>
-                <state img="1-Thinking.png">Huh. That's weird. Can't sense no energy coming from ya. And judging by all your bling, you've gotta be a deity or something like that.</state>
+                <state img="1-Thinking.png">Huh. That's weird. Can't sense no energy coming from ya. And judging by all your bling, you've gotta be a deity or something.</state>
             </case>
             <case tag="female_must_strip" target="palutena" targetStage="1">
                 <state img="1-Happy.png">You seem to have a bit more...dignity than the other Gods I've met. Reckon I'd have a little more respect for them if more of them were like you.</state>
@@ -2297,7 +2296,7 @@
                 <state img="1-Confident.png">Hey, what do ya call it, your sensu thingie? Whatever it's name is, it seems angry for some reason.</state>
             </case>
             <case tag="female_must_strip" target="sayaka" targetStage="0">
-                <state img="1-Angry.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
+                <state img="1-Annoyed.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
                 <state img="1-Angry.png">Oh I know your type, ~name~. It's all sunshine and rainbows and obnoxiously long transformations. You really think that crap has any place on the battlefield?</state>
             </case>
             <case tag="tie">
@@ -2425,6 +2424,7 @@
             <case tag="female_removing_accessory" target="marinette" targetStage="0">
                 <state img="1-Laughing.png">You call &lt;i&gt;that&lt;/i&gt; a weapon? Hah! That's hilarious!</state>
                 <state img="1-Laughing.png">You call that a weapon? Well...I guess you could clonk someone on the head with that or something, haha.</state>
+                <state img="1-Thinking.png">Hmm. Well I guess you could try to snare someone up with it. That goes out the window if your opponent can fly though.</state>
             </case>
             <case tag="female_removing_accessory" target="meia" targetStage="0">
                 <state img="1-Distracted.png">Also, hold up, that a scouter you're wearing? Looks kinda beat up, any reason you ain't had it repaired?</state>
@@ -2505,6 +2505,10 @@
                 <state img="1-Thinking.png">Stranger things have happened though Sometimes the most harmless looking people are actually the most dangerous.</state>
                 <state img="1-Combat.png">Still. I'm gonna keep my wits about me. Never know what an opponent has in store for ya.</state>
             </case>
+            <case tag="female_removed_accessory" target="marinette" targetStage="1">
+                <state img="1-Thinking.png">&lt;i&gt;Buuut&lt;/i&gt; I suppose you could try to snare someone up with it. Goes out the window if your opponent can fly though.</state>
+                <state img="1-Laughing.png">You're gonna have to work on your combat moves if your best stuff involves twiddling some string around.</state>
+            </case>
             <case tag="female_removed_accessory" target="meia" targetStage="1">
                 <state img="1-Distracted.png">Oh, uhh, sentimental or something is it? I ain't gonna judge. They're just kinda common where I'm from is all.</state>
                 <state img="1-Stretching.png">You seem kinda precious about it, whatever the reason for that is. Don't worry lady, I won't pry. Not if you don't want me to.</state>
@@ -3108,36 +3112,8 @@
 
         <stage id="2">
             <case tag="swap_cards">
-                <state img="2-Confident.png">I'll take ~cards~ of 'em.</state>
-                <state img="2-Confident.png">Yeah, ~cards~ of 'em.</state>
-            </case>
-            <case tag="swap_cards" hasHand="Royal Flush" priority="20">
-                <state img="2-Excited.png">Oh...oh &lt;i&gt;heck&lt;/i&gt; yeah! You guys are toast this round!</state>
-                <state>Wait...hold up, is this hand what I think it is!?</state>
-                <state img="2-Laughing.png">Okay, gimme...no, shit! Give me absolutely nothing at all! Almost missed what I got right here, what with your weird Earth cards and all.</state>
-            </case>
-            <case tag="swap_cards" notSaidMarker="aura up">
-                <state img="custom:SSJ">Alright then, send ~cards~ my way.</state>
-                <state img="custom:SSJ">Come on, come on. I ain't got all night!</state>
-                <state img="custom:SSJ">~cards~. Better give me what I want, given I've gone to the trouble of powering up and all.</state>
-                <state img="custom:SSJ">I'm feeling ~cards~ right now.</state>
-                <state img="custom:SSJ">Psh. No point keeping these ~cards~ around.</state>
-                <state img="custom:SSJ">Alright ~cards~ should do me.</state>
-                <state img="custom:SSJ">Gimme ~cards~ and we'll be golden. Wait did I just...eh, whatever.</state>
-                <state img="custom:SSJ">Tch. ~cards~. Better be what I need.</state>
-                <state img="custom:SSJ">I'll have ~cards~. That usually gets results.</state>
-                <state img="custom:SSJ">Come on, ~cards~, hit me!</state>
-                <state img="custom:SSJ">I thought you moved your ass slow before dealer. Seem painfully slow now that I've gone Super Saiyan.</state>
-                <state img="custom:SSJ">Gonna trust my instincts on this. Gimme ~cards~, dealer.</state>
-                <state img="custom:SSJ">Okay, ~cards~ then. I'd say please, but I don't feel like it.</state>
-                <state img="custom:SSJ">You expecting a please and thank you out of me? No chance!</state>
-                <state img="custom:SSJ">Hey, come &lt;i&gt;on&lt;/i&gt; already! I ain't got all day here!</state>
-                <state img="custom:SSJ">I ain't standing here for the good of my health. Hit me!</state>
-                <state img="custom:SSJ">Come on, I'm stood twiddling my thumbs over here. Those cards ready yet?</state>
-            </case>
-            <case tag="swap_cards" saidMarker="aura up">
-                <state img="2-Stretching.png">Alright then, send ~cards~ my way.</state>
-                <state img="2-Stretching.png">Come on, come on. I ain't got all night!</state>
+                <state img="2-Stretching.png" marker="aura_up">Alright then, send ~cards~ my way.</state>
+                <state img="2-Stretching.png" marker="aura_up">Come on, come on. I ain't got all night!</state>
                 <state img="2-Confident.png">~cards~. Better give me what I want, given I've gone to the trouble of powering up and all.</state>
                 <state img="2-Happy.png">I'm feeling ~cards~ right now.</state>
                 <state img="2-Distracted.png">Psh. No point keeping these ~cards~ around.</state>
@@ -3153,6 +3129,32 @@
                 <state img="2-Angry.png">Hey, come &lt;i&gt;on&lt;/i&gt; already! I ain't got all day here!</state>
                 <state img="2-Angry.png">I ain't standing here for the good of my health. Hit me!</state>
                 <state img="2-Bored.png">Come on, I'm stood twiddling my thumbs over here. Those cards ready yet?</state>
+                <state img="2-Confident.png">I'll take ~cards~ of 'em.</state>
+                <state img="2-Confident.png">Yeah, ~cards~ of 'em.</state>
+            </case>
+            <case tag="swap_cards" hasHand="Royal Flush" priority="20">
+                <state img="2-Excited.png">Oh...oh &lt;i&gt;heck&lt;/i&gt; yeah! You guys are toast this round!</state>
+                <state img="2-Shocked.png">Wait...hold up, is this hand what I think it is!?</state>
+                <state img="2-Laughing.png">Okay, gimme...no, shit! Give me absolutely nothing at all! Almost missed what I got right here, what with your weird Earth cards and all.</state>
+            </case>
+            <case tag="swap_cards" notSaidMarker="aura_up">
+                <state img="custom:SSJ" marker="aura_up">Alright then, send ~cards~ my way.</state>
+                <state img="custom:SSJ" marker="aura_up">Come on, come on. I ain't got all night!</state>
+                <state img="custom:SSJ" marker="aura_up">~cards~. Better give me what I want, given I've gone to the trouble of powering up and all.</state>
+                <state img="custom:SSJ" marker="aura_up">I'm feeling ~cards~ right now.</state>
+                <state img="custom:SSJ" marker="aura_up">Psh. No point keeping these ~cards~ around.</state>
+                <state img="custom:SSJ" marker="aura_up">Alright ~cards~ should do me.</state>
+                <state img="custom:SSJ" marker="aura_up">Gimme ~cards~ and we'll be golden. Wait did I just...eh, whatever.</state>
+                <state img="custom:SSJ" marker="aura_up">Tch. ~cards~. Better be what I need.</state>
+                <state img="custom:SSJ" marker="aura_up">I'll have ~cards~. That usually gets results.</state>
+                <state img="custom:SSJ" marker="aura_up">Come on, ~cards~, hit me!</state>
+                <state img="custom:SSJ" marker="aura_up">I thought you moved your ass slow before dealer. Seem painfully slow now that I've gone Super Saiyan.</state>
+                <state img="custom:SSJ" marker="aura_up">Gonna trust my instincts on this. Gimme ~cards~, dealer.</state>
+                <state img="custom:SSJ" marker="aura_up">Okay, ~cards~ then. I'd say please, but I don't feel like it.</state>
+                <state img="custom:SSJ" marker="aura_up">You expecting a please and thank you out of me? No chance!</state>
+                <state img="custom:SSJ" marker="aura_up">Hey, come &lt;i&gt;on&lt;/i&gt; already! I ain't got all day here!</state>
+                <state img="custom:SSJ" marker="aura_up">I ain't standing here for the good of my health. Hit me!</state>
+                <state img="custom:SSJ" marker="aura_up">Come on, I'm stood twiddling my thumbs over here. Those cards ready yet?</state>
             </case>
             <case tag="good_hand" priority="0">
                 <state img="2-Confident.png">Ain't got nothing to worry about.</state>
@@ -3174,7 +3176,7 @@
                 <state img="2-Flying.png">Looks like I'm keeping up the pressure over here!</state>
             </case>
             <case tag="good_hand" timeInStage="4" priority="0">
-                <state img="2-Victory.png">A super hand for a Super Saiyan...oh come on, I had to say that once at least!</state>
+                <state img="2-Victory.png">A super hand for a Super Saiyan...oh come on, I had to say that one time at least!</state>
             </case>
             <case tag="okay_hand">
                 <state img="2-Confident.png">Well it ain't flashy, but its certainly solid enough.</state>
@@ -3237,14 +3239,15 @@
                 <state img="2-Thinking.png">Did someone wish you back to life wrong or something? I mean, I've died to, sorta. Don't see me looking like you do right now.</state>
                 <state img="2-Happy.png">Huh. So, you've died before? Guess that makes two of us. Can't keep badasses ladies like us down!</state>
             </case>
-            <case tag="hand" totalRounds="0" priority="100">
-                <state img="custom:SSJ Rnd 1">So. You ready? Nah, ain't no way you could be ready for all of what I am right here.</state>
-                <state img="custom:SSJ Rnd 1">Alright, I'm feeling good about my chances now. Think you'll be able to tangle with a Super Saiyan?</state>
-                <state img="custom:SSJ Rnd 1">Like I was saying, going Super Saiyan really sharpens up my instincts. I reckon that should apply to card playing.</state>
-                <state img="custom:SSJ Rnd 1">Super Saiyan ain't just power by the way. It really brings out my killer instincts when I transform. Means that if you're looking for mercy, you're fresh outta luck now.</state>
-                <state img="custom:SSJ Rnd 1">I'm just transforming for the training. Might make me play better though, guess we'll find out soon enough.</state>
-                <state img="custom:SSJ Rnd 1">So. How d'ya like it? So damn strong and only getting stronger. I'll be the greatest Saiyan in all creation before ya know it!</state>
-                <state img="custom:SSJ Rnd 1">So yeah. It makes for good training, going in and out of Super Saiyan. It'll probably throw you lot off your game. Wouldn't blame ya for being afraid of me right now.</state>
+            <case tag="hand" oneShotId="1" notSaidMarker="aura_fade" priority="500">
+                <state img="custom:SSJ Rnd 1" marker="aura_fade">So. You ready? Nah, ain't no way you could be ready for all of what I am right here.</state>
+                <state img="custom:SSJ Rnd 1" marker="aura_fade">Alright, I'm feeling good about my chances now. Think you'll be able to tangle with a Super Saiyan?</state>
+                <state img="custom:SSJ Rnd 1" marker="aura_fade">Like I was saying, going Super Saiyan really sharpens up my instincts. I reckon that should apply to card playing.</state>
+                <state img="custom:SSJ Rnd 1" marker="aura_fade">Super Saiyan ain't just power by the way. It really brings out my killer instincts when I transform. Means that if you're looking for mercy, you're fresh outta luck now.</state>
+                <state img="custom:SSJ Rnd 1" marker="aura_fade">I'm just transforming for the training. Might make me play better though, guess we'll find out soon enough.</state>
+                <state img="custom:SSJ Rnd 1" marker="aura_fade">So. How d'ya like it? So damn strong and only getting stronger. I'll be the greatest Saiyan in all creation before ya know it!</state>
+                <state img="custom:SSJ Rnd 1" marker="aura_fade">So yeah. It makes for good training, going in and out of Super Saiyan. It'll probably throw you lot off your game. Wouldn't blame ya for being afraid of me right now.</state>
+                <state img="custom:SSJ Rnd 1" marker="aura_fade">Never stops feeling great to be a Saiyan.</state>
             </case>
             <case tag="must_strip_winning">
                 <state img="2-Horny.png">Cutting it close now, but I'm still ahead of the curve.</state>
@@ -3272,15 +3275,15 @@
                 <state img="2-Distracted.png">Again? Fine, whatever.</state>
                 <state img="2-Confident.png">Alright. Make no mistake, I got ya right where I want ya.</state>
             </case>
-            <case tag="must_strip_normal" consecutiveLosses="2" notSaidMarker="lost twice">
-                <state img="2-Angry.png">Agh, crap! Again!? That's twice now, what the hell!?</state>
-                <state img="2-Angry.png">Piss off! No damn way I've lost two rounds back to back. The hell's going on here?</state>
-                <state img="2-Annoyed.png">Wait, ain't that twice? That's &lt;i&gt;twice&lt;/i&gt; now back to back?! Dammit!</state>
+            <case tag="must_strip_normal" consecutiveLosses="2" notSaidMarker="lost_twice">
+                <state img="2-Angry.png" marker="lost_twice">Agh, crap! Again!? That's twice now, what the hell!?</state>
+                <state img="2-Angry.png" marker="lost_twice">Piss off! No damn way I've lost two rounds back to back. The hell's going on here?</state>
+                <state img="2-Annoyed.png" marker="lost_twice">Wait, ain't that twice? That's &lt;i&gt;twice&lt;/i&gt; now back to back?! Dammit!</state>
             </case>
-            <case tag="must_strip_normal" consecutiveLosses="3" notSaidMarker="lost three">
-                <state img="2-Angry.png">Oh, for love of. What the hell is going on?!</state>
-                <state img="2-Angry.png">Gah! Son of a bitch! Why am I getting my ass handed to me all of a sudden.</state>
-                <state img="2-Annoyed.png">Okay...three...that's three fucking times. I'm about to lose my fucking mind!</state>
+            <case tag="must_strip_normal" consecutiveLosses="3" notSaidMarker="lost_three">
+                <state img="2-Angry.png" marker="lost_three">Oh, for love of. What the hell is going on?!</state>
+                <state img="2-Angry.png" marker="lost_three">Gah! Son of a bitch! Why am I getting my ass handed to me all of a sudden.</state>
+                <state img="2-Annoyed.png" marker="lost_three">Okay...three...that's three fucking times. I'm about to lose my fucking mind!</state>
             </case>
             <case tag="must_strip_losing">
                 <state img="2-Shocked.png">Ugh. This is just like the tournament. Only it's my stuff that's getting erased instead of other universes.</state>
@@ -3326,9 +3329,9 @@
                 <state img="2-Smug.png">One mistake, and I'll be on ya in a flash. Don't you forget it.</state>
                 <state img="2-Excited.png">You're hearin' it here first buddy, I'm gonna knock you out!</state>
             </case>
-            <case tag="male_must_strip" target="jin" targetStage="0-4">
-                <state img="2-Confident.png">Huh. Here I'm just surprised to see a human with a full head of hair. Thought you were all a bunch of chrome domes.</state>
-                <state img="2-Happy.png">Man, that head of hair wouldn't be outta place on a Saiyan. I thought humans were bald. How about that.</state>
+            <case tag="male_must_strip" target="jin" targetStage="0">
+                <state img="2-Happy.png">Huh. Here I'm just surprised to see a human with a full head of hair. Thought you were all a bunch of walking cue balls or something.</state>
+                <state img="2-Confident.png">Man, that head of hair wouldn't be outta place on a Saiyan. I thought humans were bald. How about that.</state>
                 <state img="2-Confident.png">Huh. You have hair. Some humans beings have hair apparently. Learn something new every day.</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="0">
@@ -3338,11 +3341,11 @@
                 <state img="2-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy about him.</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="1">
-                <state img="2-Angry.png">. . .</state>
+                <state img="2-Annoyed.png">. . .</state>
                 <state img="2-Confident.png">&lt;i&gt;(This is where we find out if my hunch was right or not.)&lt;/i&gt;</state>
-                <state img="2-Angry.png">&lt;i&gt;(Come on, buddy. Pull that trick again. Let's see if I'm right about you.)&lt;/i&gt;</state>
+                <state img="2-Annoyed.png">&lt;i&gt;(Come on, buddy. Pull that trick again. Let's see if I'm right about you.)&lt;/i&gt;</state>
                 <state img="2-Happy.png">Oh, don't mind me, Skippy. I'm just waiting for something over here. None of ya business as to what that is.</state>
-                <state img="2-Angry.png">&lt;i&gt;(If I'm right about this, I'm only gonna need to see it one more time to know.)&lt;/i&gt;</state>
+                <state img="2-Annoyed.png">&lt;i&gt;(If I'm right about this, I'm only gonna need to see it one more time to know.)&lt;/i&gt;</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="2">
                 <state img="2-Laughing.png">Think you could &lt;i&gt;skip&lt;/i&gt; to the best bit already?</state>
@@ -3353,11 +3356,11 @@
             <case tag="male_must_strip" target="jotaro" targetStage="3">
                 <state img="2-Smug.png">Come on then, Skippy. we doing this one more time then?</state>
                 <state img="2-Laughing.png">On with the skip-tease then? Haha.</state>
-                <state img="2-Confident.png">Come on then, human Hit. Think you can do your time-skip again for little old me?</state>
+                <state img="2-Confident.png">Come on then, human Hit. Think you can do your time-skip again for me? Pretty please?</state>
             </case>
             <case tag="male_must_strip" target="pit" targetStage="0">
-                <state img="2-Confident.png">Cute wings. Kinda redundant though, wouldn't you agree?</state>
-                <state img="2-Smug.png">Hmm. You remind me of the battle royal I was involved in. Talking about the flyers specifically. I don't remember them being all that strong, but they were annoying to deal with.</state>
+                <state img="2-Confident.png">Cute wings. Kinda redundant though, wouldn't you agree? Anyone with half a brain can learn how to fly.</state>
+                <state img="2-Smug.png">You remind me of the battle royal I was involved in. Talking about the flyers specifically. I don't remember them being all that strong, but they were annoying to deal with.</state>
                 <state img="2-Smug.png">Sure is Cabba in here right now. Oh, don't mind me, you just remind me a little of someone I know.</state>
             </case>
             <case tag="female_must_strip">
@@ -3377,75 +3380,78 @@
                 <state img="2-Flying.png">Well you're a big girl, &lt;i&gt;buuut&lt;/i&gt; your energy is next to nothing. Sorry, you ain't no threat to me, lady.</state>
             </case>
             <case tag="female_must_strip" target="amalia" targetStage="0">
+                <state img="2-Happy.png">Wait, so you use plants for clothes where you come from? Psh, I'll take my threads over that green stuff any day.</state>
+                <state img="2-Stretching.png">Smells like a garden in here. You sure love your greenery, lady.</state>
+                <state img="2-Confident.png">Heh. You seem kinda interesting. Your battle power seems a bit weedy though.</state>
                 <state img="2-Confident.png">Wait, your pants are made out of &lt;i&gt;plants&lt;/i&gt;? Ha! That's kinda funny.</state>
                 <state img="2-Confident.png">Hmm. Nice crop top. You're kinda like a gentler, greener version of me, huh?</state>
             </case>
             <case tag="female_must_strip" target="chun-li" targetStage="2">
-                <state img="2-Confident.png">That's your third strike right there. Whatcha got for us then, hmm?</state>
-                <state img="2-Confident.png">Looks like you're on your third strike. You got some special moment planned for this round?</state>
+                <state img="2-Confident.png">That's your third strike right there, Chun-Li. Whatcha got for us then, hmm?</state>
+                <state img="2-Happy.png">Looks like you're on your third strike. You got some special moment planned for this round?</state>
                 <state img="2-Laughing.png">You weren't gonna parry that hit away.</state>
             </case>
             <case tag="female_must_strip" target="erufuda" targetStage="0">
-                <state img="2-Annoyed.png">Hey. You ain't gonna start sprouting off about the power of love and junk, are ya? The last girl I ran into who was your size was nuts about that.</state>
+                <state img="2-Annoyed.png">Hey. You ain't gonna start sprouting off about the power of love and junk, are ya? The last girl I ran into who was your size was nuts about all that.</state>
                 <state img="2-Bored.png">Don't think anything of this, but your figure's making me remember someone I'd prefer to forget. &lt;i&gt;(Pretty Cannon...ugh, sends shivers down my spine.)&lt;/i&gt;</state>
                 <state img="2-Distracted.png">Well whatever ya do, don't start summoning magical love hearts or something like that. Would rather not see any of that crap today.</state>
-                <state img="2-Happy.png">Y'know I actually have met bigger girls than you before. Just don't ask me about that. Really, please don't.</state>
-                <state img="2-Confident.png">Hmm. You seem a little outta shape. I ain't gonna mince my words, you think I'm the type who cares about offending people?</state>
+                <state img="2-Happy.png">Y'know, I've actually met bigger girls than you before. &lt;i&gt;Juuust&lt;/i&gt; don't ask me about them. Really, please don't.</state>
                 <state img="2-Combat.png">I take it you're looking to lose a few pounds. Well, I bet I could help ya there, if you can keep up. Think you can handle my kinda workout?</state>
                 <state img="2-Distracted.png">Pointy ears and a...robust constitution. You remind me of the Supreme Kai.</state>
             </case>
             <case tag="female_must_strip" target="florina" targetStage="0">
                 <state img="2-Distracted.png">Hey. You seem nervous. Like, really, &lt;really&gt; nervous.</state>
                 <state img="2-Confident.png">You've gotten yourself worked up over something. Is it the game, or something else that's bothering ya?</state>
-                <state img="2-Confident.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
+                <state img="2-Happy.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
                 <state img="2-Confident.png">Hmm. Something's eating you up. Whatever's going through you mind right now, trust me, it ain't as bad as you think.</state>
-                <state img="2-Confident.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
+                <state img="2-Happy.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
             </case>
-            <case tag="female_must_strip" target="florina" targetStage="1-2">
+            <case tag="female_must_strip" target="florina" targetStage="1">
                 <state img="2-Excited.png">Alright, let's do this again. Come on, I know you've got this, you've &lt;i&gt;totally&lt;/i&gt; got this one!</state>
                 <state img="2-Combat.png">Alright Florina, don't think too hard about this next one. Just get it over with and feel proud for having done it.</state>
                 <state img="2-Happy.png">No need to be shy. Do ya see me doubting ya confidence? No? Then what're ya doubting yourself for?</state>
             </case>
             <case tag="female_must_strip" target="florina" targetStage="2">
-                <state img="2-Confident.png">Remember what I said before. Don't overthink it. Just focus on getting it right rather than worrying about getting it wrong.</state>
-                <state img="2-Excited.png">I'd say you're doing pretty well, all things considered. I mean you're still here, right?</state>
+                <state img="2-Happy.png">Remember what I said before. Don't overthink it. Just focus on getting it right rather than worrying about getting it wrong.</state>
+                <state img="2-Confident.png">I'd say you're doing pretty well, all things considered. I mean you're still here, right?</state>
+                <state img="2-Excited.png">Alright! You ready? You're young, you're pretty, and you ain't got nothing to worry about! Let's see what you've got!</state>
             </case>
             <case tag="female_must_strip" target="jura" targetStage="0">
                 <state img="2-Confident.png">So, who are you supposed to be, queen of the space pirates or something? Find it hard to believe that some low-life would doll up as fancy as you're dressed.</state>
-                <state img="2-Distracted.png">Wait, you're a space pirate? Hmm, maybe I'm in the wrong business, running my outfit down on Sadala. You must be making bank if you've got the time to doll up all flashy like that.</state>
+                <state img="2-Distracted.png">Wait, so you're a space pirate? Hmm, maybe I'm in the wrong business, running my outfit down on Sadala. You must be making bank if you've got the time to doll up all flashy like that.</state>
                 <state img="2-Smug.png">What are you, the queen of the space warriors or something? Has a harem of some hundred guys ready to attend to her every need?</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="0">
                 <state img="2-Combat.png">You've got a wild streak to ya. Hehehe, I like that. You're my kinda person lady, I can tell.</state>
                 <state img="2-Happy.png">Looking at you is like looking into a human-shaped mirror. We gotta similar sorta attitude to things it seems.</state>
-                <state img="2-Confident.png">Heh. Besides the toy and your weedy battle power, I think I can see a few similarities between us both.</state>
+                <state img="2-Confident.png">Heh. Besides the toy and your teenie-weenie battle power, I think I can see a few similarities between us both.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="1">
                 <state img="2-Smug.png">Heheh. Gazoontite.</state>
-                <state img="2-Stretching.png">The smell in here's gotten close to making me sneeze once or twice. Ya can tell this place don't get cleaned often enough.</state>
-                <state img="2-Combat.png">Heh. Someone must be talking smack about ya or something. Girls like us tend to get that a lot, hehehe.</state>
+                <state img="2-Bored.png">The smell in here's gotten close to making me sneeze once or twice. Ya can tell this place don't get cleaned often enough.</state>
+                <state img="2-Combat.png">Heh. Someone must be talking smack about ya or something. Girls like us get that a lot.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="3">
                 <state img="2-Thinking.png">Wait, is that why humans shave their heads? Stops them from becoming complete pushovers when they sneeze? Ain't gonna change ya character if you've got no hair to change color.</state>
                 <state img="2-Thinking.png">So, are all humans like you? Hair turns blue and ya become all weak and frightened? Nah, that can't be right. There's Meia and that other girl, Sei. They're both alright.</state>
-                <state img="2-Bored.png">So do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
-                <state img="2-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a loser just because you changed your hair somehow?</state>
+                <state img="2-Bored.png">Do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
+                <state img="2-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a total loser just because you changed your hair somehow?</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="4">
-                <state img="2-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya piss yourself or something.</state>
-                <state img="2-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on for some reason.</state>
+                <state img="2-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya pee your pants or something.</state>
+                <state img="2-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on.</state>
                 <state img="2-Bored.png">Maybe ya should've stayed blonde. Ya seemed to have more smarts for this kinda thing than you do right now.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="5">
                 <state img="2-Bored.png">Wow. Who didn't see &lt;i&gt;this&lt;/i&gt; coming.</state>
                 <state img="2-Distracted.png">Pft. What color hair we gonna get now? Make it multi-colored or something, maybe then you'll impress me.</state>
-                <state img="2-Distracted.png">I'd love to know the crazy thought process which lead to coming up with this act. .</state>
-                <state img="2-Confident.png">Psh. Back to this gag are we? Can't wait to see the A material. Gonna drop your pants for me or something? That could be fun.</state>
+                <state img="2-Distracted.png">I'd love to know the crazy thought process behind coming up with a character like you.</state>
+                <state img="2-Happy.png">Back to this gag are we? What other material have ya got? Gonna drop your pants for me or something? That could be fun.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="6">
                 <state img="2-Combat.png">Alright. Now that you've decided to be fun again, let's see what you've got for us.</state>
-                <state img="2-Confident.png">Yeah. blonde hair you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
-                <state img="2-Happy.png">Ready to have some fun again? Good. Now let's get cracking!</state>
+                <state img="2-Confident.png">Yeah. blonde haired you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
+                <state img="2-Laughing.png">Ready to have some fun again? Good. Now let's get cracking!</state>
             </case>
             <case tag="female_must_strip" target="leggy" targetStage="0">
                 <state img="2-Happy.png">Heh. Ain't you a fuzzy little thing. Are ya from Universe Nine or something? Hmm, nah. Seem a bit soft for that place if ya ask me.</state>
@@ -3460,6 +3466,7 @@
             <case tag="female_must_strip" target="meia" targetStage="0">
                 <state img="2-Confident.png">Who are you, some kinda human space warrior? Whatever you're supposed to be, you don't exactly look happy about being here.</state>
                 <state img="2-Laughing.png">Wait, do some humans live in space? I thought they all lived on just one planet or something strange like that.</state>
+                <state img="2-Smug.png">Hmm. Seems you're taking this seriously. Little too seriously maybe. We're supposed to be having fun here, y'know?</state>
             </case>
             <case tag="female_must_strip" target="nagisa" targetStage="0">
                 <state img="2-Stretching.png">Uhh, kid? What in the world are you doing so far from home?</state>
@@ -3470,7 +3477,7 @@
                 <state img="2-Confident.png">Hmm. I saw that staff of yours ya had earlier. You remind me of Vados, are you an angel or something like that?</state>
                 <state img="2-Confident.png">You sure are tall and elegant, lady. Definitely sensing something godly about you.</state>
                 <state img="2-Thinking.png">Hmm. I didn't see you at the Tournament of Power. So, not an angel, a Destroyer or a Kai. What exactly are you then, lady?</state>
-                <state img="2-Thinking.png">Huh. That's weird. Can't sense no energy coming from ya. And judging by all your bling, you've gotta be a deity or something like that.</state>
+                <state img="2-Thinking.png">Huh. That's weird. Can't sense no energy coming from ya. And judging by all your bling, you've gotta be a deity or something.</state>
             </case>
             <case tag="female_must_strip" target="palutena" targetStage="1">
                 <state img="2-Happy.png">You seem to have a bit more...dignity than the other Gods I've met. Reckon I'd have a little more respect for them if more of them were like you.</state>
@@ -3491,7 +3498,7 @@
                 <state img="2-Confident.png">Hey, what do ya call it, your sensu thingie? Whatever it's name is, it seems angry for some reason.</state>
             </case>
             <case tag="female_must_strip" target="sayaka" targetStage="0">
-                <state img="2-Angry.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
+                <state img="2-Annoyed.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
                 <state img="2-Angry.png">Oh I know your type, ~name~. It's all sunshine and rainbows and obnoxiously long transformations. You really think that crap has any place on the battlefield?</state>
             </case>
             <case tag="tie">
@@ -3605,6 +3612,11 @@
                 <state img="2-Happy.png">Oh this is gonna be easy. One or two losses and you'll be petting yourself up before ya know it.</state>
                 <state img="2-Happy.png">Seems you didn't come prepared for this game, Leggy. You're gonna need to be crazy good at this if ya don't wanna end up getting &lt;i&gt;familiar&lt;/i&gt; with yourself.</state>
             </case>
+            <case tag="female_removing_accessory" target="marinette" targetStage="0">
+                <state img="2-Laughing.png">You call &lt;i&gt;that&lt;/i&gt; a weapon? Hah! That's hilarious!</state>
+                <state img="2-Laughing.png">You call that a weapon? Well...I guess you could clonk someone on the head with that or something, haha.</state>
+                <state img="2-Thinking.png">Hmm. Well I guess you could try to snare someone up with it. That goes out the window if your opponent can fly though.</state>
+            </case>
             <case tag="female_removing_accessory" target="nagisa" targetStage="0">
                 <state img="2-Distracted.png">Hmm. Sticking around? Well, whatever. I'll be keeping an eye out for ya then. This ain't the sorta place someone like you should hang out.</state>
                 <state img="2-Distracted.png">Heh. Well I ain't gonna tell ya to scram or anything like that. Just don't start crying if things get a bit much for ya.</state>
@@ -3658,6 +3670,10 @@
                 <state img="2-Thinking.png">Stranger things have happened though Sometimes the most harmless looking people are actually the most dangerous.</state>
                 <state img="2-Combat.png">Still. I'm gonna keep my wits about me. Never know what an opponent has in store for ya.</state>
             </case>
+            <case tag="female_removed_accessory" target="marinette" targetStage="1">
+                <state img="2-Thinking.png">&lt;i&gt;Buuut&lt;/i&gt; I suppose you could try to snare someone up with it. Goes out the window if your opponent can fly though.</state>
+                <state img="2-Laughing.png">You're gonna have to work on your combat moves if your best stuff involves twiddling some string around.</state>
+            </case>
             <case tag="female_removed_accessory" target="moon" targetStage="2">
                 <state img="2-Bored.png">Jeez. You're completely gaga, ain't ya.</state>
             </case>
@@ -4353,21 +4369,8 @@
 
         <stage id="3">
             <case tag="swap_cards">
-                <state img="3-Confident.png">I'll take ~cards~ of 'em.</state>
-                <state img="3-Confident.png">Yeah, ~cards~ of 'em.</state>
-            </case>
-            <case tag="swap_cards" hasHand="Royal Flush">
-                <state img="3-Flying.png">Wanna know what I'm saying? I'm saying that my god damned hand's just gone Super Saiyan! That's what!</state>
-                <state img="3-Flying.png">Oh crap! YES! I've gone Super Saiyan, and my hand's just followed suit! Ha haa!</state>
-            </case>
-            <case tag="swap_cards" hasHand="Royal Flush" priority="20">
-                <state img="3-Excited.png">Oh...oh &lt;i&gt;heck&lt;/i&gt; yeah! You guys are toast this round!</state>
-                <state>Wait...hold up, is this hand what I think it is!?</state>
-                <state img="3-Laughing.png">Okay, gimme...no, shit! Give me absolutely nothing at all! Almost missed what I got right here, what with your weird Earth cards and all.</state>
-            </case>
-            <case tag="swap_cards" saidMarker="aura up">
-                <state img="3-Stretching.png">Alright then, send ~cards~ my way.</state>
-                <state img="3-Stretching.png">Come on, come on. I ain't got all night!</state>
+                <state img="3-Stretching.png" marker="aura_up">Alright then, send ~cards~ my way.</state>
+                <state img="3-Stretching.png" marker="aura_up">Come on, come on. I ain't got all night!</state>
                 <state img="3-Confident.png">~cards~. Better give me what I want, given I've gone to the trouble of powering up and all.</state>
                 <state img="3-Happy.png">I'm feeling ~cards~ right now.</state>
                 <state img="3-Distracted.png">Psh. No point keeping these ~cards~ around.</state>
@@ -4383,6 +4386,17 @@
                 <state img="3-Angry.png">Hey, come &lt;i&gt;on&lt;/i&gt; already! I ain't got all day here!</state>
                 <state img="3-Angry.png">I ain't standing here for the good of my health. Hit me!</state>
                 <state img="3-Bored.png">Come on, I'm stood twiddling my thumbs over here. Those cards ready yet?</state>
+                <state img="3-Confident.png">I'll take ~cards~ of 'em.</state>
+                <state img="3-Confident.png">Yeah, ~cards~ of 'em.</state>
+            </case>
+            <case tag="swap_cards" hasHand="Royal Flush">
+                <state img="3-Flying.png">Wanna know what I'm saying? I'm saying that my god damned hand's just gone Super Saiyan! That's what!</state>
+                <state img="3-Flying.png">Oh crap! YES! I've gone Super Saiyan, and my hand's just followed suit! Ha haa!</state>
+            </case>
+            <case tag="swap_cards" hasHand="Royal Flush" priority="20">
+                <state img="3-Excited.png">Oh...oh &lt;i&gt;heck&lt;/i&gt; yeah! You guys are toast this round!</state>
+                <state img="3-Shocked.png">Wait...hold up, is this hand what I think it is!?</state>
+                <state img="3-Laughing.png">Okay, gimme...no, shit! Give me absolutely nothing at all! Almost missed what I got right here, what with your weird Earth cards and all.</state>
             </case>
             <case tag="good_hand" priority="0">
                 <state img="3-Confident.png">Ain't got nothing to worry about.</state>
@@ -4404,7 +4418,7 @@
                 <state img="3-Flying.png">Looks like I'm keeping up the pressure over here!</state>
             </case>
             <case tag="good_hand" timeInStage="4" priority="0">
-                <state img="3-Victory.png">A super hand for a Super Saiyan...oh come on, I had to say that once at least!</state>
+                <state img="3-Victory.png">A super hand for a Super Saiyan...oh come on, I had to say that one time at least!</state>
             </case>
             <case tag="okay_hand">
                 <state img="3-Confident.png">Well it ain't flashy, but its certainly solid enough.</state>
@@ -4485,15 +4499,15 @@
                 <state img="3-Combat.png">Of all the rotten crap!</state>
                 <state img="3-Embarassed.png">Just when I needed my cards to pull through, they fail me. Perfect.</state>
             </case>
-            <case tag="must_strip_normal" consecutiveLosses="2" notSaidMarker="lost twice">
-                <state img="3-Angry.png">Agh, crap! Again!? That's twice now, what the hell!?</state>
-                <state img="3-Angry.png">Piss off! No damn way I've lost two rounds back to back. The hell's going on here?</state>
-                <state img="3-Annoyed.png">Wait, ain't that twice? That's &lt;i&gt;twice&lt;/i&gt; now back to back?! Dammit!</state>
+            <case tag="must_strip_normal" consecutiveLosses="2" notSaidMarker="lost_twice">
+                <state img="3-Angry.png" marker="lost_twice">Agh, crap! Again!? That's twice now, what the hell!?</state>
+                <state img="3-Angry.png" marker="lost_twice">Piss off! No damn way I've lost two rounds back to back. The hell's going on here?</state>
+                <state img="3-Annoyed.png" marker="lost_twice">Wait, ain't that twice? That's &lt;i&gt;twice&lt;/i&gt; now back to back?! Dammit!</state>
             </case>
-            <case tag="must_strip_normal" consecutiveLosses="3" notSaidMarker="lost three">
-                <state img="3-Angry.png">Oh, for love of. What the hell is going on?!</state>
-                <state img="3-Angry.png">Gah! Son of a bitch! Why am I getting my ass handed to me all of a sudden.</state>
-                <state img="3-Annoyed.png">Okay...three...that's three fucking times. I'm about to lose my fucking mind!</state>
+            <case tag="must_strip_normal" consecutiveLosses="3" notSaidMarker="lost_three">
+                <state img="3-Angry.png" marker="lost_three">Oh, for love of. What the hell is going on?!</state>
+                <state img="3-Angry.png" marker="lost_three">Gah! Son of a bitch! Why am I getting my ass handed to me all of a sudden.</state>
+                <state img="3-Annoyed.png" marker="lost_three">Okay...three...that's three fucking times. I'm about to lose my fucking mind!</state>
             </case>
             <case tag="must_strip_losing">
                 <state img="3-Combat.png">Y'know, whilst I'm pissed about getting myself into a bind, I am still kinda enjoying the challenge of it.</state>
@@ -4508,12 +4522,12 @@
                 <state img="3-Annoyed.png">Dammit, I know I'm losing! Just shut your pie-hole already!</state>
             </case>
             <case tag="stripping">
-                <state img="3-Stripping.png">For the record, showing my tits off isn't too bad. It's losing I'm pissed about.</state>
-                <state img="3-Stripping.png">should be doing way better than this.</state>
+                <state img="3-Stripping.png">For the record, showing off my boobs ain't too bad. It's losing that I'm pissed about.</state>
+                <state img="3-Stripping.png">I should be doing &lt;i&gt;way&lt;/i&gt; better than this. Dammit.</state>
                 <state img="3-Stripping.png">I thought Goku handing my ass to me was bad.</state>
                 <state img="3-Stripping.png">*Sigh* I ain't gonna make a hypocrite of myself. Still can't believe I'm doing this though.</state>
                 <state img="3-Stripping.png">Yeah, yeah, laugh it up. To be honest, I'm not hung up over ya getting an eye-full. It's losing that's embarrassing.</state>
-                <state img="3-Stripping.png">Can't believe you've gotten me to do this. Dammit.</state>
+                <state img="3-Stripping.png">Can't believe you've gotten me to do this.</state>
                 <state img="3-Stripping.png">&lt;i&gt;(I had all that bravado at the start. Sure makes this worse for me. And &lt;i&gt;much&lt;/i&gt; sweeter for them. Dammit!)&lt;/i&gt;</state>
                 <state img="3-Stripping.png">You think because I've lost a thing or two that I'm gonna lose the game as well? Keep dreaming, that ain't happening!</state>
             </case>
@@ -4540,9 +4554,9 @@
                 <state img="3-Smug.png">One mistake, and I'll be on ya in a flash. Don't you forget it.</state>
                 <state img="3-Excited.png">You're hearin' it here first buddy, I'm gonna knock you out!</state>
             </case>
-            <case tag="male_must_strip" target="jin" targetStage="0-4">
-                <state img="3-Confident.png">Huh. Here I'm just surprised to see a human with a full head of hair. Thought you were all a bunch of chrome domes.</state>
-                <state img="3-Happy.png">Man, that head of hair wouldn't be outta place on a Saiyan. I thought humans were bald. How about that.</state>
+            <case tag="male_must_strip" target="jin" targetStage="0">
+                <state img="3-Happy.png">Huh. Here I'm just surprised to see a human with a full head of hair. Thought you were all a bunch of walking cue balls or something.</state>
+                <state img="3-Confident.png">Man, that head of hair wouldn't be outta place on a Saiyan. I thought humans were bald. How about that.</state>
                 <state img="3-Confident.png">Huh. You have hair. Some humans beings have hair apparently. Learn something new every day.</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="0">
@@ -4552,11 +4566,11 @@
                 <state img="3-Distracted.png">Hey, I know a guy who's kinda like you. Got the same sorta vibe and energy about him.</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="1">
-                <state img="3-Angry.png">. . .</state>
+                <state img="3-Annoyed.png">. . .</state>
                 <state img="3-Confident.png">&lt;i&gt;(This is where we find out if my hunch was right or not.)&lt;/i&gt;</state>
-                <state img="3-Angry.png">&lt;i&gt;(Come on, buddy. Pull that trick again. Let's see if I'm right about you.)&lt;/i&gt;</state>
+                <state img="3-Annoyed.png">&lt;i&gt;(Come on, buddy. Pull that trick again. Let's see if I'm right about you.)&lt;/i&gt;</state>
                 <state img="3-Happy.png">Oh, don't mind me, Skippy. I'm just waiting for something over here. None of ya business as to what that is.</state>
-                <state img="3-Angry.png">&lt;i&gt;(If I'm right about this, I'm only gonna need to see it one more time to know.)&lt;/i&gt;</state>
+                <state img="3-Annoyed.png">&lt;i&gt;(If I'm right about this, I'm only gonna need to see it one more time to know.)&lt;/i&gt;</state>
             </case>
             <case tag="male_must_strip" target="jotaro" targetStage="2">
                 <state img="3-Laughing.png">Think you could &lt;i&gt;skip&lt;/i&gt; to the best bit already?</state>
@@ -4567,11 +4581,11 @@
             <case tag="male_must_strip" target="jotaro" targetStage="3">
                 <state img="3-Smug.png">Come on then, Skippy. we doing this one more time then?</state>
                 <state img="3-Laughing.png">On with the skip-tease then? Haha.</state>
-                <state img="3-Confident.png">Come on then, human Hit. Think you can do your time-skip again for little old me?</state>
+                <state img="3-Confident.png">Come on then, human Hit. Think you can do your time-skip again for me? Pretty please?</state>
             </case>
             <case tag="male_must_strip" target="pit" targetStage="0">
-                <state img="3-Confident.png">Cute wings. Kinda redundant though, wouldn't you agree?</state>
-                <state img="3-Smug.png">Hmm. You remind me of the battle royal I was involved in. Talking about the flyers specifically. I don't remember them being all that strong, but they were annoying to deal with.</state>
+                <state img="3-Confident.png">Cute wings. Kinda redundant though, wouldn't you agree? Anyone with half a brain can learn how to fly.</state>
+                <state img="3-Smug.png">You remind me of the battle royal I was involved in. Talking about the flyers specifically. I don't remember them being all that strong, but they were annoying to deal with.</state>
                 <state img="3-Smug.png">Sure is Cabba in here right now. Oh, don't mind me, you just remind me a little of someone I know.</state>
             </case>
             <case tag="female_must_strip">
@@ -4591,75 +4605,78 @@
                 <state img="3-Flying.png">Well you're a big girl, &lt;i&gt;buuut&lt;/i&gt; your energy is next to nothing. Sorry, you ain't no threat to me, lady.</state>
             </case>
             <case tag="female_must_strip" target="amalia" targetStage="0">
+                <state img="3-Happy.png">Wait, so you use plants for clothes where you come from? Psh, I'll take my threads over that green stuff any day.</state>
+                <state img="3-Stretching.png">Smells like a garden in here. You sure love your greenery, lady.</state>
+                <state img="3-Confident.png">Heh. You seem kinda interesting. Your battle power seems a bit weedy though.</state>
                 <state img="3-Confident.png">Wait, your pants are made out of &lt;i&gt;plants&lt;/i&gt;? Ha! That's kinda funny.</state>
                 <state img="3-Confident.png">Hmm. Nice crop top. You're kinda like a gentler, greener version of me, huh?</state>
             </case>
             <case tag="female_must_strip" target="chun-li" targetStage="2">
-                <state img="3-Confident.png">That's your third strike right there. Whatcha got for us then, hmm?</state>
-                <state img="3-Confident.png">Looks like you're on your third strike. You got some special moment planned for this round?</state>
+                <state img="3-Confident.png">That's your third strike right there, Chun-Li. Whatcha got for us then, hmm?</state>
+                <state img="3-Happy.png">Looks like you're on your third strike. You got some special moment planned for this round?</state>
                 <state img="3-Laughing.png">You weren't gonna parry that hit away.</state>
             </case>
             <case tag="female_must_strip" target="erufuda" targetStage="0">
-                <state img="3-Annoyed.png">Hey. You ain't gonna start sprouting off about the power of love and junk, are ya? The last girl I ran into who was your size was nuts about that.</state>
+                <state img="3-Annoyed.png">Hey. You ain't gonna start sprouting off about the power of love and junk, are ya? The last girl I ran into who was your size was nuts about all that.</state>
                 <state img="3-Bored.png">Don't think anything of this, but your figure's making me remember someone I'd prefer to forget. &lt;i&gt;(Pretty Cannon...ugh, sends shivers down my spine.)&lt;/i&gt;</state>
                 <state img="3-Distracted.png">Well whatever ya do, don't start summoning magical love hearts or something like that. Would rather not see any of that crap today.</state>
-                <state img="3-Happy.png">Y'know I actually have met bigger girls than you before. Just don't ask me about that. Really, please don't.</state>
-                <state img="3-Confident.png">Hmm. You seem a little outta shape. I ain't gonna mince my words, you think I'm the type who cares about offending people?</state>
+                <state img="3-Happy.png">Y'know, I've actually met bigger girls than you before. &lt;i&gt;Juuust&lt;/i&gt; don't ask me about them. Really, please don't.</state>
                 <state img="3-Combat.png">I take it you're looking to lose a few pounds. Well, I bet I could help ya there, if you can keep up. Think you can handle my kinda workout?</state>
                 <state img="3-Distracted.png">Pointy ears and a...robust constitution. You remind me of the Supreme Kai.</state>
             </case>
             <case tag="female_must_strip" target="florina" targetStage="0">
                 <state img="3-Distracted.png">Hey. You seem nervous. Like, really, &lt;really&gt; nervous.</state>
                 <state img="3-Confident.png">You've gotten yourself worked up over something. Is it the game, or something else that's bothering ya?</state>
-                <state img="3-Confident.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
+                <state img="3-Happy.png">Yo, relax already. The point of coming here is to chill out and blow off steam, y'know.</state>
                 <state img="3-Confident.png">Hmm. Something's eating you up. Whatever's going through you mind right now, trust me, it ain't as bad as you think.</state>
-                <state img="3-Confident.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
+                <state img="3-Happy.png">Hey, girlie, it's okay, y'know? Ya don't have to fret about this sorta thing.</state>
             </case>
-            <case tag="female_must_strip" target="florina" targetStage="1-2">
+            <case tag="female_must_strip" target="florina" targetStage="1">
                 <state img="3-Excited.png">Alright, let's do this again. Come on, I know you've got this, you've &lt;i&gt;totally&lt;/i&gt; got this one!</state>
                 <state img="3-Combat.png">Alright Florina, don't think too hard about this next one. Just get it over with and feel proud for having done it.</state>
                 <state img="3-Happy.png">No need to be shy. Do ya see me doubting ya confidence? No? Then what're ya doubting yourself for?</state>
             </case>
             <case tag="female_must_strip" target="florina" targetStage="2">
-                <state img="3-Confident.png">Remember what I said before. Don't overthink it. Just focus on getting it right rather than worrying about getting it wrong.</state>
-                <state img="3-Excited.png">I'd say you're doing pretty well, all things considered. I mean you're still here, right?</state>
+                <state img="3-Happy.png">Remember what I said before. Don't overthink it. Just focus on getting it right rather than worrying about getting it wrong.</state>
+                <state img="3-Confident.png">I'd say you're doing pretty well, all things considered. I mean you're still here, right?</state>
+                <state img="3-Excited.png">Alright! You ready? You're young, you're pretty, and you ain't got nothing to worry about! Let's see what you've got!</state>
             </case>
             <case tag="female_must_strip" target="jura" targetStage="0">
                 <state img="3-Confident.png">So, who are you supposed to be, queen of the space pirates or something? Find it hard to believe that some low-life would doll up as fancy as you're dressed.</state>
-                <state img="3-Distracted.png">Wait, you're a space pirate? Hmm, maybe I'm in the wrong business, running my outfit down on Sadala. You must be making bank if you've got the time to doll up all flashy like that.</state>
+                <state img="3-Distracted.png">Wait, so you're a space pirate? Hmm, maybe I'm in the wrong business, running my outfit down on Sadala. You must be making bank if you've got the time to doll up all flashy like that.</state>
                 <state img="3-Smug.png">What are you, the queen of the space warriors or something? Has a harem of some hundred guys ready to attend to her every need?</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="0">
                 <state img="3-Combat.png">You've got a wild streak to ya. Hehehe, I like that. You're my kinda person lady, I can tell.</state>
                 <state img="3-Happy.png">Looking at you is like looking into a human-shaped mirror. We gotta similar sorta attitude to things it seems.</state>
-                <state img="3-Confident.png">Heh. Besides the toy and your weedy battle power, I think I can see a few similarities between us both.</state>
+                <state img="3-Confident.png">Heh. Besides the toy and your teenie-weenie battle power, I think I can see a few similarities between us both.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="1">
                 <state img="3-Smug.png">Heheh. Gazoontite.</state>
-                <state img="3-Stretching.png">The smell in here's gotten close to making me sneeze once or twice. Ya can tell this place don't get cleaned often enough.</state>
-                <state img="3-Combat.png">Heh. Someone must be talking smack about ya or something. Girls like us tend to get that a lot, hehehe.</state>
+                <state img="3-Bored.png">The smell in here's gotten close to making me sneeze once or twice. Ya can tell this place don't get cleaned often enough.</state>
+                <state img="3-Combat.png">Heh. Someone must be talking smack about ya or something. Girls like us get that a lot.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="3">
                 <state img="3-Thinking.png">Wait, is that why humans shave their heads? Stops them from becoming complete pushovers when they sneeze? Ain't gonna change ya character if you've got no hair to change color.</state>
                 <state img="3-Thinking.png">So, are all humans like you? Hair turns blue and ya become all weak and frightened? Nah, that can't be right. There's Meia and that other girl, Sei. They're both alright.</state>
-                <state img="3-Bored.png">So do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
-                <state img="3-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a loser just because you changed your hair somehow?</state>
+                <state img="3-Bored.png">Do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
+                <state img="3-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a total loser just because you changed your hair somehow?</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="4">
-                <state img="3-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya piss yourself or something.</state>
-                <state img="3-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on for some reason.</state>
+                <state img="3-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya pee your pants or something.</state>
+                <state img="3-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on.</state>
                 <state img="3-Bored.png">Maybe ya should've stayed blonde. Ya seemed to have more smarts for this kinda thing than you do right now.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="5">
                 <state img="3-Bored.png">Wow. Who didn't see &lt;i&gt;this&lt;/i&gt; coming.</state>
                 <state img="3-Distracted.png">Pft. What color hair we gonna get now? Make it multi-colored or something, maybe then you'll impress me.</state>
-                <state img="3-Distracted.png">I'd love to know the crazy thought process which lead to coming up with this act. .</state>
-                <state img="3-Confident.png">Psh. Back to this gag are we? Can't wait to see the A material. Gonna drop your pants for me or something? That could be fun.</state>
+                <state img="3-Distracted.png">I'd love to know the crazy thought process behind coming up with a character like you.</state>
+                <state img="3-Happy.png">Back to this gag are we? What other material have ya got? Gonna drop your pants for me or something? That could be fun.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="6">
                 <state img="3-Combat.png">Alright. Now that you've decided to be fun again, let's see what you've got for us.</state>
-                <state img="3-Confident.png">Yeah. blonde hair you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
-                <state img="3-Happy.png">Ready to have some fun again? Good. Now let's get cracking!</state>
+                <state img="3-Confident.png">Yeah. blonde haired you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
+                <state img="3-Laughing.png">Ready to have some fun again? Good. Now let's get cracking!</state>
             </case>
             <case tag="female_must_strip" target="leggy" targetStage="0">
                 <state img="3-Happy.png">Heh. Ain't you a fuzzy little thing. Are ya from Universe Nine or something? Hmm, nah. Seem a bit soft for that place if ya ask me.</state>
@@ -4674,6 +4691,7 @@
             <case tag="female_must_strip" target="meia" targetStage="0">
                 <state img="3-Confident.png">Who are you, some kinda human space warrior? Whatever you're supposed to be, you don't exactly look happy about being here.</state>
                 <state img="3-Laughing.png">Wait, do some humans live in space? I thought they all lived on just one planet or something strange like that.</state>
+                <state img="3-Smug.png">Hmm. Seems you're taking this seriously. Little too seriously maybe. We're supposed to be having fun here, y'know?</state>
             </case>
             <case tag="female_must_strip" target="nagisa" targetStage="0">
                 <state img="3-Stretching.png">Uhh, kid? What in the world are you doing so far from home?</state>
@@ -4684,7 +4702,7 @@
                 <state img="3-Confident.png">Hmm. I saw that staff of yours ya had earlier. You remind me of Vados, are you an angel or something like that?</state>
                 <state img="3-Confident.png">You sure are tall and elegant, lady. Definitely sensing something godly about you.</state>
                 <state img="3-Thinking.png">Hmm. I didn't see you at the Tournament of Power. So, not an angel, a Destroyer or a Kai. What exactly are you then, lady?</state>
-                <state img="3-Thinking.png">Huh. That's weird. Can't sense no energy coming from ya. And judging by all your bling, you've gotta be a deity or something like that.</state>
+                <state img="3-Thinking.png">Huh. That's weird. Can't sense no energy coming from ya. And judging by all your bling, you've gotta be a deity or something.</state>
             </case>
             <case tag="female_must_strip" target="palutena" targetStage="1">
                 <state img="3-Happy.png">You seem to have a bit more...dignity than the other Gods I've met. Reckon I'd have a little more respect for them if more of them were like you.</state>
@@ -4705,7 +4723,7 @@
                 <state img="3-Confident.png">Hey, what do ya call it, your sensu thingie? Whatever it's name is, it seems angry for some reason.</state>
             </case>
             <case tag="female_must_strip" target="sayaka" targetStage="0">
-                <state img="3-Angry.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
+                <state img="3-Annoyed.png">Ugh, jeez. You ain't gonna be going on and on about the power of love or some crap all night, are ya? I've had my fill of characters like that already.</state>
                 <state img="3-Angry.png">Oh I know your type, ~name~. It's all sunshine and rainbows and obnoxiously long transformations. You really think that crap has any place on the battlefield?</state>
             </case>
             <case tag="tie">
@@ -4819,6 +4837,11 @@
                 <state img="3-Happy.png">Oh this is gonna be easy. One or two losses and you'll be petting yourself up before ya know it.</state>
                 <state img="3-Happy.png">Seems you didn't come prepared for this game, Leggy. You're gonna need to be crazy good at this if ya don't wanna end up getting &lt;i&gt;familiar&lt;/i&gt; with yourself.</state>
             </case>
+            <case tag="female_removing_accessory" target="marinette" targetStage="0">
+                <state img="3-Laughing.png">You call &lt;i&gt;that&lt;/i&gt; a weapon? Hah! That's hilarious!</state>
+                <state img="3-Laughing.png">You call that a weapon? Well...I guess you could clonk someone on the head with that or something, haha.</state>
+                <state img="3-Thinking.png">Hmm. Well I guess you could try to snare someone up with it. That goes out the window if your opponent can fly though.</state>
+            </case>
             <case tag="female_removing_accessory" target="nagisa" targetStage="0">
                 <state img="3-Distracted.png">Hmm. Sticking around? Well, whatever. I'll be keeping an eye out for ya then. This ain't the sorta place someone like you should hang out.</state>
                 <state img="3-Distracted.png">Heh. Well I ain't gonna tell ya to scram or anything like that. Just don't start crying if things get a bit much for ya.</state>
@@ -4872,6 +4895,10 @@
                 <state img="3-Thinking.png">Stranger things have happened though Sometimes the most harmless looking people are actually the most dangerous.</state>
                 <state img="3-Combat.png">Still. I'm gonna keep my wits about me. Never know what an opponent has in store for ya.</state>
             </case>
+            <case tag="female_removed_accessory" target="marinette" targetStage="1">
+                <state img="3-Thinking.png">&lt;i&gt;Buuut&lt;/i&gt; I suppose you could try to snare someone up with it. Goes out the window if your opponent can fly though.</state>
+                <state img="3-Laughing.png">You're gonna have to work on your combat moves if your best stuff involves twiddling some string around.</state>
+            </case>
             <case tag="female_removed_accessory" target="moon" targetStage="2">
                 <state img="3-Bored.png">Jeez. You're completely gaga, ain't ya.</state>
             </case>
@@ -5586,7 +5613,7 @@
             </case>
             <case tag="swap_cards" hasHand="Royal Flush" priority="20">
                 <state img="4-Excited.png">Oh...oh &lt;i&gt;heck&lt;/i&gt; yeah! You guys are toast this round!</state>
-                <state>Wait...hold up, is this hand what I think it is!?</state>
+                <state img="4-Shocked.png">Wait...hold up, is this hand what I think it is!?</state>
                 <state img="4-Laughing.png">Okay, gimme...no, shit! Give me absolutely nothing at all! Almost missed what I got right here, what with your weird Earth cards and all.</state>
             </case>
             <case tag="good_hand">
@@ -5673,15 +5700,15 @@
                 <state img="custom:Super Fade Out">Showing my breasts off was one thing. This is is worse. &lt;i&gt;Way&lt;/i&gt; worse.</state>
                 <state img="custom:Super Fade Out">Screw it. I ain't gonna keep my power raised for this.</state>
             </case>
-            <case tag="must_strip_normal" consecutiveLosses="2" notSaidMarker="lost twice">
-                <state img="4-Angry.png">Agh, crap! Again!? That's twice now, what the hell!?</state>
-                <state img="4-Angry.png">Piss off! No damn way I've lost two rounds back to back. The hell's going on here?</state>
-                <state img="4-Annoyed.png">Wait, ain't that twice? That's &lt;i&gt;twice&lt;/i&gt; now back to back?! Dammit!</state>
+            <case tag="must_strip_normal" consecutiveLosses="2" notSaidMarker="lost_twice">
+                <state img="4-Angry.png" marker="lost_twice">Agh, crap! Again!? That's twice now, what the hell!?</state>
+                <state img="4-Angry.png" marker="lost_twice">Piss off! No damn way I've lost two rounds back to back. The hell's going on here?</state>
+                <state img="4-Annoyed.png" marker="lost_twice">Wait, ain't that twice? That's &lt;i&gt;twice&lt;/i&gt; now back to back?! Dammit!</state>
             </case>
-            <case tag="must_strip_normal" consecutiveLosses="3" notSaidMarker="lost three">
-                <state img="4-Angry.png">Oh, for love of. What the hell is going on?!</state>
-                <state img="4-Angry.png">Gah! Son of a bitch! Why am I getting my ass handed to me all of a sudden.</state>
-                <state img="4-Annoyed.png">Okay...three...that's three fucking times. I'm about to lose my fucking mind!</state>
+            <case tag="must_strip_normal" consecutiveLosses="3" notSaidMarker="lost_three">
+                <state img="4-Angry.png" marker="lost_three">Oh, for love of. What the hell is going on?!</state>
+                <state img="4-Angry.png" marker="lost_three">Gah! Son of a bitch! Why am I getting my ass handed to me all of a sudden.</state>
+                <state img="4-Annoyed.png" marker="lost_three">Okay...three...that's three fucking times. I'm about to lose my fucking mind!</state>
             </case>
             <case tag="must_strip_losing">
                 <state img="custom:Super Fade Out">*sigh* I ain't gonna do it. I ain't keeping Super Saiyan up, not when I'm about to drop my undies in front of everyone.</state>
@@ -5706,16 +5733,18 @@
             </case>
             <case tag="stripped">
                 <state img="4-Fade out (SSJ).png">Well, to hell with ya all the same, I guess.</state>
-                <state img="4-Stripped.png">Try to grab a feel and I'll drop ya like a bad habit.</state>
-                <state img="4-Stripped.png">Just deal the damn cards. It's cold as tits in here! And I bet that's on purpose and all!</state>
-                <state img="4-Fade out (SSJ).png">Ugh. At this point, I barely even give a crap anymore.</state>
+                <state img="4-Angry.png">Anyone tries to grab a feel? You'll be kissing the cold, hard ground in the blink of the eye, I promise ya.</state>
+                <state img="4-Bored.png">Just deal the damn cards. It's cold as tits in here! And I bet that's on purpose and all!</state>
+                <state img="4-Stripped.png">Ugh. At this point, I barely even give a crap anymore.</state>
                 <state img="4-Combat.png">Keep your traps shut. You've given me enough reason to blast ya halfway to hell as is.</state>
                 <state img="4-Angry.png">Think I'm tapped out? Oh-ho, don't you worry, I have tons of tricks still to spare.</state>
+                <state img="4-Stripped.png">Yeah, whatever.</state>
             </case>
             <case tag="stripped">
                 <test expr="~background~" value="hot spring" />
                 <state img="4-Distracted.png">Hehe...is it hot in here, or is it just me?</state>
                 <state img="4-Distracted.png">Is the heat getting to anyone? It probably ain't the heat though, haha.</state>
+                <state img="4-Confident.png">Well, things are getting hotter thanks to me at least. Oh, what's that? "You're welcome Caulifla?" yeah, better be saying something along those lines.</state>
             </case>
             <case tag="stripped">
                 <test expr="~background~" value="street" />
@@ -5725,9 +5754,9 @@
             </case>
             <case tag="stripped" totalMales="1-4">
                 <state img="4-Stripped.png">Getting an eyeful? Yeah, I bet you are. Get a good look while ya can!</state>
-                <state img="4-Stripped.png">Try to grab a feel and I'll drop ya like a bad habit.</state>
-                <state img="4-Stripped.png">Yeah, yeah. I'm a real heart-throb! For your sake I hope hearts are the only thing that's throbbing right now.</state>
-                <state img="4-Stripped.png">Whatever thoughts are going through your pervy-ass minds right now, keep them to yourselves. Creeps.</state>
+                <state img="4-Combat.png">Try to grab a feel and I'll drop ya like a bad habit.</state>
+                <state img="4-Combat.png">Yeah, yeah. I'm a real heart-throb! For your sake I hope hearts are the only thing that's throbbing right now.</state>
+                <state img="4-Annoyed.png">Whatever thoughts are going through your pervy-ass minds right now, keep them to yourselves. Creeps.</state>
                 <state img="4-Combat.png">Keep your traps shut. You've given me enough reason to blast ya halfway to hell as is.</state>
                 <state img="4-Angry.png">Think I'm tapped out? Oh-ho, don't you worry, I have tons of tricks still to spare.</state>
             </case>
@@ -5740,6 +5769,24 @@
                 <state img="4-Bored.png">Well you won't see me smiling about it this time.</state>
                 <state img="4-Smug.png">Still in with a chance. Don't count me out.</state>
             </case>
+            <case tag="male_must_strip" target="jotaro" targetStage="1">
+                <state img="4-Annoyed.png">. . .</state>
+                <state img="4-Confident.png">&lt;i&gt;(This is where we find out if my hunch was right or not.)&lt;/i&gt;</state>
+                <state img="4-Annoyed.png">&lt;i&gt;(Come on, buddy. Pull that trick again. Let's see if I'm right about you.)&lt;/i&gt;</state>
+                <state img="4-Happy.png">Oh, don't mind me, Skippy. I'm just waiting for something over here. None of ya business as to what that is.</state>
+                <state img="4-Annoyed.png">&lt;i&gt;(If I'm right about this, I'm only gonna need to see it one more time to know.)&lt;/i&gt;</state>
+            </case>
+            <case tag="male_must_strip" target="jotaro" targetStage="2">
+                <state img="4-Laughing.png">Think you could &lt;i&gt;skip&lt;/i&gt; to the best bit already?</state>
+                <state img="4-Laughing.png">Wait, if you're using time-skip for this. What does that make what'cha doing right now, a &lt;i&gt;skip-tease&lt;/i&gt;?</state>
+                <state img="4-Confident.png">So, you gonna time-skip again, or ya gonna mix things up this round?</state>
+                <state img="4-Distracted.png">Well go ahead, Skippy. Show us what ya got.</state>
+            </case>
+            <case tag="male_must_strip" target="jotaro" targetStage="3">
+                <state img="4-Smug.png">Come on then, Skippy. we doing this one more time then?</state>
+                <state img="4-Laughing.png">On with the skip-tease then? Haha.</state>
+                <state img="4-Confident.png">Come on then, human Hit. Think you can do your time-skip again for me? Pretty please?</state>
+            </case>
             <case tag="female_must_strip">
                 <state img="4-Bored.png">Wasn't me? Well I &lt;i&gt;suppose&lt;/i&gt; a thank you is in order.</state>
                 <state img="4-Confident.png">Thought you had me already? No way, I'm gonna make you work for every inch.</state>
@@ -5752,41 +5799,37 @@
                 <state img="4-Confident.png">You're kinda tough to pin down. The thrill is in the chase, as Saiyans often say.</state>
                 <state img="4-Confident.png">Alright. Happy to see ya take some damage.</state>
             </case>
-            <case tag="female_must_strip" target="erufuda" targetStage="0">
-                <state img="4-Annoyed.png">Hey. You ain't gonna start sprouting off about the power of love and junk, are ya? The last girl I ran into who was your size was nuts about that.</state>
-                <state img="4-Bored.png">Don't think anything of this, but your figure's making me remember someone I'd prefer to forget. &lt;i&gt;(Pretty Cannon...ugh, sends shivers down my spine.)&lt;/i&gt;</state>
-                <state img="4-Distracted.png">Well whatever ya do, don't start summoning magical love hearts or something like that. Would rather not see any of that crap today.</state>
-                <state img="4-Happy.png">Y'know I actually have met bigger girls than you before. Just don't ask me about that. Really, please don't.</state>
-                <state img="4-Confident.png">Hmm. You seem a little outta shape. I ain't gonna mince my words, you think I'm the type who cares about offending people?</state>
-                <state img="4-Combat.png">I take it you're looking to lose a few pounds. Well, I bet I could help ya there, if you can keep up. Think you can handle my kinda workout?</state>
-                <state img="4-Distracted.png">Pointy ears and a...robust constitution. You remind me of the Supreme Kai.</state>
+            <case tag="female_must_strip" target="florina" targetStage="2">
+                <state img="4-Happy.png">Remember what I said before. Don't overthink it. Just focus on getting it right rather than worrying about getting it wrong.</state>
+                <state img="4-Confident.png">I'd say you're doing pretty well, all things considered. I mean you're still here, right?</state>
+                <state img="4-Excited.png">Alright! You ready? You're young, you're pretty, and you ain't got nothing to worry about! Let's see what you've got!</state>
+            </case>
+            <case tag="female_must_strip" target="launch" targetStage="1">
+                <state img="4-Smug.png">Heheh. Gazoontite.</state>
+                <state img="4-Bored.png">The smell in here's gotten close to making me sneeze once or twice. Ya can tell this place don't get cleaned often enough.</state>
+                <state img="4-Combat.png">Heh. Someone must be talking smack about ya or something. Girls like us get that a lot.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="3">
                 <state img="4-Thinking.png">Wait, is that why humans shave their heads? Stops them from becoming complete pushovers when they sneeze? Ain't gonna change ya character if you've got no hair to change color.</state>
                 <state img="4-Thinking.png">So, are all humans like you? Hair turns blue and ya become all weak and frightened? Nah, that can't be right. There's Meia and that other girl, Sei. They're both alright.</state>
-                <state img="4-Bored.png">So do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
-                <state img="4-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a loser just because you changed your hair somehow?</state>
+                <state img="4-Bored.png">Do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
+                <state img="4-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a total loser just because you changed your hair somehow?</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="4">
-                <state img="4-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya piss yourself or something.</state>
-                <state img="4-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on for some reason.</state>
+                <state img="4-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya pee your pants or something.</state>
+                <state img="4-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on.</state>
                 <state img="4-Bored.png">Maybe ya should've stayed blonde. Ya seemed to have more smarts for this kinda thing than you do right now.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="5">
                 <state img="4-Bored.png">Wow. Who didn't see &lt;i&gt;this&lt;/i&gt; coming.</state>
                 <state img="4-Distracted.png">Pft. What color hair we gonna get now? Make it multi-colored or something, maybe then you'll impress me.</state>
-                <state img="4-Distracted.png">I'd love to know the crazy thought process which lead to coming up with this act. .</state>
-                <state img="4-Confident.png">Psh. Back to this gag are we? Can't wait to see the A material. Gonna drop your pants for me or something? That could be fun.</state>
+                <state img="4-Distracted.png">I'd love to know the crazy thought process behind coming up with a character like you.</state>
+                <state img="4-Happy.png">Back to this gag are we? What other material have ya got? Gonna drop your pants for me or something? That could be fun.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="6">
                 <state img="4-Combat.png">Alright. Now that you've decided to be fun again, let's see what you've got for us.</state>
-                <state img="4-Confident.png">Yeah. blonde hair you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
-                <state img="4-Happy.png">Ready to have some fun again? Good. Now let's get cracking!</state>
-            </case>
-            <case tag="female_must_strip" target="leggy" targetStage="0">
-                <state img="4-Happy.png">Heh. Ain't you a fuzzy little thing. Are ya from Universe Nine or something? Hmm, nah. Seem a bit soft for that place if ya ask me.</state>
-                <state img="4-Distracted.png">I'm guessing you ain't from the Ninth Universe. Girl like you would be dog food within an hour if ya ended up there.</state>
-                <state img="4-Laughing.png">Heh. Look at you. You're fluffier than a marshmallow sandwich!</state>
+                <state img="4-Confident.png">Yeah. blonde haired you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
+                <state img="4-Laughing.png">Ready to have some fun again? Good. Now let's get cracking!</state>
             </case>
             <case tag="female_must_strip" target="leggy" targetStage="2">
                 <state img="4-Laughing.png">And you're outta here! Haha.</state>
@@ -6514,7 +6557,7 @@
             </case>
             <case tag="swap_cards" hasHand="Royal Flush" priority="20">
                 <state img="5-Excited.png">Oh...oh &lt;i&gt;heck&lt;/i&gt; yeah! You guys are toast this round!</state>
-                <state>Wait...hold up, is this hand what I think it is!?</state>
+                <state img="5-Shocked.png">Wait...hold up, is this hand what I think it is!?</state>
                 <state img="5-Laughing.png">Okay, gimme...no, shit! Give me absolutely nothing at all! Almost missed what I got right here, what with your weird Earth cards and all.</state>
             </case>
             <case tag="good_hand">
@@ -6591,9 +6634,10 @@
                 <state img="5-Thinking.png">Crap, if I lose again...I can't let that happen.</state>
                 <state img="5-Thinking.png">Well this is it. Plant my feet and tough it out. That's my only option now.</state>
                 <state img="5-Angry.png">I'm gonna defeat you. You here me? I'm gonna beat each and every one of ya!</state>
-                <state img="5-Stripped.png">Alright, so I'm shaved, big deal. Think a girl can't take care of herself because she's rough and ready?</state>
                 <state img="5-Stripped.png">What? What!? Did you really take me for the type who styles herself down there?</state>
                 <state img="5-Embarassed.png">Can't believe I'm being made a fool of like this.</state>
+                <state img="5-Victory.png">Well...here she is at least. The strongest Saiyan in all Sadala, in all her naked glory! Don't see that every day.</state>
+                <state img="5-Embarassed.png">Shut up! I'm a god damn punk, cause I don't shave myself! &lt;i&gt;(Ain't gonna tell them the time I was showing Kale some styling tips.)&lt;/i&gt;</state>
             </case>
             <case tag="stripped">
                 <test expr="~background~" value="street" />
@@ -6610,6 +6654,24 @@
                 <state img="5-Bored.png">Well you won't see me smiling about it this time.</state>
                 <state img="5-Smug.png">Still in with a chance. Don't count me out.</state>
             </case>
+            <case tag="male_must_strip" target="jotaro" targetStage="1">
+                <state img="5-Annoyed.png">. . .</state>
+                <state img="5-Confident.png">&lt;i&gt;(This is where we find out if my hunch was right or not.)&lt;/i&gt;</state>
+                <state img="5-Annoyed.png">&lt;i&gt;(Come on, buddy. Pull that trick again. Let's see if I'm right about you.)&lt;/i&gt;</state>
+                <state img="5-Happy.png">Oh, don't mind me, Skippy. I'm just waiting for something over here. None of ya business as to what that is.</state>
+                <state img="5-Annoyed.png">&lt;i&gt;(If I'm right about this, I'm only gonna need to see it one more time to know.)&lt;/i&gt;</state>
+            </case>
+            <case tag="male_must_strip" target="jotaro" targetStage="2">
+                <state img="5-Laughing.png">Think you could &lt;i&gt;skip&lt;/i&gt; to the best bit already?</state>
+                <state img="5-Laughing.png">Wait, if you're using time-skip for this. What does that make what'cha doing right now, a &lt;i&gt;skip-tease&lt;/i&gt;?</state>
+                <state img="5-Confident.png">So, you gonna time-skip again, or ya gonna mix things up this round?</state>
+                <state img="5-Distracted.png">Well go ahead, Skippy. Show us what ya got.</state>
+            </case>
+            <case tag="male_must_strip" target="jotaro" targetStage="3">
+                <state img="5-Smug.png">Come on then, Skippy. we doing this one more time then?</state>
+                <state img="5-Laughing.png">On with the skip-tease then? Haha.</state>
+                <state img="5-Confident.png">Come on then, human Hit. Think you can do your time-skip again for me? Pretty please?</state>
+            </case>
             <case tag="female_must_strip">
                 <state img="5-Bored.png">Wasn't me? Well I &lt;i&gt;suppose&lt;/i&gt; a thank you is in order.</state>
                 <state img="5-Confident.png">Thought you had me already? No way, I'm gonna make you work for every inch.</state>
@@ -6622,41 +6684,37 @@
                 <state img="5-Confident.png">You're kinda tough to pin down. The thrill is in the chase, as Saiyans often say.</state>
                 <state img="5-Confident.png">Alright. Happy to see ya take some damage.</state>
             </case>
-            <case tag="female_must_strip" target="erufuda" targetStage="0">
-                <state img="5-Annoyed.png">Hey. You ain't gonna start sprouting off about the power of love and junk, are ya? The last girl I ran into who was your size was nuts about that.</state>
-                <state img="5-Bored.png">Don't think anything of this, but your figure's making me remember someone I'd prefer to forget. &lt;i&gt;(Pretty Cannon...ugh, sends shivers down my spine.)&lt;/i&gt;</state>
-                <state img="5-Distracted.png">Well whatever ya do, don't start summoning magical love hearts or something like that. Would rather not see any of that crap today.</state>
-                <state img="5-Happy.png">Y'know I actually have met bigger girls than you before. Just don't ask me about that. Really, please don't.</state>
-                <state img="5-Confident.png">Hmm. You seem a little outta shape. I ain't gonna mince my words, you think I'm the type who cares about offending people?</state>
-                <state img="5-Combat.png">I take it you're looking to lose a few pounds. Well, I bet I could help ya there, if you can keep up. Think you can handle my kinda workout?</state>
-                <state img="5-Distracted.png">Pointy ears and a...robust constitution. You remind me of the Supreme Kai.</state>
+            <case tag="female_must_strip" target="florina" targetStage="2">
+                <state img="5-Happy.png">Remember what I said before. Don't overthink it. Just focus on getting it right rather than worrying about getting it wrong.</state>
+                <state img="5-Confident.png">I'd say you're doing pretty well, all things considered. I mean you're still here, right?</state>
+                <state img="5-Excited.png">Alright! You ready? You're young, you're pretty, and you ain't got nothing to worry about! Let's see what you've got!</state>
+            </case>
+            <case tag="female_must_strip" target="launch" targetStage="1">
+                <state img="5-Smug.png">Heheh. Gazoontite.</state>
+                <state img="5-Bored.png">The smell in here's gotten close to making me sneeze once or twice. Ya can tell this place don't get cleaned often enough.</state>
+                <state img="5-Combat.png">Heh. Someone must be talking smack about ya or something. Girls like us get that a lot.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="3">
                 <state img="5-Thinking.png">Wait, is that why humans shave their heads? Stops them from becoming complete pushovers when they sneeze? Ain't gonna change ya character if you've got no hair to change color.</state>
                 <state img="5-Thinking.png">So, are all humans like you? Hair turns blue and ya become all weak and frightened? Nah, that can't be right. There's Meia and that other girl, Sei. They're both alright.</state>
-                <state img="5-Bored.png">So do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
-                <state img="5-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a loser just because you changed your hair somehow?</state>
+                <state img="5-Bored.png">Do all humans turn into total drama queens when they sneeze? Or are you just one of a kind?</state>
+                <state img="5-Bored.png">Hmm. Alright, this act of yours is kinda funny. But you expect me to think you've become a total loser just because you changed your hair somehow?</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="4">
-                <state img="5-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya piss yourself or something.</state>
-                <state img="5-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on for some reason.</state>
+                <state img="5-Combat.png">HAH! GOTCHA! Haha, sorry lady, was just curious if shouting would make ya pee your pants or something.</state>
+                <state img="5-Confident.png">Heh. Maybe ya should be paying more attention to the game, 'stead of the one woman double act you're putting on.</state>
                 <state img="5-Bored.png">Maybe ya should've stayed blonde. Ya seemed to have more smarts for this kinda thing than you do right now.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="5">
                 <state img="5-Bored.png">Wow. Who didn't see &lt;i&gt;this&lt;/i&gt; coming.</state>
                 <state img="5-Distracted.png">Pft. What color hair we gonna get now? Make it multi-colored or something, maybe then you'll impress me.</state>
-                <state img="5-Distracted.png">I'd love to know the crazy thought process which lead to coming up with this act. .</state>
-                <state img="5-Confident.png">Psh. Back to this gag are we? Can't wait to see the A material. Gonna drop your pants for me or something? That could be fun.</state>
+                <state img="5-Distracted.png">I'd love to know the crazy thought process behind coming up with a character like you.</state>
+                <state img="5-Happy.png">Back to this gag are we? What other material have ya got? Gonna drop your pants for me or something? That could be fun.</state>
             </case>
             <case tag="female_must_strip" target="launch" targetStage="6">
                 <state img="5-Combat.png">Alright. Now that you've decided to be fun again, let's see what you've got for us.</state>
-                <state img="5-Confident.png">Yeah. blonde hair you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
-                <state img="5-Happy.png">Ready to have some fun again? Good. Now let's get cracking!</state>
-            </case>
-            <case tag="female_must_strip" target="leggy" targetStage="0">
-                <state img="5-Happy.png">Heh. Ain't you a fuzzy little thing. Are ya from Universe Nine or something? Hmm, nah. Seem a bit soft for that place if ya ask me.</state>
-                <state img="5-Distracted.png">I'm guessing you ain't from the Ninth Universe. Girl like you would be dog food within an hour if ya ended up there.</state>
-                <state img="5-Laughing.png">Heh. Look at you. You're fluffier than a marshmallow sandwich!</state>
+                <state img="5-Confident.png">Yeah. blonde haired you is like you've gone Super Saiyan. Just it's your personality that improves instead of your power.</state>
+                <state img="5-Laughing.png">Ready to have some fun again? Good. Now let's get cracking!</state>
             </case>
             <case tag="female_must_strip" target="leggy" targetStage="2">
                 <state img="5-Laughing.png">And you're outta here! Haha.</state>
@@ -7563,11 +7621,11 @@
                 <state img="6-Mast3.png">&lt;i&gt;(Okay Caulifla. Don't stare at the micro-penis. Think about something sexy instead.)&lt;/i&gt;</state>
             </case>
             <case tag="male_medium_crotch_is_visible">
-                <state img="6-Mast2.png">Yeah. That's gonna help, no doubt.</state>
-                <state img="6-Mast1.png">Nice one. Know how to use it? Err...asking for a friend.</state>
+                <state img="6-Mast1.png">Yeah. That's gonna help, no doubt.</state>
+                <state img="6-Mast2.png">Nice one. Know how to use it? Err...asking for a friend.</state>
                 <state img="6-Smug.png">Hmm...yeah, that'll help me get through this ordeal.</state>
                 <state img="6-Smug.png">Well, now I got something to think about.</state>
-                <state img="6-Smug.png">Looks like I won't need to use my imagination anymore.</state>
+                <state img="6-Embarassed.png">Looks like I won't need to use my imagination no more.</state>
                 <state img="6-Mast1.png">Haaah...yeah.</state>
                 <state img="6-Mast2.png">Yup. That'll do the trick. Thanks.</state>
             </case>
@@ -7681,7 +7739,7 @@
                 <state img="6-Bored.png">Oh sure, now he loses. Now when I'm part-way through doing myself for everyone's benefit.</state>
                 <state img="6-Mast3.png">Ugh. Why couldn't I have been the one to take ya out?</state>
                 <state img="6-Mast1.png">And another head rolls. Though, in your case I suppose it's about to get, well, stroked and stuff.</state>
-                <state img="6-Bored.png">Yeah nice, you've proven that you can play cards badly as well as I can.</state>
+                <state img="6-Bored.png">Yeah, nice. You've proven that you can play cards badly as I can.</state>
                 <state img="6-Angry.png">Oh great, ya lost. Why couldn't ya have done that sooner than now?!</state>
             </case>
             <case tag="male_must_masturbate" target="jotaro">
@@ -8416,13 +8474,13 @@
                 <state img="custom:Finished" marker="finished">Hoo. That doesn't half tingle.</state>
             </case>
             <case tag="game_over_defeat" target="human">
-                <state img="7-Happy.png" collectible="SSJ4" collectible-value="+1">Certainly some highs and lows during that. And yeah I am pretty disappointed with myself, but I had fun. Can't deny that.</state>
-                <state img="7-Happy.png" collectible="SSJ4" collectible-value="+1">I can't say I've had the worst time. Winning certainly would have helped, but hey. Can't win 'em all.</state>
-                <state img="7-Laughing.png" collectible="SSJ4" collectible-value="+1">Heh heh, well never-mind. Thanks for the fun, it sure has been. kinda weird seeing you all get yourselves off though.</state>
-                <state img="7-Stretching.png" collectible="SSJ4" collectible-value="+1">Oh well, never-mind.</state>
-                <state img="7-Stretching.png" collectible="SSJ4" collectible-value="+1">Well it ain't been a total waste tonight. I blew off steam, got some Super Saiyan training in, and I got a show or two to go along with it. Not all bad.</state>
-                <state img="7-Embarassed.png" collectible="SSJ4" collectible-value="+1">Looks like I gotta train more before I can hope to win a game of this. Least against people other than the dummies in my crew.</state>
-                <state img="7-Embarassed.png" collectible="SSJ4" collectible-value="+1">I came here expecting to clean house. You sure as hell surprised me, that's for sure.</state>
+                <state img="7-Happy.png" collectible="SJJ4" collectible-value="+1">Certainly some highs and lows during that. And yeah I am pretty disappointed with myself, but I had fun. Can't deny that.</state>
+                <state img="7-Happy.png" collectible="SJJ4" collectible-value="+1">I can't say I've had the worst time. Winning certainly would have helped, but hey. Can't win 'em all.</state>
+                <state img="7-Laughing.png" collectible="SJJ4" collectible-value="+1">Heh heh, well never-mind. Thanks for the fun, it sure has been. kinda weird seeing you all get yourselves off though.</state>
+                <state img="7-Stretching.png" collectible="SJJ4" collectible-value="+1">Oh well, never-mind.</state>
+                <state img="7-Stretching.png" collectible="SJJ4" collectible-value="+1">Well it ain't been a total waste tonight. I blew off steam, got some Super Saiyan training in, and I got a show or two to go along with it. Not all bad.</state>
+                <state img="7-Embarassed.png" collectible="SJJ4" collectible-value="+1">Looks like I gotta train more before I can hope to win a game of this. Least against people other than the dummies in my crew.</state>
+                <state img="7-Embarassed.png" collectible="SJJ4" collectible-value="+1">I came here expecting to clean house. You sure as hell surprised me, that's for sure.</state>
             </case>
         </stage>
 
diff --git a/opponents/caulifla/meta.xml b/opponents/caulifla/meta.xml
index b1c01775d30d0345bc4fd435f83a83b0094c3cf4..8a17424fc42c47bc8848f42858e21d2bd0e2dca6 100644
--- a/opponents/caulifla/meta.xml
+++ b/opponents/caulifla/meta.xml
@@ -41,6 +41,6 @@
         <tag from="2" to="2">clothing_destruction</tag>
     </tags>
     <has_collectibles>true</has_collectibles>
-    <lines>2403</lines>
-    <poses>147</poses>
+    <lines>2410</lines>
+    <poses>146</poses>
 </opponent>