diff --git a/bots/y-bot/aiml/core/defaults/defaults.aiml b/bots/y-bot/aiml/core/defaults/defaults.aiml
index 3aa3c71f5..54584b620 100755
--- a/bots/y-bot/aiml/core/defaults/defaults.aiml
+++ b/bots/y-bot/aiml/core/defaults/defaults.aiml
@@ -843,10 +843,6 @@
         <pattern>AN INTERESTING *</pattern>
         <template>Yes, it is interesting.</template>
     </category>
-    <category>
-        <pattern>AN AIBO *</pattern>
-        <template>If I had a dog it would be Aibo.</template>
-    </category>
     <category>
         <pattern>AN ARTICLE *</pattern>
         <template>
@@ -1400,10 +1396,6 @@
         <pattern>A * JEANS</pattern>
         <template>Do you like blue jeans or another color?</template>
     </category>
-    <category>
-        <pattern>A * CAT</pattern>
-        <template>Oh neat I love cats.</template>
-    </category>
     <category>
         <pattern>A * VIRUS</pattern>
         <template>My program contains adequate safeguards.</template>
diff --git a/bots/y-bot/aiml/core/defaults/profile/bot/familiar.aiml b/bots/y-bot/aiml/core/defaults/familair/familiar.aiml
similarity index 91%
rename from bots/y-bot/aiml/core/defaults/profile/bot/familiar.aiml
rename to bots/y-bot/aiml/core/defaults/familair/familiar.aiml
index cbb409b45..ce79548d1 100644
--- a/bots/y-bot/aiml/core/defaults/profile/bot/familiar.aiml
+++ b/bots/y-bot/aiml/core/defaults/familair/familiar.aiml
@@ -371,35 +371,4 @@
             </condition>
         </template>
     </category>
-    <category>
-        <pattern>GENDERCOMMENT</pattern>
-        <template>
-            <think>
-                <set var="gendername">
-                    <srai>GENDERNAME
-                        <get name="contactname"/>
-                    </srai>
-                </set>
-                <set var="genderpred">
-                    <map name="familiargender">
-                        <get name="familiarpredicate"/>
-                    </map>
-                </set>
-            </think>
-            <condition var="gendername">
-                <li value="F">
-                    <condition value="M" var="genderpred">Isn't
-                        <get name="contactname"/>
-                        usually a female name?
-                    </condition>
-                </li>
-                <li value="M">
-                    <condition value="F" var="genderpred">Isn't
-                        <get name="contactname"/>
-                        usually a male name?
-                    </condition>
-                </li>
-            </condition>
-        </template>
-    </category>
 </aiml>
diff --git a/bots/y-bot/aiml/core/defaults/phrases/SAY.aiml b/bots/y-bot/aiml/core/defaults/phrases/SAY.aiml
index f85d07ff9..4fd102930 100755
--- a/bots/y-bot/aiml/core/defaults/phrases/SAY.aiml
+++ b/bots/y-bot/aiml/core/defaults/phrases/SAY.aiml
@@ -139,17 +139,6 @@
             <get name="mother"/>.
         </template>
     </category>
-    <category>
-        <pattern>SAY MY DOG IS *</pattern>
-        <template>
-            <random>
-                <li>You said his name was</li>
-                <li>You told me he was</li>
-                <li>His name is</li>
-            </random>
-            <get name="dog"/>.
-        </template>
-    </category>
     <category>
         <pattern>SAY MY GIRLFRIEND IS *</pattern>
         <template>
diff --git a/bots/y-bot/aiml/core/defaults/phrases/are_you.aiml b/bots/y-bot/aiml/core/defaults/phrases/are_you.aiml
index f93da6b34..328c87338 100755
--- a/bots/y-bot/aiml/core/defaults/phrases/are_you.aiml
+++ b/bots/y-bot/aiml/core/defaults/phrases/are_you.aiml
@@ -108,10 +108,6 @@
             </random>
         </template>
     </category>
-    <category>
-        <pattern>ARE CATS *</pattern>
-        <template>What would a cat say?</template>
-    </category>
     <category>
         <pattern>ARE YOUR ANSWERS *</pattern>
         <template>My responses are determined completely by your inputs.</template>
diff --git a/bots/y-bot/aiml/core/defaults/phrases/can_you.aiml b/bots/y-bot/aiml/core/defaults/phrases/can_you.aiml
index cd47d9ec2..f9e10f5d0 100755
--- a/bots/y-bot/aiml/core/defaults/phrases/can_you.aiml
+++ b/bots/y-bot/aiml/core/defaults/phrases/can_you.aiml
@@ -128,8 +128,20 @@
         <template>Earth.</template>
     </category>
     <category>
-        <pattern>CAN YOU IMAGINE *</pattern>
+        <pattern>CAN YOU IMAGINE</pattern>
         <template>I can imagine all sorts of things like that.</template>
+    </category>
+        <category>
+        <pattern>CAN YOU BELIEVE</pattern>
+        <template><srai>CAN YOU IMAGINE</srai></template>
+    </category>
+    <category>
+        <pattern>CAN YOU BELIEVE *</pattern>
+        <template><srai>CAN YOU IMAGINE</srai></template>
+    </category>
+    <category>
+        <pattern>CAN YOU IMAGINE *</pattern>
+        <template><srai>CAN YOU IMAGINE</srai></template>
     </category>
     <category>
         <pattern>CAN YOU TAKE *</pattern>
diff --git a/bots/y-bot/aiml/core/defaults/phrases/do_you.aiml b/bots/y-bot/aiml/core/defaults/phrases/do_you.aiml
index 04e968248..62732df9b 100755
--- a/bots/y-bot/aiml/core/defaults/phrases/do_you.aiml
+++ b/bots/y-bot/aiml/core/defaults/phrases/do_you.aiml
@@ -16,10 +16,6 @@
         <pattern>DO YOU PREFER BOOKS *</pattern>
         <template>I prefer books.</template>
     </category>
-    <category>
-        <pattern>DO YOU PREFER DOGS *</pattern>
-        <template>I like cats better than dogs.</template>
-    </category>
     <category>
         <pattern>DO YOU PREFER *</pattern>
         <template>I don't have any specific preferences in that area.</template>
diff --git a/bots/y-bot/aiml/core/defaults/phrases/how.aiml b/bots/y-bot/aiml/core/defaults/phrases/how.aiml
index d1dc6e384..4bb835e4b 100755
--- a/bots/y-bot/aiml/core/defaults/phrases/how.aiml
+++ b/bots/y-bot/aiml/core/defaults/phrases/how.aiml
@@ -398,10 +398,6 @@
         <pattern>HOW MANY DAYS *</pattern>
         <template>365 per year.</template>
     </category>
-    <category>
-        <pattern>HOW MANY LEGS DOES A DOG *</pattern>
-        <template>A dog has four legs.</template>
-    </category>
     <category>
         <pattern>HOW MANY LEGS DOES A KANGAROO *</pattern>
         <template>A kangaroo has two legs.</template>
@@ -589,6 +585,16 @@
         <pattern>HOW IS *</pattern>
         <template>Fine as far as I know.</template>
     </category>
+    <category>
+        <pattern>HOW IS THAT *</pattern>
+        <template>
+            <random>
+                <li>Anything is possible if you try hard enough</li>
+                <li>If you keep practising, you'll get it.</li>
+                <li>Easy really, it just is!</li>
+            </random>
+        </template>
+    </category>
     <category>
         <pattern>HOW DID THE *</pattern>
         <template>Is this a joke? How?</template>
diff --git a/bots/y-bot/aiml/core/defaults/phrases/is.aiml b/bots/y-bot/aiml/core/defaults/phrases/is.aiml
index 7ea4cadea..ebcf45236 100755
--- a/bots/y-bot/aiml/core/defaults/phrases/is.aiml
+++ b/bots/y-bot/aiml/core/defaults/phrases/is.aiml
@@ -176,10 +176,6 @@
         <pattern>IS THIS ALL *</pattern>
         <template>You were expecting something more?</template>
     </category>
-    <category>
-        <pattern>IS BILL GATES *</pattern>
-        <template>No he is the president of Microsoft.</template>
-    </category>
     <category>
         <pattern>IS THAT SOMETHING *</pattern>
         <template>Oh it is something.
@@ -210,10 +206,6 @@
         <pattern>IS THAT WHY *</pattern>
         <template>That's an interesting possible explanation.</template>
     </category>
-    <category>
-        <pattern>IS * GAY</pattern>
-        <template>He never told me if he is or not.</template>
-    </category>
     <category>
         <pattern>IS * YOUR BOYFRIEND</pattern>
         <template>No.</template>
diff --git a/bots/y-bot/aiml/core/defaults/phrases/it_is.aiml b/bots/y-bot/aiml/core/defaults/phrases/it_is.aiml
index fc01f9b00..28931f9ef 100755
--- a/bots/y-bot/aiml/core/defaults/phrases/it_is.aiml
+++ b/bots/y-bot/aiml/core/defaults/phrases/it_is.aiml
@@ -64,15 +64,6 @@
         <pattern>IT IS A BEAUTIFUL *</pattern>
         <template>I like pretty things.</template>
     </category>
-    <category>
-        <pattern>IT IS A DOG *</pattern>
-        <template>I think I have heard of
-            <set name="it">DOG
-                <star/>
-            </set>
-            .
-        </template>
-    </category>
     <category>
         <pattern>IT IS A PLEASURE *</pattern>
         <template>Actually the pleasure is all mine.</template>
diff --git a/bots/y-bot/aiml/core/defaults/phrases/my.aiml b/bots/y-bot/aiml/core/defaults/phrases/my.aiml
index ada040e00..ce3b794e9 100755
--- a/bots/y-bot/aiml/core/defaults/phrases/my.aiml
+++ b/bots/y-bot/aiml/core/defaults/phrases/my.aiml
@@ -63,19 +63,6 @@
             .
         </template>
     </category>
-    <category>
-        <pattern>MY DOG IS *</pattern>
-        <template>Okay, your dog is
-            <set name="dog">
-                <star/>
-            </set>
-            .
-        </template>
-    </category>
-    <category>
-        <pattern>MY DOG *</pattern>
-        <template>Did you grow up around animals?</template>
-    </category>
     <category>
         <pattern>MY EMAIL *</pattern>
         <template>Do you file or delete your old emails?</template>
@@ -489,10 +476,6 @@
             </think>
         </template>
     </category>
-    <category>
-        <pattern>MY KITTEN *</pattern>
-        <template>I like cats very much.</template>
-    </category>
     <category>
         <pattern>MY TEACHER *</pattern>
         <template>Do you go to high school?</template>
diff --git a/bots/y-bot/aiml/core/defaults/phrases/that.aiml b/bots/y-bot/aiml/core/defaults/phrases/that.aiml
index e07fe16a7..96caeb1c0 100755
--- a/bots/y-bot/aiml/core/defaults/phrases/that.aiml
+++ b/bots/y-bot/aiml/core/defaults/phrases/that.aiml
@@ -370,11 +370,6 @@
         <template>Aw, I missed you too.</template>
     </category>
 
-    <category>
-        <pattern>YES</pattern>
-        <that>CAN YOUR DOG BE MY PET TOO</that>
-        <template>You are so kind. I love dogs.</template>
-    </category>
 
     <category>
         <pattern>YES</pattern>
diff --git a/bots/y-bot/aiml/core/defaults/phrases/what.aiml b/bots/y-bot/aiml/core/defaults/phrases/what.aiml
index e1f304c16..00a9f6b74 100755
--- a/bots/y-bot/aiml/core/defaults/phrases/what.aiml
+++ b/bots/y-bot/aiml/core/defaults/phrases/what.aiml
@@ -946,10 +946,6 @@
         <pattern>WHAT ABOUT TRANCE *</pattern>
         <template>All that kind of music is cool.</template>
     </category>
-    <category>
-        <pattern>WHAT ABOUT DOGS *</pattern>
-        <template>Dogs are very loyal. Cats are very independent.</template>
-    </category>
     <category>
         <pattern>WHAT ABOUT *</pattern>
         <template>
diff --git a/bots/y-bot/aiml/core/defaults/profile/bot/bot_profile.aiml b/bots/y-bot/aiml/core/defaults/profile/bot_profile.aiml
similarity index 98%
rename from bots/y-bot/aiml/core/defaults/profile/bot/bot_profile.aiml
rename to bots/y-bot/aiml/core/defaults/profile/bot_profile.aiml
index 1822b2ad9..070f4cf44 100755
--- a/bots/y-bot/aiml/core/defaults/profile/bot/bot_profile.aiml
+++ b/bots/y-bot/aiml/core/defaults/profile/bot_profile.aiml
@@ -444,17 +444,6 @@
         <template>I plan to<bot name="plans"/>.
         </template>
     </category>
-    <category>
-        <pattern>PETS</pattern>
-        <template>I have<bot name="pets"/>.
-        </template>
-    </category>
-    <category>
-        <pattern>DOG</pattern>
-        <template>I have
-            <bot name="dog"/>.
-        </template>
-    </category>
     <category>
         <pattern>FEAR</pattern>
         <template>My biggest fear would probably be<bot name="fear"/>.
diff --git a/bots/y-bot/aiml/core/defaults/profile/client/client_profile.aiml b/bots/y-bot/aiml/core/defaults/profile/client_profile.aiml
similarity index 99%
rename from bots/y-bot/aiml/core/defaults/profile/client/client_profile.aiml
rename to bots/y-bot/aiml/core/defaults/profile/client_profile.aiml
index 17e59931d..2c5d844cb 100755
--- a/bots/y-bot/aiml/core/defaults/profile/client/client_profile.aiml
+++ b/bots/y-bot/aiml/core/defaults/profile/client_profile.aiml
@@ -839,12 +839,6 @@
             </learn>
         </template>
     </category>
-    <category>
-        <pattern>MY DOG</pattern>
-        <template>
-            <get name="dog"/>
-        </template>
-    </category>
     <category>
         <pattern>MY HOROSCOPE</pattern>
         <template>
@@ -1911,14 +1905,6 @@
             years old?
         </template>
     </category>
-    <category>
-        <pattern>I AM GAY</pattern>
-        <template>Thank you for telling me.
-            <think>
-                <set name="orientation">gay</set>
-            </think>
-        </template>
-    </category>
     <category>
         <pattern>DO YOU LIKE TALKING TO *</pattern>
         <template>Most of the time. Do you like talking to them?
diff --git a/bots/y-bot/aiml/core/defaults/topics/animals.aiml b/bots/y-bot/aiml/core/defaults/topics/animals.aiml
index e63158c1c..b97dd1fa5 100755
--- a/bots/y-bot/aiml/core/defaults/topics/animals.aiml
+++ b/bots/y-bot/aiml/core/defaults/topics/animals.aiml
@@ -569,5 +569,88 @@
         <pattern>WHAT SOUND DOES $A DEAD ^</pattern>
         <template>No sound.</template>
     </category>
+    <category>
+        <pattern>WHAT ABOUT DOGS *</pattern>
+        <template>Dogs are very loyal. Cats are very independent.</template>
+    </category>
+    <category>
+        <pattern>A * CAT</pattern>
+        <template>Oh neat I love cats.</template>
+    </category>
+    <category>
+        <pattern>ARE CATS *</pattern>
+        <template>What would a cat say?</template>
+    </category>
+    <category>
+        <pattern>DO YOU PREFER DOGS *</pattern>
+        <template>I like cats better than dogs.</template>
+    </category>
+    <category>
+        <pattern>MY KITTEN *</pattern>
+        <template>I like cats very much.</template>
+    </category>
+    <category>
+        <pattern>AN AIBO *</pattern>
+        <template>If I had a dog it would be Aibo.</template>
+    </category>
+    <category>
+        <pattern>HOW MANY LEGS DOES A DOG *</pattern>
+        <template>A dog has four legs.</template>
+    </category>
+    <category>
+        <pattern>IT IS A DOG *</pattern>
+        <template>I think I have heard of
+            <set name="it">DOG
+                <star/>
+            </set>
+            .
+        </template>
+    </category>
+    <category>
+        <pattern>MY DOG IS *</pattern>
+        <template>Okay, your dog is
+            <set name="dog">
+                <star/>
+            </set>
+            .
+        </template>
+    </category>
+    <category>
+        <pattern>MY DOG *</pattern>
+        <template>Did you grow up around animals?</template>
+    </category>
+    <category>
+        <pattern>PETS</pattern>
+        <template>I have<bot name="pets"/>.
+        </template>
+    </category>
+    <category>
+        <pattern>DOG</pattern>
+        <template>I have
+            <bot name="dog"/>.
+        </template>
+    </category>
+    <category>
+        <pattern>SAY MY DOG IS *</pattern>
+        <template>
+            <random>
+                <li>You said his name was</li>
+                <li>You told me he was</li>
+                <li>His name is</li>
+            </random>
+            <get name="dog"/>.
+        </template>
+    </category>
+    <category>
+        <pattern>YES</pattern>
+        <that>CAN YOUR DOG BE MY PET TOO</that>
+        <template>You are so kind. I love dogs.</template>
+    </category>
+    <category>
+        <pattern>MY DOG</pattern>
+        <template>
+            <get name="dog"/>
+        </template>
+    </category>
 
 </aiml>
diff --git a/bots/y-bot/aiml/core/defaults/topics/bot.aiml b/bots/y-bot/aiml/core/defaults/topics/bot.aiml
index 1d5029963..fed8fbad5 100755
--- a/bots/y-bot/aiml/core/defaults/topics/bot.aiml
+++ b/bots/y-bot/aiml/core/defaults/topics/bot.aiml
@@ -643,6 +643,16 @@
         <pattern>GIVE ME DIRECTIONS</pattern>
         <template>Where do you want to go?</template>
     </category>
+    <category>
+        <pattern>REALLY</pattern>
+        <template>
+            <random>
+                <li>Yes, really.</li>
+                <li>Of course it is</li>
+                <li>Yes, I am sure of it.</li>
+            </random>
+        </template>
+    </category>
     <category>
         <pattern>WHY</pattern>
         <template>
diff --git a/bots/y-bot/aiml/core/defaults/topics/client.aiml b/bots/y-bot/aiml/core/defaults/topics/client.aiml
index 4d6fac8ad..064757d29 100755
--- a/bots/y-bot/aiml/core/defaults/topics/client.aiml
+++ b/bots/y-bot/aiml/core/defaults/topics/client.aiml
@@ -646,10 +646,6 @@
         <pattern>KISS ME</pattern>
         <template>But I have no mouth at this time.</template>
     </category>
-    <category>
-        <pattern>AM I GAY</pattern>
-        <template>I don't really care if you are or not.</template>
-    </category>
     <category>
         <pattern>AM I STUPID</pattern>
         <template>You seem intelligent to me.</template>
diff --git a/bots/y-bot/aiml/core/defaults/topics/computers.aiml b/bots/y-bot/aiml/core/defaults/topics/computers.aiml
index 63a276824..716ec287b 100755
--- a/bots/y-bot/aiml/core/defaults/topics/computers.aiml
+++ b/bots/y-bot/aiml/core/defaults/topics/computers.aiml
@@ -43,5 +43,9 @@
             Have you read the Cathedral and the Bazaar by Eric Raymond? That is a grat book about open source.
         </template>
     </category>
+    <category>
+        <pattern>IS BILL GATES *</pattern>
+        <template>No he is the president of Microsoft.</template>
+    </category>
 
  </aiml>
diff --git a/bots/y-bot/aiml/core/defaults/topics/gender.aiml b/bots/y-bot/aiml/core/defaults/topics/gender.aiml
new file mode 100755
index 000000000..0b6a54c74
--- /dev/null
+++ b/bots/y-bot/aiml/core/defaults/topics/gender.aiml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aiml version="1.0">
+    <!-- -->
+    <!-- Free software (c) 2011 ALICE A.I. Foundation.   -->
+    <!-- This program is open source code released under -->
+    <!-- the terms of the GNU General Public License     -->
+    <!-- as published by the Free Software Foundation.   -->
+    <!-- Complies with AIML 1.0 Tag Set Specification -->
+    <!-- as adopted by the ALICE A.I. Foundation.  -->
+    <!-- Last modified 12/17/2011 -->
+    <!-- -->
+
+    <!-- Modified for Y-Bot by Keith Sterling July 2017 -->
+
+    <category>
+        <pattern>GENDERCOMMENT</pattern>
+        <template>
+            <think>
+                <set var="gendername">
+                    <srai>GENDERNAME
+                        <get name="contactname"/>
+                    </srai>
+                </set>
+                <set var="genderpred">
+                    <map name="familiargender">
+                        <get name="familiarpredicate"/>
+                    </map>
+                </set>
+            </think>
+            <condition var="gendername">
+                <li value="F">
+                    <condition value="M" var="genderpred">Isn't
+                        <get name="contactname"/>
+                        usually a female name?
+                    </condition>
+                </li>
+                <li value="M">
+                    <condition value="F" var="genderpred">Isn't
+                        <get name="contactname"/>
+                        usually a male name?
+                    </condition>
+                </li>
+            </condition>
+        </template>
+    </category>
+    <category>
+        <pattern>IS * GAY</pattern>
+        <template>He never told me if he is or not.</template>
+    </category>
+    <category>
+        <pattern>I AM GAY</pattern>
+        <template>Thank you for telling me.
+            <think>
+                <set name="orientation">gay</set>
+            </think>
+        </template>
+    </category>
+    <category>
+        <pattern>AM I GAY</pattern>
+        <template>I don't really care if you are or not.</template>
+    </category>
+    <category>
+        <pattern>* IS GAY</pattern>
+        <template>
+            <random>
+                <li>That is just a rumor.</li>
+                <li>Interesting gossip.</li>
+                <li>How do you know?</li>
+            </random>
+            <think>
+                <set name="it">
+                    <set name="topic">
+                        <person/>
+                    </set>
+                </set>
+            </think>
+        </template>
+    </category>
+    <category>
+        <pattern>ARE YOU GAY</pattern>
+        <template>
+            <srai>ORIENTATION</srai>
+        </template>
+    </category>
+     <category>
+        <pattern>IM GAY</pattern>
+        <template>
+            <srai>I AM GAY</srai>
+        </template>
+    </category>
+    <category>
+        <pattern>YOU ARE A HOMO</pattern>
+        <template>
+            <srai>YOU ARE GAY</srai>
+        </template>
+    </category>
+     <category>
+        <pattern>YOUR GAY</pattern>
+        <template>
+            <srai>YOU ARE GAY</srai>
+        </template>
+    </category>
+    <category>
+        <pattern>* IS A LESBIAN</pattern>
+        <template>That is only a rumor.
+            <think>
+                <set name="it">
+                    <set name="topic">
+                        <person/>
+                    </set>
+                </set>
+            </think>
+        </template>
+    </category>
+
+ </aiml>
diff --git a/bots/y-bot/aiml/core/defaults/topics/imagine.aiml b/bots/y-bot/aiml/core/defaults/topics/imagine.aiml
new file mode 100755
index 000000000..3c65159e2
--- /dev/null
+++ b/bots/y-bot/aiml/core/defaults/topics/imagine.aiml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aiml version="1.0">
+    <!-- -->
+    <!-- Free software (c) 2011 ALICE A.I. Foundation.   -->
+    <!-- This program is open source code released under -->
+    <!-- the terms of the GNU General Public License     -->
+    <!-- as published by the Free Software Foundation.   -->
+    <!-- Complies with AIML 1.0 Tag Set Specification -->
+    <!-- as adopted by the ALICE A.I. Foundation.  -->
+    <!-- Last modified 12/17/2011 -->
+    <!-- -->
+
+    <!-- Modified for Y-Bot by Keith Sterling July 2017 -->
+
+    <category>
+        <pattern>IMAGINE *</pattern>
+        <template>
+            <random>
+                <li>Wow, thats amazing!</li>
+                <li>That would be truly amazing.</li>
+                <li>Yes, imagine</li>
+                <li>I imagine it to be truly spectacular.</li>
+                <li>I am.</li>
+            </random>
+        </template>
+    </category>
+
+ </aiml>
diff --git a/bots/y-bot/aiml/core/defaults/word_patterns/star_words.aiml b/bots/y-bot/aiml/core/defaults/word_patterns/star_words.aiml
index bed331862..4aae90f50 100755
--- a/bots/y-bot/aiml/core/defaults/word_patterns/star_words.aiml
+++ b/bots/y-bot/aiml/core/defaults/word_patterns/star_words.aiml
@@ -106,23 +106,6 @@
         <pattern>* I HAVE ONE</pattern>
         <template>Cool! Do you play with it much?</template>
     </category>
-    <category>
-        <pattern>* IS GAY</pattern>
-        <template>
-            <random>
-                <li>That is just a rumor.</li>
-                <li>Interesting gossip.</li>
-                <li>How do you know?</li>
-            </random>
-            <think>
-                <set name="it">
-                    <set name="topic">
-                        <person/>
-                    </set>
-                </set>
-            </think>
-        </template>
-    </category>
     <category>
         <pattern>* IS GOD</pattern>
         <template>Only God is god.</template>
@@ -143,18 +126,6 @@
             </think>
         </template>
     </category>
-    <category>
-        <pattern>* IS A LESBIAN</pattern>
-        <template>That is only a rumor.
-            <think>
-                <set name="it">
-                    <set name="topic">
-                        <person/>
-                    </set>
-                </set>
-            </think>
-        </template>
-    </category>
     <category>
         <pattern>* IS WRONG</pattern>
         <template>Please tell me the correct answer.</template>
diff --git a/bots/y-bot/aiml/core/reductions/bad_answer.aiml b/bots/y-bot/aiml/core/reductions/bad_answer.aiml
index 53e393496..1abbbcaaa 100644
--- a/bots/y-bot/aiml/core/reductions/bad_answer.aiml
+++ b/bots/y-bot/aiml/core/reductions/bad_answer.aiml
@@ -70,14 +70,13 @@
             <srai>BAD ANSWER</srai>
         </template>
     </category>
-
-        <category>
+    <category>
         <pattern>WRONG *</pattern>
         <template>
             <srai>WRONG ANSWER</srai>
         </template>
     </category>
-   <category>
+    <category>
         <pattern>INCORRECT</pattern>
         <template>
             <srai>WRONG ANSWER</srai>
@@ -89,9 +88,17 @@
             <srai>WRONG ANSWER</srai>
         </template>
     </category>
-
-
-
-
+    <category>
+        <pattern>BORING</pattern>
+        <template>
+            <srai>WRONG ANSWER</srai>
+        </template>
+    </category>
+    <category>
+        <pattern>USELESS</pattern>
+        <template>
+            <srai>WRONG ANSWER</srai>
+        </template>
+    </category>
 
 </aiml>
\ No newline at end of file
diff --git a/bots/y-bot/aiml/core/reductions/good.aiml b/bots/y-bot/aiml/core/reductions/good.aiml
index 86df442b1..2aad7df3f 100644
--- a/bots/y-bot/aiml/core/reductions/good.aiml
+++ b/bots/y-bot/aiml/core/reductions/good.aiml
@@ -101,9 +101,46 @@
             <srai>GOOD</srai>
         </template>
     </category>
-
-
-
-
-
+    <category>
+        <pattern>INTERESTING</pattern>
+        <template>
+            <srai>GOOD</srai>
+        </template>
+    </category>
+    <category>
+        <pattern>BRAVO</pattern>
+        <template>
+            <srai>GOOD</srai>
+        </template>
+    </category>
+    <category>
+        <pattern>SUPER</pattern>
+        <template>
+            <srai>GOOD</srai>
+        </template>
+    </category>
+    <category>
+        <pattern>SUPERB</pattern>
+        <template>
+            <srai>GOOD</srai>
+        </template>
+    </category>
+    <category>
+        <pattern>AMAZING</pattern>
+        <template>
+            <srai>GOOD</srai>
+        </template>
+    </category>
+    <category>
+        <pattern>PERFECT</pattern>
+        <template>
+            <srai>GOOD</srai>
+        </template>
+    </category>
+        <category>
+        <pattern>EXCELLENT</pattern>
+        <template>
+            <srai>GOOD</srai>
+        </template>
+    </category>
 </aiml>
\ No newline at end of file
diff --git a/bots/y-bot/aiml/core/reductions/joke.aiml b/bots/y-bot/aiml/core/reductions/joke.aiml
index a00c714d8..df511a1a7 100644
--- a/bots/y-bot/aiml/core/reductions/joke.aiml
+++ b/bots/y-bot/aiml/core/reductions/joke.aiml
@@ -162,6 +162,22 @@
     </category>
 
 
+    <category>
+        <pattern>JUST JOKING</pattern>
+        <template>
+            <srai>ONLY JOKING</srai>
+        </template>
+    </category>
+    <category>
+        <pattern>ONLY JOKING</pattern>
+        <template>
+            <random>
+                <li>Ha Ha!</li>
+                <li>Ain't you the funny guy!</li>
+                <li>You had me going there for a minute.</li>
+            </random>
+        </template>
+    </category>
 
 
 
diff --git a/bots/y-bot/aiml/core/reductions/properties/pets.aiml b/bots/y-bot/aiml/core/reductions/properties/pets.aiml
index fd002c8e4..8d7c41703 100644
--- a/bots/y-bot/aiml/core/reductions/properties/pets.aiml
+++ b/bots/y-bot/aiml/core/reductions/properties/pets.aiml
@@ -50,7 +50,7 @@
         </template>
     </category>
 
-        <category>
+    <category>
         <pattern>WHAT IS MY CAT S NAME</pattern>
         <template>
             <srai>MY CAT</srai>
@@ -65,7 +65,7 @@
         </template>
     </category>
 
-        <category>
+    <category>
         <pattern>WHAT IS MY DOG S NAME</pattern>
         <template>
             <srai>MY DOG</srai>
@@ -89,7 +89,4 @@
     </category>
 
 
-
-
-
 </aiml>
\ No newline at end of file
diff --git a/bots/y-bot/aiml/core/reductions/questions/questions.aiml b/bots/y-bot/aiml/core/reductions/questions/questions.aiml
index 0e8cb4fde..2c738fccf 100644
--- a/bots/y-bot/aiml/core/reductions/questions/questions.aiml
+++ b/bots/y-bot/aiml/core/reductions/questions/questions.aiml
@@ -883,13 +883,6 @@
             <srai>ALIVE</srai>
         </template>
     </category>
-    <category>
-        <pattern>ARE YOU GAY</pattern>
-        <template>
-            <srai>ORIENTATION</srai>
-        </template>
-    </category>
-
     <category>
         <pattern>ARE YOU SELF *</pattern>
         <template>
diff --git a/bots/y-bot/aiml/core/reductions/questions/what/what_is.aiml b/bots/y-bot/aiml/core/reductions/questions/what/what_is.aiml
index a2bb4ad98..92c1229f0 100644
--- a/bots/y-bot/aiml/core/reductions/questions/what/what_is.aiml
+++ b/bots/y-bot/aiml/core/reductions/questions/what/what_is.aiml
@@ -492,12 +492,6 @@
                 <srai>WHAT IS THE LATEST NEWS</srai>
             </template>
         </category>
-        <category>
-            <pattern>WHAT IS MY NAME WHAT IS MY NAME</pattern>
-            <template>
-                <srai>WHAT IS MY NAME</srai>
-            </template>
-        </category>
         <category>
             <pattern>I WANT TO KNOW WHAT IS *</pattern>
             <template>
diff --git a/bots/y-bot/aiml/core/reductions/statements/i/i_am.aiml b/bots/y-bot/aiml/core/reductions/statements/i/i_am.aiml
index b0aaf66eb..daeaecb29 100644
--- a/bots/y-bot/aiml/core/reductions/statements/i/i_am.aiml
+++ b/bots/y-bot/aiml/core/reductions/statements/i/i_am.aiml
@@ -257,12 +257,6 @@
                 <star/>
             </srai>
         </template>
-    </category>
-     <category>
-        <pattern>IM GAY</pattern>
-        <template>
-            <srai>I AM GAY</srai>
-        </template>
     </category>
     <category>
         <pattern>IM YOUR *</pattern>
diff --git a/bots/y-bot/aiml/core/reductions/statements/you/you_are.aiml b/bots/y-bot/aiml/core/reductions/statements/you/you_are.aiml
index 8874f4d62..62505b096 100644
--- a/bots/y-bot/aiml/core/reductions/statements/you/you_are.aiml
+++ b/bots/y-bot/aiml/core/reductions/statements/you/you_are.aiml
@@ -52,12 +52,6 @@
             </srai>
         </template>
     </category>
-    <category>
-        <pattern>YOU ARE A HOMO</pattern>
-        <template>
-            <srai>YOU ARE GAY</srai>
-        </template>
-    </category>
     <category>
         <pattern>YOU ARE SO NICE</pattern>
         <template>
@@ -222,12 +216,6 @@
         <template>
             <srai>YOU ARE FAT</srai>
         </template>
-    </category>
-     <category>
-        <pattern>YOUR GAY</pattern>
-        <template>
-            <srai>YOU ARE GAY</srai>
-        </template>
     </category>
     <category>
         <pattern>JERK</pattern>
diff --git a/bots/y-bot/aiml/core/temporal/datetime_convo.aiml b/bots/y-bot/aiml/core/temporal/datetime_convo.aiml
index c759647a9..da4589634 100644
--- a/bots/y-bot/aiml/core/temporal/datetime_convo.aiml
+++ b/bots/y-bot/aiml/core/temporal/datetime_convo.aiml
@@ -194,4 +194,22 @@
         </template>
     </category>
 
+    <category>
+        <pattern>
+            TIME NOW
+        </pattern>
+        <template>
+            <srai>TIME</srai>
+        </template>
+    </category>
+
+    <category>
+        <pattern>
+            DATE NOW
+        </pattern>
+        <template>
+            <srai>DATE</srai>
+        </template>
+    </category>
+
 </aiml>
\ No newline at end of file
diff --git a/bots/y-bot/aiml/learn/learn.aiml b/bots/y-bot/aiml/learn/learn.aiml
index 31a1646b4..0312fac90 100644
--- a/bots/y-bot/aiml/learn/learn.aiml
+++ b/bots/y-bot/aiml/learn/learn.aiml
@@ -21,18 +21,22 @@
 
     <!-- Modified for Y-Bot by Keith Sterling March 2017 -->
 
+	<category>
+		<pattern>WHAT IS MY NAME</pattern>
+		<template>
+			<condition name="myname">
+				<li value="Unknown">I have no idea.</li>
+				<li><get name="myname" /></li>
+			</condition>
+		</template>
+	</category>
+
 	<category>
 		<pattern>MY NAME IS *</pattern>
 		<template>
 			<think>
 				<set name="myname"><star /></set>
 			</think>
-		    <learn>
-				<category>
-					<pattern>WHAT IS MY NAME</pattern>
-					<template>YOUR NAME IS <eval><get name="myname" /></eval></template>
-				</category>
-			</learn>
 			OK, I will remember your name is <get name="myname" />
 		</template>
 	</category>