diff --git a/About/About.xml b/About/About.xml
index ebc2259..d445da6 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -27,6 +27,5 @@
 		<li>brrainz.harmony</li>
 		<li>ludeon.rimworld.biotech</li>
 		<li>rim.job.world</li>
-		<li>ASMR.RJW.RaceSupport</li>
 	</loadAfter>
 </ModMetaData>
\ No newline at end of file
diff --git a/Assemblies/RJW_BGS.dll b/Assemblies/RJW_BGS.dll
index 067896a..4e04c9b 100644
Binary files a/Assemblies/RJW_BGS.dll and b/Assemblies/RJW_BGS.dll differ
diff --git a/Defs/RaceGeneDefs/RaceGeneDefs.xml b/Defs/RaceGeneDefs/RaceGeneDefs.xml
index e137b8c..a5bcfba 100644
--- a/Defs/RaceGeneDefs/RaceGeneDefs.xml
+++ b/Defs/RaceGeneDefs/RaceGeneDefs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
-	<RJW_BGS.RaceGeneDef Name = "Canine">
+	<RJW_BGS.RaceGeneDef>
 		<defName>Canine</defName> 
 		<raceGroup>Canine_Group</raceGroup>
 		<genes>
@@ -10,20 +10,7 @@
 			<li>0.9</li>
 		</genechances> 
 	</RJW_BGS.RaceGeneDef>
-<!-- You can use parents to have animals get specific genes in addition to the group.	
-	<RJW_BGS.RaceGeneDef ParentName = "Canine">
-		<defName>Warg</defName>
-		<raceNames>
-			<li>Warg</li>
-		</raceNames>
-		<genes>
-			<li>DarkVision</li>
-		</genes>
-		<genechances> 
-			<li>0.9</li>
-		</genechances> 
-	</RJW_BGS.RaceGeneDef>
---> 	
+	
 	<RJW_BGS.RaceGeneDef>
 		<defName>Insect</defName> 
 		<raceGroup>Insect_Group</raceGroup>
diff --git a/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/0eb8971d-5fd5-4e3c-bf07-012e3b83c4ae.vsidx b/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/0eb8971d-5fd5-4e3c-bf07-012e3b83c4ae.vsidx
deleted file mode 100644
index f040402..0000000
Binary files a/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/0eb8971d-5fd5-4e3c-bf07-012e3b83c4ae.vsidx and /dev/null differ
diff --git a/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/11af8697-03f0-496e-9b1f-69cf88ff3392.vsidx b/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/11af8697-03f0-496e-9b1f-69cf88ff3392.vsidx
deleted file mode 100644
index c9635ff..0000000
Binary files a/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/11af8697-03f0-496e-9b1f-69cf88ff3392.vsidx and /dev/null differ
diff --git a/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/675d72eb-b423-43fc-aa52-c64bd84ba82a.vsidx b/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/675d72eb-b423-43fc-aa52-c64bd84ba82a.vsidx
deleted file mode 100644
index 46e09e3..0000000
Binary files a/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/675d72eb-b423-43fc-aa52-c64bd84ba82a.vsidx and /dev/null differ
diff --git a/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/6df2cac7-ead0-46d6-a3ec-96409da0265f.vsidx b/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/6df2cac7-ead0-46d6-a3ec-96409da0265f.vsidx
new file mode 100644
index 0000000..315e6e1
Binary files /dev/null and b/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/6df2cac7-ead0-46d6-a3ec-96409da0265f.vsidx differ
diff --git a/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/b4651e63-d1f2-4e86-b492-ad7feb733d02.vsidx b/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/b4651e63-d1f2-4e86-b492-ad7feb733d02.vsidx
new file mode 100644
index 0000000..a565d78
Binary files /dev/null and b/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/b4651e63-d1f2-4e86-b492-ad7feb733d02.vsidx differ
diff --git a/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/d79ca6e2-29c0-42a6-b23a-36d6799644bd.vsidx b/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/d79ca6e2-29c0-42a6-b23a-36d6799644bd.vsidx
deleted file mode 100644
index c9a69f5..0000000
Binary files a/Source/RJW_BGS/.vs/RJW_BGS/FileContentIndex/d79ca6e2-29c0-42a6-b23a-36d6799644bd.vsidx and /dev/null differ
diff --git a/Source/RJW_BGS/.vs/RJW_BGS/v17/.suo b/Source/RJW_BGS/.vs/RJW_BGS/v17/.suo
index 55eb4a0..16460ae 100644
Binary files a/Source/RJW_BGS/.vs/RJW_BGS/v17/.suo and b/Source/RJW_BGS/.vs/RJW_BGS/v17/.suo differ
diff --git a/Source/RJW_BGS/First.cs b/Source/RJW_BGS/Class1.cs
similarity index 89%
rename from Source/RJW_BGS/First.cs
rename to Source/RJW_BGS/Class1.cs
index b37f611..13fca5d 100644
--- a/Source/RJW_BGS/First.cs
+++ b/Source/RJW_BGS/Class1.cs
@@ -1,30 +1,30 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using rjw;
-using Verse;
-using RimWorld;
-namespace RJW_BGS
-{
-    [StaticConstructorOnStartup]
-    internal static class First
-    {
-        static First()
-        {
-            RJWcopy.Racegroupdictbuilder();
-            //foreach (RaceGroupDef raceGroupDef2  in DefDatabase<RaceGroupDef>.AllDefs)      
-            //{
-                //Log.Message("defName = " + raceGroupDef2.defName);
-            //    if (raceGroupDef2.raceNames != null)
-            //    {
-            //        foreach (string race in raceGroupDef2.raceNames)
-            //        {
-                        //Log.Message(race);
-            //        }
-            //    }
-           //}
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using rjw;
+using Verse;
+using RimWorld;
+namespace RJW_BGS
+{
+    [StaticConstructorOnStartup]
+    internal static class Class1
+    {
+        static Class1()
+        {
+            RJWcopy.Racegroupdictbuilder();
+            //foreach (RaceGroupDef raceGroupDef2  in DefDatabase<RaceGroupDef>.AllDefs)      
+            //{
+                //Log.Message("defName = " + raceGroupDef2.defName);
+            //    if (raceGroupDef2.raceNames != null)
+            //    {
+            //        foreach (string race in raceGroupDef2.raceNames)
+            //        {
+                        //Log.Message(race);
+            //        }
+            //    }
+           //}
+        }
+    }
+}
diff --git a/Source/RJW_BGS/PatchRJWHediffInsect_Egg.cs b/Source/RJW_BGS/PatchRJWHediffInsect_Egg.cs
index d52f62d..44e720c 100644
--- a/Source/RJW_BGS/PatchRJWHediffInsect_Egg.cs
+++ b/Source/RJW_BGS/PatchRJWHediffInsect_Egg.cs
@@ -24,8 +24,7 @@ namespace RJW_BGS
 
             foreach (CodeInstruction instruction in instructions)
             {
-                yield return instruction;
-                if (instruction.opcode == OpCodes.Call && instruction.operand.ToString() == "Void BabyPostBirth(Verse.Pawn, Verse.Pawn, Verse.Pawn)")
+                if(instruction.opcode == OpCodes.Call && instruction.operand.ToString() == "Void BabyPostBirth(Verse.Pawn, Verse.Pawn, Verse.Pawn)")
                 {
                     yield return new CodeInstruction(OpCodes.Ldloc_0, null);
                     yield return new CodeInstruction(OpCodes.Ldfld, implanter);
@@ -34,7 +33,7 @@ namespace RJW_BGS
                     yield return new CodeInstruction(OpCodes.Ldloc_1, null);
                     yield return new CodeInstruction(OpCodes.Call, newgenes);
                 }
-                
+                yield return instruction;
             }
         }
     }
diff --git a/Source/RJW_BGS/RJW_BGS.csproj b/Source/RJW_BGS/RJW_BGS.csproj
index b6aa22a..decd98f 100644
--- a/Source/RJW_BGS/RJW_BGS.csproj
+++ b/Source/RJW_BGS/RJW_BGS.csproj
@@ -57,7 +57,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="First.cs" />
+    <Compile Include="Class1.cs" />
     <Compile Include="Harmony_Init.cs" />
     <Compile Include="InheritanceUtility.cs" />
     <Compile Include="PatchRJWBestialityPregnancyUtility.cs" />
diff --git a/Source/RJW_BGS/RJWcopies.cs b/Source/RJW_BGS/RJWcopies.cs
index 1ee2e93..c09f95a 100644
--- a/Source/RJW_BGS/RJWcopies.cs
+++ b/Source/RJW_BGS/RJWcopies.cs
@@ -34,7 +34,6 @@ namespace RJW_BGS
 			return raceGroupDef != null;
 		}
 
-		//slightly modified code so it also works racegroupdefs
 		public static RaceGroupDef GetRaceGroupDefInternal(PawnKindDef kindDef)
 		{
 			string raceName = kindDef.race.defName;
@@ -72,14 +71,9 @@ namespace RJW_BGS
 
 		public static RaceGeneDef GetRaceGenDefInternal(PawnKindDef kindDef)
         {
-			if (kindDef == null)
-            {
-				return null;
-            }
 			string raceName = kindDef.race.defName;
 			string pawnKindName = kindDef.defName;
-			RaceGroupDef raceGroupDef = GetRaceGroupDef(kindDef);
-			//string raceGroupName = GetRaceGroupDef(kindDef).defName;
+			string raceGroupName = GetRaceGroupDef(kindDef).defName;
 			IEnumerable<RaceGeneDef> allDefs = DefDatabase<RaceGeneDef>.AllDefs;
 			List<RaceGeneDef> list = allDefs.Where(delegate (RaceGeneDef group)
 			{
@@ -91,15 +85,12 @@ namespace RJW_BGS
 				List<string> raceNames = group.raceNames;
 				return raceNames != null && raceNames.Contains(raceName);
 			}).ToList<RaceGeneDef>();
-			List<RaceGeneDef> list3 = new List<RaceGeneDef>();
-			if (raceGroupDef != null)
+			List<RaceGeneDef> list3 = allDefs.Where(delegate (RaceGeneDef group)
 			{
-				list3 = allDefs.Where(delegate (RaceGeneDef group)
-				{
-					String raceGroupDefName = group.raceGroup;
-					return raceGroupDefName != null && raceGroupDefName == raceGroupDef.defName;
-				}).ToList<RaceGeneDef>();
-			}
+				String raceGroupDefName = group.raceGroup;
+				return raceGroupDefName != null && raceGroupDefName == raceGroupName;
+			}).ToList<RaceGeneDef>();
+
 			RaceGeneDef result = null;
 			//First check if there is a matching pawnkinddef then race, then racegroup
 			if (list.Any())
diff --git a/Source/RJW_BGS/obj/Debug/RJW_BGS.csproj.CoreCompileInputs.cache b/Source/RJW_BGS/obj/Debug/RJW_BGS.csproj.CoreCompileInputs.cache
index e68fa6d..e40b314 100644
--- a/Source/RJW_BGS/obj/Debug/RJW_BGS.csproj.CoreCompileInputs.cache
+++ b/Source/RJW_BGS/obj/Debug/RJW_BGS.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0b0a8825bf7e783f74047adfd92c6a9898735e8c
+bbcef32adb57331bca8d9d64ae20e770e4ed1e71
diff --git a/Source/RJW_BGS/obj/Debug/RJW_BGS.dll b/Source/RJW_BGS/obj/Debug/RJW_BGS.dll
index 067896a..4e04c9b 100644
Binary files a/Source/RJW_BGS/obj/Debug/RJW_BGS.dll and b/Source/RJW_BGS/obj/Debug/RJW_BGS.dll differ