diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 1b78bb6c4aaec071f813157e51fbcd0109959332..414aad2185874b417c36dfc2ed09e6030beb615e 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,7 +2,12 @@
 
 0.10.7.1-1.0.x
 
-11/24/2018
+11/25/2018
+
+	2
+	-fixes
+	-more names and stuff (I think)
+	-citizen enslavements now respect subjugationist laws
 
 	1
 	-fixes
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 052784a3132cf48aefe9be13af1c39d6f0f1c01b..328ae0731963ad0a3a865d44b36dd59835658399 100644
--- a/devNotes/twine JS.txt	
+++ b/devNotes/twine JS.txt	
@@ -10153,12 +10153,36 @@ window.generateGenetics = (function() {
 			activeMother = V.PC;
 			mother = V.PC;
 		}
-		father = (actor2 > 0) ? V.genePool.find(function(s) { return s.ID == actor2; })
-			: (actor2 == -1) ? V.PC
-			: 0;
-		activeFather = (father !== 0 && father.ID > 0) ? V.slaves[V.slaveIndices[actor2]]
-			: (father !== 0 && father.ID == -1) ? V.PC
-			: 0;
+		if (actor2 > 0) {
+			father = V.genePool.find(function(s) { return s.ID == actor2.ID; });
+			activeFather = V.slaves[V.slaveIndices[actor2]];
+			if (father === undefined) {
+				father = V.slaves[V.slaveIndices[actor2]];
+				activeFather = V.slaves[V.slaveIndices[actor2]];
+			}
+			if (father === undefined) {
+				if (V.incubator > 0) {
+					father = V.tanks.find(function(s) { return s.ID == actor2.ID; });
+					activeFather = 0; // activeFather = father?
+				}
+			}
+			if (father === undefined) {
+				if (V.nursery > 0) {
+					father = V.cribs.find(function(s) { return s.ID == actor2.ID; });
+					activeFather = 0; // activeFather = father?
+				}
+			}
+			if (father === undefined) {
+				father = 0;
+				activeFather = 0;
+			}
+		} else if (actor2 == -1) {
+			father = V.PC;
+			activeFather = V.PC;
+		} else {
+			father = 0;
+			activeFather = 0;
+		}
 
 		genes.gender = setGender(father);
 		genes.name = setName(x);