diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index ccc48bc..966aff2 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@
 // Change them to the values specific to your project.
 
 [assembly: AssemblyTitle("EdBPrepareCarefully")]
-[assembly: AssemblyDescription("A RimWorld Alpha 17 mod")]
+[assembly: AssemblyDescription("A RimWorld mod")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("EdB Prepare Carefully Mod")]
@@ -17,7 +17,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("0.17.1.7")]
+[assembly: AssemblyVersion("0.18.1")]
 
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.
diff --git a/Resources/About/About.xml b/Resources/About/About.xml
index 06e0840..a3cd9e9 100644
--- a/Resources/About/About.xml
+++ b/Resources/About/About.xml
@@ -3,11 +3,11 @@
 	<name>EdB Prepare Carefully</name>
 	<author>EdB</author>
 	<url></url>
-	<targetVersion>0.17.1557</targetVersion>
+	<targetVersion>0.18.1722</targetVersion>
 	<description>Customize your colonists, choose your gear and prepare carefully for your crash landing!
 
 If you get a set of starting colonists that you like, save them as a preset so that you can start your game the same way next time.
 
-[Version 0.17.1.7]
+[Version 0.18.1]
 	</description>
 </ModMetaData>
\ No newline at end of file
diff --git a/Resources/CHANGELOG.txt b/Resources/CHANGELOG.txt
index a8c814a..a111314 100644
--- a/Resources/CHANGELOG.txt
+++ b/Resources/CHANGELOG.txt
@@ -1,3 +1,10 @@
+ _____________________________________________________________________________
+ 
+   Version 0.18.1
+ _____________________________________________________________________________
+
+ - Added support for Beta 18.
+
  _____________________________________________________________________________
  
    Version 0.17.1.7
diff --git a/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_FamilyByBlood.xml b/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_FamilyByBlood.xml
index ee64792..ac5918f 100644
--- a/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_FamilyByBlood.xml
+++ b/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_FamilyByBlood.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<EdB.PrepareCarefully.CarefullyPawnRelationDefs>
+<Defs>
 
   <EdB.PrepareCarefully.CarefullyPawnRelationDef>
     <defName>Parent</defName>
@@ -81,4 +81,4 @@
     <inverse>Kin</inverse>
   </EdB.PrepareCarefully.CarefullyPawnRelationDef>
 
-</EdB.PrepareCarefully.CarefullyPawnRelationDefs>
\ No newline at end of file
+</Defs>
\ No newline at end of file
diff --git a/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_FamilyByChoice.xml b/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_FamilyByChoice.xml
index b95ec3a..7e0b4dc 100644
--- a/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_FamilyByChoice.xml
+++ b/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_FamilyByChoice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<EdB.PrepareCarefully.CarefullyPawnRelationDefs>
+<Defs>
   
   <EdB.PrepareCarefully.CarefullyPawnRelationDef>
     <defName>Spouse</defName>
@@ -69,4 +69,4 @@
 	</conflicts>
   </EdB.PrepareCarefully.CarefullyPawnRelationDef>
 
-</EdB.PrepareCarefully.CarefullyPawnRelationDefs>
\ No newline at end of file
+</Defs>
\ No newline at end of file
diff --git a/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_Misc.xml b/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_Misc.xml
index 019b410..4a83d2c 100644
--- a/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_Misc.xml
+++ b/Resources/Defs/CarefullyPawnRelationDefs/CarefullyPawnRelations_Misc.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<EdB.PrepareCarefully.CarefullyPawnRelationDefs>
+<Defs>
 
   <EdB.PrepareCarefully.CarefullyPawnRelationDef>
     <defName>Bond</defName>
     <animal>true</animal>
   </EdB.PrepareCarefully.CarefullyPawnRelationDef>
   
-</EdB.PrepareCarefully.CarefullyPawnRelationDefs>
\ No newline at end of file
+</Defs>
\ No newline at end of file
diff --git a/Resources/Defs/Scenarios/ScenParts_Fixed.xml b/Resources/Defs/Scenarios/ScenParts_Fixed.xml
index 2eed010..272d971 100644
--- a/Resources/Defs/Scenarios/ScenParts_Fixed.xml
+++ b/Resources/Defs/Scenarios/ScenParts_Fixed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ThingDefs>
+<Defs>
   <!-- This file is no longer used, but since the workshop doesn't seem to consistently
        delete files on mod updates, we're leaving it here to avoid mod corruption errors.
        We leave a placeholder pawn relation def since that should leave no side-effects.
@@ -7,4 +7,4 @@
   <EdB.PrepareCarefully.CarefullyPawnRelationDef>
     <defName>ScenParts_FixedDummyDefinition</defName>
   </EdB.PrepareCarefully.CarefullyPawnRelationDef>
-</ThingDefs>
\ No newline at end of file
+</Defs>
\ No newline at end of file
diff --git a/Resources/Defs/ThingDefs/EdBPrepareCarefully.xml b/Resources/Defs/ThingDefs/EdBPrepareCarefully.xml
index 69507ab..3aa6ca9 100644
--- a/Resources/Defs/ThingDefs/EdBPrepareCarefully.xml
+++ b/Resources/Defs/ThingDefs/EdBPrepareCarefully.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ThingDefs>
+<Defs>
   <!-- This file is no longer used, but since the workshop doesn't seem to consistently
        delete files on mod updates, we're leaving it here to avoid mod corruption errors.
        We leave a placeholder pawn relation def since that should leave no side-effects.
@@ -7,4 +7,4 @@
   <EdB.PrepareCarefully.CarefullyPawnRelationDef>
     <defName>EdBPrepareCarefullyDummyDefinition</defName>
   </EdB.PrepareCarefully.CarefullyPawnRelationDef>
-</ThingDefs>
\ No newline at end of file
+</Defs>
\ No newline at end of file
diff --git a/Source/AgeInjuryUtility.cs b/Source/AgeInjuryUtility.cs
index 97ac301..2e9ab9c 100644
--- a/Source/AgeInjuryUtility.cs
+++ b/Source/AgeInjuryUtility.cs
@@ -35,7 +35,7 @@ public static void GenerateRandomOldAgeInjuries(Pawn pawn, bool tryNotToKillPawn
                                                      select x;
                 if (source.Any<BodyPartRecord>()) {
                     BodyPartRecord bodyPartRecord = source.RandomElementByWeight((BodyPartRecord x) => x.coverageAbs);
-                    DamageDef dam = RandomOldInjuryDamageType(bodyPartRecord.def.frostbiteVulnerability > 0f && pawn.RaceProps.ToolUser);
+                    DamageDef dam = AgeInjuryUtility.RandomOldInjuryDamageType(bodyPartRecord.def.frostbiteVulnerability > 0f && pawn.RaceProps.ToolUser);
                     HediffDef hediffDefFromDamage = HealthUtility.GetHediffDefFromDamage(dam, pawn, bodyPartRecord);
                     if (bodyPartRecord.def.oldInjuryBaseChance > 0f && hediffDefFromDamage.CompPropsFor(typeof(HediffComp_GetsOld)) != null) {
                         if (Rand.Chance(bodyPartRecord.def.amputateIfGeneratedInjuredChance)) {
@@ -44,7 +44,7 @@ public static void GenerateRandomOldAgeInjuries(Pawn pawn, bool tryNotToKillPawn
                             hediff_MissingPart.TryGetComp<HediffComp_GetsOld>().IsOld = true;
                             pawn.health.AddHediff(hediff_MissingPart, bodyPartRecord, null);
                             if (pawn.RaceProps.Humanlike && (bodyPartRecord.def == BodyPartDefOf.LeftLeg || bodyPartRecord.def == BodyPartDefOf.RightLeg) && Rand.Chance(0.5f)) {
-                                RecipeDefOf.InstallPegLeg.Worker.ApplyOnPawn(pawn, bodyPartRecord, null, AgeInjuryUtility.emptyIngredientsList);
+                                RecipeDefOf.InstallPegLeg.Worker.ApplyOnPawn(pawn, bodyPartRecord, null, AgeInjuryUtility.emptyIngredientsList, null);
                             }
                         }
                         else {
@@ -109,18 +109,17 @@ public static IEnumerable<HediffGiver_Birthday> RandomHediffsToGainOnBirthday(Pa
             return AgeInjuryUtility.RandomHediffsToGainOnBirthday(pawn.def, age);
         }
 
+
         // EdB: Interpretation of bad decompilation
         //[DebuggerHidden]
-        //private static IEnumerable<HediffGiver_Birthday> RandomHediffsToGainOnBirthday(ThingDef raceDef, int age)
-        //{
-        //	AgeInjuryUtility.<RandomHediffsToGainOnBirthday>c__Iterator92 <RandomHediffsToGainOnBirthday>c__Iterator = new AgeInjuryUtility.<RandomHediffsToGainOnBirthday>c__Iterator92();
-        //	<RandomHediffsToGainOnBirthday>c__Iterator.raceDef = raceDef;
-        //	<RandomHediffsToGainOnBirthday>c__Iterator.age = age;
-        //	<RandomHediffsToGainOnBirthday>c__Iterator.<$>raceDef = raceDef;
-        //	<RandomHediffsToGainOnBirthday>c__Iterator.<$>age = age;
-        //	AgeInjuryUtility.<RandomHediffsToGainOnBirthday>c__Iterator92 expr_23 = <RandomHediffsToGainOnBirthday>c__Iterator;
-        //	expr_23.$PC = -2;
-        //	return expr_23;
+        //private static IEnumerable<HediffGiver_Birthday> RandomHediffsToGainOnBirthday(ThingDef raceDef, int age) {
+        //    AgeInjuryUtility.< RandomHediffsToGainOnBirthday > c__Iterator0 < RandomHediffsToGainOnBirthday > c__Iterator = new AgeInjuryUtility.< RandomHediffsToGainOnBirthday > c__Iterator0();
+//
+        //    < RandomHediffsToGainOnBirthday > c__Iterator.raceDef = raceDef;
+        //    < RandomHediffsToGainOnBirthday > c__Iterator.age = age;
+        //    AgeInjuryUtility.< RandomHediffsToGainOnBirthday > c__Iterator0 expr_15 = < RandomHediffsToGainOnBirthday > c__Iterator;
+        //    expr_15.$PC = -2;
+        //    return expr_15;
         //}
 
         private static IEnumerable<HediffGiver_Birthday> RandomHediffsToGainOnBirthday(ThingDef raceDef, int age) {
diff --git a/Source/ColonistLoader.cs b/Source/ColonistLoader.cs
index 6a55257..1a71607 100644
--- a/Source/ColonistLoader.cs
+++ b/Source/ColonistLoader.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using Verse;
+using Verse.Sound;
 
 namespace EdB.PrepareCarefully {
     public class ColonistLoader {
@@ -21,7 +22,7 @@ public static CustomPawn LoadFromFile(PrepareCarefully loadout, string name) {
             }
 
             if ("2".Equals(version)) {
-                Messages.Message("EdB.PC.Dialog.PawnPreset.Error.PreAlpha13NotSupported".Translate(), MessageSound.SeriousAlert);
+                Messages.Message("EdB.PC.Dialog.PawnPreset.Error.PreAlpha13NotSupported".Translate(), MessageTypeDefOf.ThreatBig);
                 return null;
             }
             else if ("3".Equals(version)) {
diff --git a/Source/Controller.cs b/Source/Controller.cs
index e7b3021..3d0e424 100644
--- a/Source/Controller.cs
+++ b/Source/Controller.cs
@@ -112,6 +112,7 @@ public void SavePreset(string name) {
         public void PrepareGame() {
             // Replace the pawns.
             Find.GameInitData.startingPawns = PrepareCarefully.Instance.Colonists;
+            Find.GameInitData.startingPawnCount = PrepareCarefully.Instance.Colonists.Count;
 
             // This needs some explaining.  We need custom scenario parts to handle animal spawning
             // and scattered things.  However, we don't want the scenario that gets saved with a game
diff --git a/Source/CostCalculator.cs b/Source/CostCalculator.cs
index a8cfd9b..2a00871 100644
--- a/Source/CostCalculator.cs
+++ b/Source/CostCalculator.cs
@@ -272,7 +272,7 @@ public double GetBaseThingCost(ThingDef def, ThingDef stuffDef) {
                     return def.BaseMarketValue;
                 }
                 else {
-                    // TODO: Alpha 17
+                    // TODO: Alpha 19
                     // Should look at ThingMaker.MakeThing() to decide which validations we need to do
                     // before calling that method.  That method doesn't do null checks everywher, so we
                     // may need to do those validations ourselves to avoid null pointer exceptions.
diff --git a/Source/DialogManageImplants.cs b/Source/DialogManageImplants.cs
index d9ffb4f..de12e1a 100644
--- a/Source/DialogManageImplants.cs
+++ b/Source/DialogManageImplants.cs
@@ -619,7 +619,7 @@ public override void DoWindowContents(Rect inRect) {
                 if (Widgets.ButtonText(buttonRect, ConfirmButtonLabel.Translate(), true, true, true)) {
                     string validationMessage = ConfirmValidation();
                     if (validationMessage != null) {
-                        Messages.Message(validationMessage.Translate(), MessageSound.RejectInput);
+                        Messages.Message(validationMessage.Translate(), MessageTypeDefOf.RejectInput);
                     }
                     else {
                         this.Confirm();
diff --git a/Source/DialogSelectParentChildPawn.cs b/Source/DialogSelectParentChildPawn.cs
index 6ac81a5..b238df3 100644
--- a/Source/DialogSelectParentChildPawn.cs
+++ b/Source/DialogSelectParentChildPawn.cs
@@ -271,7 +271,7 @@ public override void DoWindowContents(Rect inRect) {
                 if (Widgets.ButtonText(buttonRect, ConfirmButtonLabel.Translate(), true, true, true)) {
                     string validationMessage = ConfirmValidation();
                     if (validationMessage != null) {
-                        Messages.Message(validationMessage.Translate(), MessageSound.RejectInput);
+                        Messages.Message(validationMessage.Translate(), MessageTypeDefOf.RejectInput);
                     }
                     else {
                         this.Confirm();
diff --git a/Source/DialogSelectPawn.cs b/Source/DialogSelectPawn.cs
index ed41a35..75f1202 100644
--- a/Source/DialogSelectPawn.cs
+++ b/Source/DialogSelectPawn.cs
@@ -227,7 +227,7 @@ public override void DoWindowContents(Rect inRect) {
                 if (Widgets.ButtonText(buttonRect, ConfirmButtonLabel.Translate(), true, true, true)) {
                     string validationMessage = ConfirmValidation();
                     if (validationMessage != null) {
-                        Messages.Message(validationMessage.Translate(), MessageSound.RejectInput);
+                        Messages.Message(validationMessage.Translate(), MessageTypeDefOf.RejectInput);
                     }
                     else {
                         this.Confirm();
diff --git a/Source/Dialog_Options.cs b/Source/Dialog_Options.cs
index a1bb657..2e31f06 100644
--- a/Source/Dialog_Options.cs
+++ b/Source/Dialog_Options.cs
@@ -203,7 +203,7 @@ public override void DoWindowContents(Rect inRect) {
             if (Widgets.ButtonText(buttonRect, ConfirmButtonLabel, true, true, true)) {
                 string validationMessage = ConfirmValidation();
                 if (validationMessage != null) {
-                    Messages.Message(validationMessage.Translate(), MessageSound.RejectInput);
+                    Messages.Message(validationMessage.Translate(), MessageTypeDefOf.RejectInput);
                 }
                 else {
                     this.Confirm();
diff --git a/Source/Dialog_SaveColonist.cs b/Source/Dialog_SaveColonist.cs
index c788218..6a648de 100644
--- a/Source/Dialog_SaveColonist.cs
+++ b/Source/Dialog_SaveColonist.cs
@@ -50,7 +50,7 @@ protected override void DoSpecialSaveLoadGUI(Rect inRect) {
             Rect butRect = new Rect(420, top, inRect.width - 400 - 20, 35);
             if (Widgets.ButtonText(butRect, "EdB.PC.Dialog.PawnPreset.Button.Save".Translate(), true, false, true) || flag) {
                 if (Filename.Length == 0) {
-                    Messages.Message("NeedAName".Translate(), MessageSound.RejectInput);
+                    Messages.Message("NeedAName".Translate(), MessageTypeDefOf.RejectInput);
                 }
                 else {
                     if (action != null) {
diff --git a/Source/Dialog_SavePreset.cs b/Source/Dialog_SavePreset.cs
index c71fffa..4c7e4e7 100644
--- a/Source/Dialog_SavePreset.cs
+++ b/Source/Dialog_SavePreset.cs
@@ -51,7 +51,7 @@ protected override void DoSpecialSaveLoadGUI(Rect inRect) {
             Rect butRect = new Rect(420, top, inRect.width - 400 - 20, 35);
             if (Widgets.ButtonText(butRect, "EdB.PC.Dialog.Preset.Button.Save".Translate(), true, false, true) || flag) {
                 if (PrepareCarefully.Instance.Filename.Length == 0) {
-                    Messages.Message("NeedAName".Translate(), MessageSound.RejectInput);
+                    Messages.Message("NeedAName".Translate(), MessageTypeDefOf.RejectInput);
                 }
                 else {
                     if (action != null) {
diff --git a/Source/GenStep_CustomScatterThings.cs b/Source/GenStep_CustomScatterThings.cs
index 3cc5918..73a7e7a 100644
--- a/Source/GenStep_CustomScatterThings.cs
+++ b/Source/GenStep_CustomScatterThings.cs
@@ -5,41 +5,41 @@
 using Verse;
 
 namespace EdB.PrepareCarefully {
+    // TODO: Alpha 19
     // Duplicate of GenStep_ScatterThings with a radius field to allow for a large spawn area.
     public class GenStep_CustomScatterThings : GenStep_Scatterer {
         //
         // Static Fields
         //
-        private const int ClusterRadius = 4;
-
         private static List<Rot4> tmpRotations = new List<Rot4>();
 
-        public int radius = 4;
+        private const int ClusterRadius = 4;
 
+        public int radius = 4;
         //
         // Fields
         //
+        public ThingDef thingDef;
+
         [Unsaved]
-        private int leftInCluster;
+        private int leftInCluster = 0;
 
         [Unsaved]
         private IntVec3 clusterCenter;
 
-        [NoTranslate]
-        private List<string> terrainValidationDisallowed;
-
         private List<Rot4> possibleRotationsInt;
 
+        public float terrainValidationRadius = 0f;
+
         public int clusterSize = 1;
 
         public int clearSpaceSize;
 
         public ThingDef stuff;
 
-        public ThingDef thingDef;
+        [NoTranslate]
+        private List<string> terrainValidationDisallowed;
 
-        public float terrainValidationRadius;
-        
         //
         // Properties
         //
@@ -79,16 +79,10 @@ public static List<int> CountDividedIntoStacks(int count, IntRange stackSizeRang
                         if (list[num2] > list[num3]) {
                             int num4 = (int)((float)(list[num2] - list[num3]) * Rand.Value);
                             List<int> list2;
-                            List<int> expr_9B = list2 = list;
-                            int num5;
-                            int expr_9F = num5 = num2;
-                            num5 = list2[num5];
-                            expr_9B[expr_9F] = num5 - num4;
-                            List<int> list3;
-                            List<int> expr_B8 = list3 = list;
-                            int expr_BD = num5 = num3;
-                            num5 = list3[num5];
-                            expr_B8[expr_BD] = num5 + num4;
+                            int index;
+                            (list2 = list)[index = num2] = list2[index] - num4;
+                            int index2;
+                            (list2 = list)[index2 = num3] = list2[index2] + num4;
                         }
                     }
                 }
@@ -100,56 +94,59 @@ public static List<int> CountDividedIntoStacks(int count, IntRange stackSizeRang
         // Methods
         //
         protected override bool CanScatterAt(IntVec3 loc, Map map) {
+            bool result;
+            Rot4 rot;
             if (!base.CanScatterAt(loc, map)) {
-                return false;
+                result = false;
             }
-            Rot4 rot;
-            if (!this.TryGetRandomValidRotation(loc, map, out rot)) {
-                return false;
+            else if (!this.TryGetRandomValidRotation(loc, map, out rot)) {
+                result = false;
             }
-            if (this.terrainValidationRadius > 0f) {
-                foreach (IntVec3 current in GenRadial.RadialCellsAround(loc, this.terrainValidationRadius, true)) {
-                    if (current.InBounds(map)) {
-                        TerrainDef terrain = current.GetTerrain(map);
-                        for (int i = 0; i < this.terrainValidationDisallowed.Count; i++) {
-                            if (terrain.HasTag(this.terrainValidationDisallowed[i])) {
-                                return false;
+            else {
+                if (this.terrainValidationRadius > 0f) {
+                    foreach (IntVec3 current in GenRadial.RadialCellsAround(loc, this.terrainValidationRadius, true)) {
+                        if (current.InBounds(map)) {
+                            TerrainDef terrain = current.GetTerrain(map);
+                            for (int i = 0; i < this.terrainValidationDisallowed.Count; i++) {
+                                if (terrain.HasTag(this.terrainValidationDisallowed[i])) {
+                                    result = false;
+                                    return result;
+                                }
                             }
                         }
                     }
                 }
-                return true;
+                result = true;
             }
-            return true;
+            return result;
         }
 
         public override void Generate(Map map) {
-            if (!this.allowOnWater && map.TileInfo.WaterCovered) {
-                return;
-            }
-            int count = base.CalculateFinalCount(map);
-            IntRange one;
-            if (this.thingDef.ingestible != null && this.thingDef.ingestible.IsMeal && this.thingDef.stackLimit <= 10) {
-                one = IntRange.one;
-            }
-            else if (this.thingDef.stackLimit > 5) {
-                one = new IntRange(Mathf.RoundToInt((float)this.thingDef.stackLimit * 0.5f), this.thingDef.stackLimit);
-            }
-            else {
-                one = new IntRange(this.thingDef.stackLimit, this.thingDef.stackLimit);
-            }
-            List<int> list = GenStep_ScatterThings.CountDividedIntoStacks(count, one);
-            for (int i = 0; i < list.Count; i++) {
-                IntVec3 intVec;
-                if (!this.TryFindScatterCell(map, out intVec)) {
-                    return;
+            if (this.allowOnWater || !map.TileInfo.WaterCovered) {
+                int count = base.CalculateFinalCount(map);
+                IntRange one;
+                if (this.thingDef.ingestible != null && this.thingDef.ingestible.IsMeal && this.thingDef.stackLimit <= 10) {
+                    one = IntRange.one;
+                }
+                else if (this.thingDef.stackLimit > 5) {
+                    one = new IntRange(Mathf.RoundToInt((float)this.thingDef.stackLimit * 0.5f), this.thingDef.stackLimit);
+                }
+                else {
+                    one = new IntRange(this.thingDef.stackLimit, this.thingDef.stackLimit);
                 }
-                this.ScatterAt(intVec, map, list[i]);
-                this.usedSpots.Add(intVec);
+                List<int> list = GenStep_ScatterThings.CountDividedIntoStacks(count, one);
+                for (int i = 0; i < list.Count; i++) {
+                    IntVec3 intVec;
+                    if (!this.TryFindScatterCell(map, out intVec)) {
+                        return;
+                    }
+                    this.ScatterAt(intVec, map, list[i]);
+                    this.usedSpots.Add(intVec);
+                }
+                this.usedSpots.Clear();
+                this.clusterCenter = IntVec3.Invalid;
+                this.leftInCluster = 0;
             }
-            this.usedSpots.Clear();
-            this.clusterCenter = IntVec3.Invalid;
-            this.leftInCluster = 0;
         }
 
         private bool IsRotationValid(IntVec3 loc, Rot4 rot, Map map) {
@@ -160,35 +157,37 @@ protected override void ScatterAt(IntVec3 loc, Map map, int stackCount = 1) {
             Rot4 rot;
             if (!this.TryGetRandomValidRotation(loc, map, out rot)) {
                 Log.Warning("Could not find any valid rotation for " + this.thingDef);
-                return;
             }
-            if (this.clearSpaceSize > 0) {
-                foreach (IntVec3 current in GridShapeMaker.IrregularLump(loc, map, this.clearSpaceSize)) {
-                    Building edifice = current.GetEdifice(map);
-                    if (edifice != null) {
-                        edifice.Destroy(DestroyMode.Vanish);
+            else {
+                if (this.clearSpaceSize > 0) {
+                    foreach (IntVec3 current in GridShapeMaker.IrregularLump(loc, map, this.clearSpaceSize)) {
+                        Building edifice = current.GetEdifice(map);
+                        if (edifice != null) {
+                            edifice.Destroy(DestroyMode.Vanish);
+                        }
                     }
                 }
-            }
-            Thing thing = ThingMaker.MakeThing(this.thingDef, this.stuff);
-            if (this.thingDef.Minifiable) {
-                thing = thing.MakeMinified();
-            }
-            if (thing.def.category == ThingCategory.Item) {
-                thing.stackCount = stackCount;
-                thing.SetForbidden(true, false);
-                Thing thing2;
-                GenPlace.TryPlaceThing(thing, loc, map, ThingPlaceMode.Near, out thing2, null);
-                if (this.nearPlayerStart && thing2 != null && thing2.def.category == ThingCategory.Item && TutorSystem.TutorialMode) {
-                    Find.TutorialState.AddStartingItem(thing2);
+                Thing thing = ThingMaker.MakeThing(this.thingDef, this.stuff);
+                if (this.thingDef.Minifiable) {
+                    thing = thing.MakeMinified();
+                }
+                if (thing.def.category == ThingCategory.Item) {
+                    thing.stackCount = stackCount;
+                    thing.SetForbidden(true, false);
+                    Thing thing2;
+                    GenPlace.TryPlaceThing(thing, loc, map, ThingPlaceMode.Near, out thing2, null);
+                    if (this.nearPlayerStart && thing2 != null && thing2.def.category == ThingCategory.Item && TutorSystem.TutorialMode) {
+                        Find.TutorialState.AddStartingItem(thing2);
+                    }
+                }
+                else {
+                    GenSpawn.Spawn(thing, loc, map, rot, false);
                 }
-            }
-            else {
-                GenSpawn.Spawn(thing, loc, map, rot, false);
             }
         }
 
         protected override bool TryFindScatterCell(Map map, out IntVec3 result) {
+            bool result2;
             if (this.clusterSize > 1) {
                 if (this.leftInCluster <= 0) {
                     if (!base.TryFindScatterCell(map, out this.clusterCenter)) {
@@ -197,28 +196,44 @@ protected override bool TryFindScatterCell(Map map, out IntVec3 result) {
                     this.leftInCluster = this.clusterSize;
                 }
                 this.leftInCluster--;
+                // EdB: Replaced hard-coded value of 4 with the added radius field.
+                // result = CellFinder.RandomClosewalkCellNear(this.clusterCenter, map, 4, delegate (IntVec3 x) {
                 result = CellFinder.RandomClosewalkCellNear(this.clusterCenter, map, radius, delegate (IntVec3 x) {
                     Rot4 rot;
                     return this.TryGetRandomValidRotation(x, map, out rot);
                 });
-                return result.IsValid;
+                result2 = result.IsValid;
+            }
+            else {
+                result2 = base.TryFindScatterCell(map, out result);
             }
-            return base.TryFindScatterCell(map, out result);
+            return result2;
         }
 
         private bool TryGetRandomValidRotation(IntVec3 loc, Map map, out Rot4 rot) {
             List<Rot4> possibleRotations = this.PossibleRotations;
             for (int i = 0; i < possibleRotations.Count; i++) {
                 if (this.IsRotationValid(loc, possibleRotations[i], map)) {
+                    // EdB: Changed the class name to match.
+                    //GenStep_ScatterThings.tmpRotations.Add(possibleRotations[i]);
                     GenStep_CustomScatterThings.tmpRotations.Add(possibleRotations[i]);
                 }
             }
+            bool result;
+            // EdB: Changed the class name to match.
+            //if (GenStep_ScatterThings.tmpRotations.TryRandomElement(out rot)) {
+            //    GenStep_ScatterThings.tmpRotations.Clear();
+            //    result = true;
+            //}
             if (GenStep_CustomScatterThings.tmpRotations.TryRandomElement(out rot)) {
                 GenStep_CustomScatterThings.tmpRotations.Clear();
-                return true;
+                result = true;
+            }
+            else {
+                rot = Rot4.Invalid;
+                result = false;
             }
-            rot = Rot4.Invalid;
-            return false;
+            return result;
         }
     }
 }
diff --git a/Source/HarmonyPatches.cs b/Source/HarmonyPatches.cs
index a08c3c0..95fa6e8 100644
--- a/Source/HarmonyPatches.cs
+++ b/Source/HarmonyPatches.cs
@@ -33,7 +33,7 @@ public static void PreOpenPostfix() {
         // Draw the "Prepare Carefully" button at the bottom of the Configure Starting Pawns page.
         public static void DoWindowContentsPostfix(Rect rect, Page_ConfigureStartingPawns __instance) {
             Vector2 BottomButSize = new Vector2(150f, 38f);
-            float num = rect.height - 38f;
+            float num = rect.height + 45f;
             Rect rect4 = new Rect(rect.x + rect.width / 2f - BottomButSize.x / 2f, num, BottomButSize.x, BottomButSize.y);
             if (Widgets.ButtonText(rect4, "EdB.PC.Page.Button.PrepareCarefully".Translate(), true, false, true)) {
                 PrepareCarefully.Instance.Initialize();
diff --git a/Source/Page_PrepareCarefully.cs b/Source/Page_PrepareCarefully.cs
index ca62af1..3b0f3b2 100644
--- a/Source/Page_PrepareCarefully.cs
+++ b/Source/Page_PrepareCarefully.cs
@@ -66,7 +66,7 @@ public override void PreOpen() {
         public override void DoWindowContents(Rect inRect) {
             base.DrawPageTitle(inRect);
             Rect mainRect = base.GetMainRect(inRect, 30f, false);
-            Widgets.DrawMenuSection(mainRect, true);
+            Widgets.DrawMenuSection(mainRect);
 
             // This approach to drawing tabs differs a bit from the vanilla approach.  Instead instantiating
             // brand new TabRecord instances every frame, we re-use the same instances and updated their
@@ -85,7 +85,7 @@ public override void DoWindowContents(Rect inRect) {
             // Display any pending messages.
             if (State.Messages.Count() > 0) {
                 foreach (var message in State.Messages) {
-                    Messages.Message(message, MessageSound.Standard);
+                    Messages.Message(message, MessageTypeDefOf.NeutralEvent);
                 }
                 State.ClearMessages();
             }
@@ -93,7 +93,7 @@ public override void DoWindowContents(Rect inRect) {
             // Display any pending errors.
             if (State.Errors.Count() > 0) {
                 foreach (var message in State.Errors) {
-                    Messages.Message(message, MessageSound.RejectInput);
+                    Messages.Message(message, MessageTypeDefOf.RejectInput);
                 }
                 State.ClearErrors();
             }
diff --git a/Source/PanelHealth.cs b/Source/PanelHealth.cs
index 553a139..536f1ac 100644
--- a/Source/PanelHealth.cs
+++ b/Source/PanelHealth.cs
@@ -474,7 +474,7 @@ protected void ResetSeverityOptions(InjuryOption injuryOption) {
                     continue;
                 }
                 // Filter out hidden stages.
-                if (!stage.everVisible) {
+                if (!stage.becomeVisible) {
                     continue;
                 }
                 InjurySeverity value = null;
diff --git a/Source/PanelSkills.cs b/Source/PanelSkills.cs
index 303bdee..e3dabfb 100644
--- a/Source/PanelSkills.cs
+++ b/Source/PanelSkills.cs
@@ -126,7 +126,7 @@ protected override void DrawPanelContent(State state) {
                     GUI.color = Style.ColorText;
                     rect = RectLabel;
                     rect.y = rect.y + cursor;
-                    Widgets.Label(rect, def.skillLabel);
+                    Widgets.Label(rect, def.skillLabel.CapitalizeFirst());
 
                     // Draw the passion.
                     rect = RectPassion;
diff --git a/Source/PawnGenerationRequestWrapper.cs b/Source/PawnGenerationRequestWrapper.cs
index 5a0a248..c914e23 100644
--- a/Source/PawnGenerationRequestWrapper.cs
+++ b/Source/PawnGenerationRequestWrapper.cs
@@ -19,9 +19,9 @@ public PawnGenerationRequestWrapper() {
         }
         private PawnGenerationRequest CreateRequest() {
             return new PawnGenerationRequest(
-                kindDef, //PawnKindDef kind,
-                faction, //Faction faction = null,
-                context, //PawnGenerationContext context = PawnGenerationContext.NonPlayer,
+                kindDef, // PawnKindDef kind
+                faction, // Faction faction = null
+                context, // PawnGenerationContext context = PawnGenerationContext.NonPlayer
                 -1, //int tile = -1,
                 true, //bool forceGenerateNewPawn = false,
                 false, //bool newborn = false,
@@ -33,14 +33,17 @@ private PawnGenerationRequest CreateRequest() {
                 false, //bool forceAddFreeWarmLayerIfNeeded = false,
                 true, //bool allowGay = true,
                 false, //bool allowFood = true,
-                false, //bool inhabitant = false,
-                false, //bool certainlyBeenInCryptosleep = false,
-                null, //Predicate<Pawn> validator = null,
-                fixedBiologicalAge, //float? fixedBiologicalAge = default(float?),
-                null, //float? fixedChronologicalAge = default(float?),
-                fixedGender, //Gender? fixedGender = default(Gender?),
-                null, //float? fixedMelanin = default(float?),
-                null //string fixedLastName = null
+                false, // bool inhabitant = false
+                false, // bool certainlyBeenInCryptosleep = false
+                false, // bool forceRedressWorldPawnIfFormerColonist = false
+                false, // bool worldPawnFactionDoesntMatter = false
+                null, // Predicate < Pawn > validator = null
+                null, // float ? minChanceToRedressWorldPawn = null
+                fixedBiologicalAge, // float ? fixedBiologicalAge = null
+                null, // float ? fixedChronologicalAge = null
+                fixedGender, // Gender ? fixedGender = null
+                null, // float ? fixedMelanin = null
+                null // string fixedLastName = null
             );
         }
         public PawnGenerationRequest Request {
diff --git a/Source/PrepareCarefully.cs b/Source/PrepareCarefully.cs
index 2ca20bd..b6b4b09 100644
--- a/Source/PrepareCarefully.cs
+++ b/Source/PrepareCarefully.cs
@@ -157,7 +157,7 @@ protected void InitializeProviders() {
             Providers.Factions = new ProviderFactions();
         }
 
-        // TODO: Alpha 14
+        // TODO: Alpha 18
         // Think about whether or not this is the best approach.  Might need to do a bug report for the vanilla game?
         // The tribal scenario adds a weapon with an invalid thing/stuff combination (jade knife).  The 
         // knife ThingDef should allow the jade material, but it does not.  We need this workaround to
@@ -528,11 +528,16 @@ public CostDetails Cost {
         public void InitializePawns() {
             this.customPawnToOriginalPawnMap.Clear();
             this.originalPawnToCustomPawnMap.Clear();
+            int pawnCount = Verse.Find.GameInitData.startingPawnCount;
             foreach (Pawn originalPawn in Verse.Find.GameInitData.startingPawns) {
                 Pawn copiedPawn = originalPawn.Copy();
                 CustomPawn customPawn = new CustomPawn(copiedPawn);
                 customPawnToOriginalPawnMap.Add(customPawn, originalPawn);
                 originalPawnToCustomPawnMap.Add(originalPawn, customPawn);
+            }
+            for (int i = 0; i < pawnCount; i++) {
+                Pawn originalPawn = Verse.Find.GameInitData.startingPawns[i];
+                CustomPawn customPawn = originalPawnToCustomPawnMap[originalPawn];
                 this.pawns.Add(customPawn);
             }
         }
diff --git a/Source/PresetLoader.cs b/Source/PresetLoader.cs
index 77e5711..d4bd907 100644
--- a/Source/PresetLoader.cs
+++ b/Source/PresetLoader.cs
@@ -22,11 +22,11 @@ public static bool LoadFromFile(PrepareCarefully loadout, string presetName) {
             }
 
             if ("1".Equals(version)) {
-                Messages.Message("EdB.PC.Dialog.Preset.Error.PreAlpha13NotSupported".Translate(), MessageSound.SeriousAlert);
+                Messages.Message("EdB.PC.Dialog.Preset.Error.PreAlpha13NotSupported".Translate(), MessageTypeDefOf.ThreatBig);
                 return false;
             }
             else if ("2".Equals(version)) {
-                Messages.Message("EdB.PC.Dialog.Preset.Error.PreAlpha13NotSupported".Translate(), MessageSound.SeriousAlert);
+                Messages.Message("EdB.PC.Dialog.Preset.Error.PreAlpha13NotSupported".Translate(), MessageTypeDefOf.ThreatBig);
                 return false;
             }
             else if ("3".Equals(version)) {
diff --git a/Source/RelationshipManager.cs b/Source/RelationshipManager.cs
index 7275827..ac9a62b 100644
--- a/Source/RelationshipManager.cs
+++ b/Source/RelationshipManager.cs
@@ -10,8 +10,6 @@ public class RelationshipManager {
         protected Randomizer randomizer = new Randomizer();
         protected List<PawnRelationDef> allowedRelationships = new List<PawnRelationDef>();
         protected Dictionary<PawnRelationDef, PawnRelationDef> inverseRelationships = new Dictionary<PawnRelationDef, PawnRelationDef>();
-        //protected Dictionary<CustomPawn, Pawn> facadeToSimulatedPawnMap = new Dictionary<CustomPawn, Pawn>();
-        //protected Dictionary<Pawn, CustomPawn> simulatedPawnToFacadeMap = new Dictionary<Pawn, CustomPawn>();
         protected List<CustomRelationship> deletionList = new List<CustomRelationship>();
         protected List<CustomParentChildPawn> parentChildPawns = new List<CustomParentChildPawn>();
         protected Dictionary<Pawn, CustomParentChildPawn> parentChildPawnLookup = new Dictionary<Pawn, CustomParentChildPawn>();
@@ -21,7 +19,6 @@ public class RelationshipManager {
         protected int HiddenParentChildIndex = 1;
 
         protected RelationshipList relationships = new RelationshipList();
-        //protected RelationshipList derivedRelationships = new RelationshipList();
 
         public RelationshipManager(List<Pawn> originalPawns, List<CustomPawn> correspondingFacades) {
             PopulateAllowedRelationships();
diff --git a/Source/Version3/ColonistLoaderVersion3.cs b/Source/Version3/ColonistLoaderVersion3.cs
index 6ae711f..b9ae735 100644
--- a/Source/Version3/ColonistLoaderVersion3.cs
+++ b/Source/Version3/ColonistLoaderVersion3.cs
@@ -21,8 +21,8 @@ public CustomPawn Load(PrepareCarefully loadout, string name) {
                     Scribe_Deep.Look<SaveRecordPawnV3>(ref pawnRecord, "colonist", null);
                 }
                 catch (Exception e) {
-                    Messages.Message(modString, MessageSound.Silent);
-                    Messages.Message("EdB.PC.Dialog.PawnPreset.Error.Failed".Translate(), MessageSound.RejectInput);
+                    Messages.Message(modString, MessageTypeDefOf.SilentInput);
+                    Messages.Message("EdB.PC.Dialog.PawnPreset.Error.Failed".Translate(), MessageTypeDefOf.RejectInput);
                     Log.Warning(e.ToString());
                     Log.Warning("Colonist was created with the following mods: " + modString);
                     return null;
@@ -43,8 +43,8 @@ public CustomPawn Load(PrepareCarefully loadout, string name) {
             }
 
             if (pawnRecord == null) {
-                Messages.Message(modString, MessageSound.Silent);
-                Messages.Message("EdB.PC.Dialog.PawnPreset.Error.Failed".Translate(), MessageSound.RejectInput);
+                Messages.Message(modString, MessageTypeDefOf.SilentInput);
+                Messages.Message("EdB.PC.Dialog.PawnPreset.Error.Failed".Translate(), MessageTypeDefOf.RejectInput);
                 Log.Warning("Colonist was created with the following mods: " + modString);
                 return null;
             }
diff --git a/Source/Version3/PresetLoaderVersion3.cs b/Source/Version3/PresetLoaderVersion3.cs
index fee9dcc..455c1fe 100644
--- a/Source/Version3/PresetLoaderVersion3.cs
+++ b/Source/Version3/PresetLoaderVersion3.cs
@@ -34,7 +34,7 @@ public bool Load(PrepareCarefully loadout, string presetName) {
                     Scribe_Collections.Look<SaveRecordPawnV3>(ref pawns, "colonists", LookMode.Deep, null);
                 }
                 catch (Exception e) {
-                    Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageSound.SeriousAlert);
+                    Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageTypeDefOf.ThreatBig);
                     Log.Warning(e.ToString());
                     Log.Warning("Preset was created with the following mods: " + ModString);
                     return false;
@@ -44,7 +44,7 @@ public bool Load(PrepareCarefully loadout, string presetName) {
                     Scribe_Collections.Look<SaveRecordPawnV3>(ref hiddenPawns, "hiddenPawns", LookMode.Deep, null);
                 }
                 catch (Exception e) {
-                    Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageSound.SeriousAlert);
+                    Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageTypeDefOf.ThreatBig);
                     Log.Warning(e.ToString());
                     Log.Warning("Preset was created with the following mods: " + ModString);
                     return false;
@@ -54,7 +54,7 @@ public bool Load(PrepareCarefully loadout, string presetName) {
                     Scribe_Collections.Look<SaveRecordRelationshipV3>(ref savedRelationships, "relationships", LookMode.Deep, null);
                 }
                 catch (Exception e) {
-                    Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageSound.SeriousAlert);
+                    Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageTypeDefOf.ThreatBig);
                     Log.Warning(e.ToString());
                     Log.Warning("Preset was created with the following mods: " + ModString);
                     return false;
@@ -64,7 +64,7 @@ public bool Load(PrepareCarefully loadout, string presetName) {
                     Scribe_Collections.Look<SaveRecordParentChildGroupV3>(ref parentChildGroups, "parentChildGroups", LookMode.Deep, null);
                 }
                 catch (Exception e) {
-                    Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageSound.SeriousAlert);
+                    Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageTypeDefOf.ThreatBig);
                     Log.Warning(e.ToString());
                     Log.Warning("Preset was created with the following mods: " + ModString);
                     return false;
@@ -143,7 +143,7 @@ public bool Load(PrepareCarefully loadout, string presetName) {
                     }
                 }
                 else {
-                    Messages.Message("EdB.PC.Dialog.Preset.Error.EquipmentFailed".Translate(), MessageSound.SeriousAlert);
+                    Messages.Message("EdB.PC.Dialog.Preset.Error.EquipmentFailed".Translate(), MessageTypeDefOf.ThreatBig);
                     Log.Warning("Failed to load equipment from preset");
                     Failed = true;
                 }
@@ -178,13 +178,13 @@ public bool Load(PrepareCarefully loadout, string presetName) {
                         colonistCustomPawns.Add(pawn);
                     }
                     else {
-                        Messages.Message("EdB.PC.Dialog.Preset.Error.NoCharacter".Translate(), MessageSound.SeriousAlert);
+                        Messages.Message("EdB.PC.Dialog.Preset.Error.NoCharacter".Translate(), MessageTypeDefOf.ThreatBig);
                         Log.Warning("Preset was created with the following mods: " + ModString);
                     }
                 }
             }
             catch (Exception e) {
-                Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageSound.SeriousAlert);
+                Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageTypeDefOf.ThreatBig);
                 Log.Warning(e.ToString());
                 Log.Warning("Preset was created with the following mods: " + ModString);
                 return false;
@@ -206,7 +206,7 @@ public bool Load(PrepareCarefully loadout, string presetName) {
                 }
             }
             catch (Exception e) {
-                Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageSound.SeriousAlert);
+                Messages.Message("EdB.PC.Dialog.Preset.Error.Failed".Translate(), MessageTypeDefOf.ThreatBig);
                 Log.Warning(e.ToString());
                 Log.Warning("Preset was created with the following mods: " + ModString);
                 return false;
@@ -240,13 +240,13 @@ public bool Load(PrepareCarefully loadout, string presetName) {
                     }
                 }
                 catch (Exception e) {
-                    Messages.Message("EdB.PC.Dialog.Preset.Error.RelationshipFailed".Translate(), MessageSound.SeriousAlert);
+                    Messages.Message("EdB.PC.Dialog.Preset.Error.RelationshipFailed".Translate(), MessageTypeDefOf.ThreatBig);
                     Log.Warning(e.ToString());
                     Log.Warning("Preset was created with the following mods: " + ModString);
                     return false;
                 }
                 if (atLeastOneRelationshipFailed) {
-                    Messages.Message("EdB.PC.Dialog.Preset.Error.RelationshipFailed".Translate(), MessageSound.SeriousAlert);
+                    Messages.Message("EdB.PC.Dialog.Preset.Error.RelationshipFailed".Translate(), MessageTypeDefOf.ThreatBig);
                 }
             }
             loadout.RelationshipManager.AddRelationships(allRelationships);
@@ -294,8 +294,8 @@ public bool Load(PrepareCarefully loadout, string presetName) {
             loadout.RelationshipManager.ReassignHiddenPawnIndices();
 
             if (Failed) {
-                Messages.Message(ModString, MessageSound.Silent);
-                Messages.Message("EdB.PC.Dialog.Preset.Error.ThingDefFailed".Translate(), MessageSound.SeriousAlert);
+                Messages.Message(ModString, MessageTypeDefOf.SilentInput);
+                Messages.Message("EdB.PC.Dialog.Preset.Error.ThingDefFailed".Translate(), MessageTypeDefOf.ThreatBig);
                 Log.Warning("Preset was created with the following mods: " + ModString);
                 return false;
             }