diff --git a/NRaasConsigner/XML/ConsignerSpacePersistedSettings.xml b/NRaasConsigner/XML/ConsignerSpacePersistedSettings.xml
index 27bef28f..087025f4 100644
--- a/NRaasConsigner/XML/ConsignerSpacePersistedSettings.xml
+++ b/NRaasConsigner/XML/ConsignerSpacePersistedSettings.xml
@@ -28,5 +28,8 @@
     <kInbredPenalty value="100">
       <!--Penalty for each ancestor that appears multiple times in the family tree-->
     </kInbredPenalty>
+    <kReportGate value="200">
+      <!--The minimum sale value required to display a notice for inactives-->
+    </kReportGate>
   </Current_Tuning>
 </base>
diff --git a/NRaasDresser/XML/Dresser+DresserSettings.xml b/NRaasDresser/XML/Dresser+DresserSettings.xml
index 5e904e87..d5c08f3c 100644
--- a/NRaasDresser/XML/Dresser+DresserSettings.xml
+++ b/NRaasDresser/XML/Dresser+DresserSettings.xml
@@ -8,16 +8,13 @@
       <!-- Hour each night to switch the outfits on sims-->
     </kNightlyChangeOutfitHour>
     <kRotationAffectActive value="False">
-      <!--Whether to change the outfits of the active sims-->
+      <!--Whether to change the outfits of the active sims during nightly rotation-->
     </kRotationAffectActive>
     <kChanceOfSwitch value="75">
       <!--The percent chance a sim will consider switching outfits-->
     </kChanceOfSwitch>
-    <kRotateMartialOutfit value="False">
-      <!--Whether to rotate the martial arts outfit category-->
-    </kRotateMartialOutfit>
-    <kCheckOutfits value="True">
-      <!--Whether to check outfits on age-up-->
+    <kCheckOutfits value="False">
+      <!--Whether to enable the check outfits task-->
     </kCheckOutfits>
     <kNotifyOnCheckOutfits value="True">
       <!--Whether to display an notification whenever a sim's outfit is altered-->
@@ -25,7 +22,7 @@
     <kSwitchOnOutside value="True">
       <!--Whether to force a sim to switch out of Sleepwear or Athletic upon entering the outdoors-->
     </kSwitchOnOutside>
-    
+
     <kIgnoreValidForRandomClothing value="False">
       <!--Whether the mod is allowed to use clothing not marked ValidForRandom when replacing invalids-->
     </kIgnoreValidForRandomClothing>
@@ -68,18 +65,9 @@
     <kAllowRollAgeupMakeup value="True">
       <!--Whether to reroll makeup on adult age-up-->
     </kAllowRollAgeupMakeup>
-    <kAddRandomBodyHair value="True">
-      <!--Whether to roll random body hair during Check Outfits-->
-    </kAddRandomBodyHair>
     <kIgnoreBodyHairGender value="False">
       <!--Whether to ignore the gender on body hair parts-->
     </kIgnoreBodyHairGender>
-    <kAddRandomMaleMakeup value="0">
-      <!--The number of random makeup to add to males which have none-->
-    </kAddRandomMaleMakeup>
-    <kAddRandomFemaleMakeup value="2">
-      <!--The number of random makeup to add to females which have none-->
-    </kAddRandomFemaleMakeup>
     <kSameMakeupForAllCategories value="True">
       <!--Whether to use the same makeup for all categories when rerolling-->
     </kSameMakeupForAllCategories>
@@ -213,5 +201,9 @@
     <kIgnoreValidForRandomBodyHair value="True">
       <!--Whether the mod is allowed to use body hair not marked ValidForRandom when replacing invalids-->
     </kIgnoreValidForRandomBodyHair>
+
+    <kCheckOutfitsOnReset value="False">
+      <!--Wheather to check outfits on Sims who were reset-->
+    </kCheckOutfitsOnReset>
   </Current_Tuning>
 </base>
diff --git a/NRaasDresser/XML/Kathy/Dresser+DresserSettings.xml b/NRaasDresser/XML/Kathy/Dresser+DresserSettings.xml
index 0c4e36ac..739fed77 100644
--- a/NRaasDresser/XML/Kathy/Dresser+DresserSettings.xml
+++ b/NRaasDresser/XML/Kathy/Dresser+DresserSettings.xml
@@ -5,7 +5,7 @@
       <!--Whether to change all sims outfits to a new selection each night-->
     </kNightlyRandomChangeOutfit>
     <kNightlyChangeOutfitHour value="7">
-      <!-- Hour each night to switch the outfits on sims-->
+      <!--Hour each night to switch the outfits on sims-->
     </kNightlyChangeOutfitHour>
     <kRotationAffectActive value="False">
       <!--Whether to change the outfits of the active sims-->
@@ -13,11 +13,8 @@
     <kChanceOfSwitch value="75">
       <!--The percent chance a sim will consider switching outfits-->
     </kChanceOfSwitch>
-    <kRotateMartialOutfit value="False">
-      <!--Whether to rotate the martial arts outfit category-->
-    </kRotateMartialOutfit>
     <kCheckOutfits value="True">
-      <!--Whether to check outfits on age-up-->
+      <!--Whether to enable the check outfits task-->
     </kCheckOutfits>
     <kNotifyOnCheckOutfits value="True">
       <!--Whether to display an notification whenever a sim's outfit is altered-->
@@ -68,18 +65,9 @@
     <kAllowRollAgeupMakeup value="True">
       <!--Whether to reroll makeup on adult age-up-->
     </kAllowRollAgeupMakeup>
-    <kAddRandomBodyHair value="True">
-      <!--Whether to roll random body hair during Check Outfits-->
-    </kAddRandomBodyHair>
     <kIgnoreBodyHairGender value="False">
       <!--Whether to ignore the gender on body hair parts-->
     </kIgnoreBodyHairGender>
-    <kAddRandomMaleMakeup value="0">
-      <!--The number of random makeup to add to males which have none-->
-    </kAddRandomMaleMakeup>
-    <kAddRandomFemaleMakeup value="2">
-      <!--The number of random makeup to add to females which have none-->
-    </kAddRandomFemaleMakeup>
     <kSameMakeupForAllCategories value="True">
       <!--Whether to use the same makeup for all categories when rerolling-->
     </kSameMakeupForAllCategories>
@@ -213,5 +201,9 @@
     <kIgnoreValidForRandomBodyHair value="True">
       <!--Whether the mod is allowed to use body hair not marked ValidForRandom when replacing invalids-->
     </kIgnoreValidForRandomBodyHair>
+
+    <kCheckOutfitsOnReset value="False">
+      <!--Wheather to check outfits on Sims who were reset-->
+    </kCheckOutfitsOnReset>
   </Current_Tuning>
 </base>
diff --git a/NRaasDresser/XML/Personal/Dresser+DresserSettings.xml b/NRaasDresser/XML/Personal/Dresser+DresserSettings.xml
index cbc196fd..a827d973 100644
--- a/NRaasDresser/XML/Personal/Dresser+DresserSettings.xml
+++ b/NRaasDresser/XML/Personal/Dresser+DresserSettings.xml
@@ -5,7 +5,7 @@
       <!--Whether to change all sims outfits to a new selection each night-->
     </kNightlyRandomChangeOutfit>
     <kNightlyChangeOutfitHour value="7">
-      <!-- Hour each night to switch the outfits on sims-->
+      <!--Hour each night to switch the outfits on sims-->
     </kNightlyChangeOutfitHour>
     <kRotationAffectActive value="True">
       <!--Whether to change the outfits of the active sims-->
@@ -13,11 +13,8 @@
     <kChanceOfSwitch value="75">
       <!--The percent chance a sim will consider switching outfits-->
     </kChanceOfSwitch>
-    <kRotateMartialOutfit value="False">
-      <!--Whether to rotate the martial arts outfit category-->
-    </kRotateMartialOutfit>
     <kCheckOutfits value="True">
-      <!--Whether to check outfits on age-up-->
+      <!--Whether to enable the check outfits task-->
     </kCheckOutfits>
     <kNotifyOnCheckOutfits value="False">
       <!--Whether to display an notification whenever a sim's outfit is altered-->
@@ -63,23 +60,14 @@
       <!--Whether to rotate the outfits of skin jobs-->
     </kRotateOccult>
     <kAllowRollAgeupHair value="True">
-      <!--Whether to reroll hair on age-up-->
+      <!--Whether to reroll hair on adult age-up-->
     </kAllowRollAgeupHair>
     <kAllowRollAgeupMakeup value="True">
-      <!--Whether to reroll makeup on age-up-->
+      <!--Whether to reroll makeup on adult age-up-->
     </kAllowRollAgeupMakeup>
-    <kAddRandomBodyHair value="True">
-      <!--Whether to roll random body hair during Check Outfits-->
-    </kAddRandomBodyHair>
     <kIgnoreBodyHairGender value="False">
       <!--Whether to ignore the gender on body hair parts-->
     </kIgnoreBodyHairGender>
-    <kAddRandomMaleMakeup value="0">
-      <!--The number of random makeup to add to males which have none-->
-    </kAddRandomMaleMakeup>
-    <kAddRandomFemaleMakeup value="0">
-      <!--The number of random makeup to add to females which have none-->
-    </kAddRandomFemaleMakeup>
     <kSameMakeupForAllCategories value="True">
       <!--Whether to use the same makeup for all categories when rerolling-->
     </kSameMakeupForAllCategories>
@@ -213,5 +201,9 @@
     <kIgnoreValidForRandomBodyHair value="True">
       <!--Whether the mod is allowed to use body hair not marked ValidForRandom when replacing invalids-->
     </kIgnoreValidForRandomBodyHair>
+
+    <kCheckOutfitsOnReset value="False">
+      <!--Wheather to check outfits on Sims who were reset-->
+    </kCheckOutfitsOnReset>
   </Current_Tuning>
 </base>
diff --git a/NRaasGoHere/XML/GoHereSpacePersistedSettings.xml b/NRaasGoHere/XML/GoHereSpacePersistedSettings.xml
index cccb570c..9da0fb7f 100644
--- a/NRaasGoHere/XML/GoHereSpacePersistedSettings.xml
+++ b/NRaasGoHere/XML/GoHereSpacePersistedSettings.xml
@@ -40,5 +40,23 @@
     <kDisallowInactiveLeaveActiveLot value="True">
       <!--Whether to disable certain 'Go Home' for inactives, whenever they are on a lot containing an active-->
     </kDisallowInactiveLeaveActiveLot>
+    <kDisallowCarRouting value="False">
+      <!--Whether to allow cars during routing operations-->
+    </kDisallowCarRouting>
+    <kDisallowBoatRouting value="False">
+      <!--Whether to allow boats during routing operations-->
+    </kDisallowBoatRouting>
+    <kDisallowMermaidRouting value="False">
+      <!--Whether to allow mermaids to swim everywhere-->
+    </kDisallowMermaidRouting>
+    <kServiceSimsIgnoreAllDoorOptions value="True">
+      <!--Whether to disable all door options for service sims-->
+    </kServiceSimsIgnoreAllDoorOptions>
+    <kRoleSimsIgnoreAllDoorOptions value="True">
+      <!--Whether to disable all door options for role sims-->
+    </kRoleSimsIgnoreAllDoorOptions>
+    <kEnableDoorTooltips value="True">
+      <!--Whether to enable criteria tooltips on doors-->
+    </kEnableDoorTooltips>
   </Current_Tuning>
 </base>
diff --git a/NRaasMasterController/XML/MasterControllerSpacePersistedSettings.xml b/NRaasMasterController/XML/MasterControllerSpacePersistedSettings.xml
index 1876a1d5..c2ca4668 100644
--- a/NRaasMasterController/XML/MasterControllerSpacePersistedSettings.xml
+++ b/NRaasMasterController/XML/MasterControllerSpacePersistedSettings.xml
@@ -22,9 +22,6 @@
     <kFamilyTreeLevels value="4">
       <!--How many levels to display on the family tree-->
     </kFamilyTreeLevels>
-    <kMakeupByCategory value="False">
-      <!--Whether to allow different makeup per outfit category-->
-    </kMakeupByCategory>
     <kNakedTattoo value="False">
       <!--Whether to run Tattoo CAS using the naked outfit-->
     </kNakedTattoo>
@@ -40,6 +37,9 @@
     <kSkillStamp value="">
       <!--Comma separated list of skills and minimum levels, where the first element is the name of the stamp.  eg: GMStamp,Guitar:10,MartialArts:5-->
     </kSkillStamp>
+    <kMenuVisibleSetValue value="True">
+      <!--Whether to display the Set Value interaction in the object menu-->
+    </kMenuVisibleSetValue>
     <kMenuVisibleOpenSesame value="True">
       <!--Whether to display the Open and Close interactions in the object menu-->
     </kMenuVisibleOpenSesame>
@@ -50,7 +50,7 @@
       <!--Whether to display the Add Sim and Evict interactions in the object menu-->
     </kMenuVisibleAddSim>
     <kOverrideCoreSliders value="False">
-      <!--Whether to handle the CAS Slider panels ourselves, and ignore custom Core changes-->
+      <!--Whether to handle the CAS Slider panels within this mod, and ignore custom Core changes-->
     </kOverrideCoreSliders>
     <kByMoneyIntervals value="10">
       <!--Number of intervals to display on Sims By Money and the money filters-->
@@ -58,31 +58,22 @@
     <kMenuVisibleOwnership value="True">
       <!--Whether to display the Ownership interaction in the object menu-->
     </kMenuVisibleOwnership>
-    <kTagInfo value="Limited">
-      <!--What information to display on the map tags added by this mod (Limited, Personal, Career, Relationship, Household)-->
-    </kTagInfo>
     <kHairColorByOutfit value="False">
       <!--Whether to retain separate hair coloring for each sim outfit-->
     </kHairColorByOutfit>
-    <kEnableMemories value="True">
-      <!--Whether to allow the creation of memories-->
-    </kEnableMemories>
     <kUniGenderHair value="False">
       <!--Whether to unlock all hairs for every gender-->
     </kUniGenderHair>
     <kBeardsForAll value="False">
       <!--Whether to unlock the beard panel for all sims-->
     </kBeardsForAll>
-    <kBodyHairForAll value="False">
-      <!--Whether to unlock the body hair panel for all sims-->
-    </kBodyHairForAll>
     <kDisableMakeupFilter value="True">
       <!--Whether to display all makeup parts in CAS-->
     </kDisableMakeupFilter>
     <kBodySliderOffset value="0">
       <!--The amount to offset each body slider to produce lower than normally possible values-->
     </kBodySliderOffset>
-    
+
     <kDefaultSpecies value="Human">
       <!--The default species to display whenever the Species is not explicitly being used (Human, LittleDog, Dog, Cat, Horse)-->
     </kDefaultSpecies>
@@ -178,11 +169,15 @@
       <!--Which expansion packs to hide in CAS by default (EP1, SP1, EP2, SP2, etc)-->
     </kHideByProduct>
 
-    <kSubtleMapTags value="False">
-      <!--Whether to display normal map tags-->
-    </kSubtleMapTags>
     <kShowHiddenParts value="False">
       <!--Whether to display normally hidden CAS parts-->
     </kShowHiddenParts>
+    <kUniGenderAdult value="False">
+      <!--Whether to unlock all adults clothing for all genders-->
+    </kUniGenderAdult>
+
+    <kMaxCASSliders value="100">
+      <!--The number of sliders to allow in CAS-->
+    </kMaxCASSliders>
   </Current_Tuning>
 </base>
diff --git a/NRaasMasterController/XML/Personal/MasterControllerSpacePersistedSettings.xml b/NRaasMasterController/XML/Personal/MasterControllerSpacePersistedSettings.xml
index d3c077ad..c2ca4668 100644
--- a/NRaasMasterController/XML/Personal/MasterControllerSpacePersistedSettings.xml
+++ b/NRaasMasterController/XML/Personal/MasterControllerSpacePersistedSettings.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <base>
   <Current_Tuning>
-    <kDisableClothingFilter value="True">
-      <!--Whether to disable the clothing filter and allow all outfits in every category-->
-    </kDisableClothingFilter>
     <kAllowOverStuffed value="True">
       <!--Whether to all more the eight sims in a family when using Add Sim or Pollinate-->
     </kAllowOverStuffed>
@@ -25,25 +22,22 @@
     <kFamilyTreeLevels value="4">
       <!--How many levels to display on the family tree-->
     </kFamilyTreeLevels>
-    <kMakeupByCategory value="True">
-      <!--Whether to allow different makeup per outfit category-->
-    </kMakeupByCategory>
-    <kNakedTattoo value="True">
+    <kNakedTattoo value="False">
       <!--Whether to run Tattoo CAS using the naked outfit-->
     </kNakedTattoo>
     <kResetEverythingOnActive value="True">
       <!--Whether to reset the active lot during 'Reset Everything'-->
     </kResetEverythingOnActive>
-    <kHotkeys value="Stylist">
+    <kHotkeys value="">
       <!--Comma separated list of hot key actions (Interaction IDs are the same as those used in STBL translation)-->
     </kHotkeys>
     <kCustomBuffs value="">
       <!--Comma separated list of custom selected buffs-->
     </kCustomBuffs>
     <kSkillStamp value="">
-      <!--Comma separated list of skills and minimum levels, eg:  Guitar:10,MartialArts:5-->
+      <!--Comma separated list of skills and minimum levels, where the first element is the name of the stamp.  eg: GMStamp,Guitar:10,MartialArts:5-->
     </kSkillStamp>
-    <kMenuVisibleSetValue value="False">
+    <kMenuVisibleSetValue value="True">
       <!--Whether to display the Set Value interaction in the object menu-->
     </kMenuVisibleSetValue>
     <kMenuVisibleOpenSesame value="True">
@@ -55,39 +49,24 @@
     <kMenuVisibleAddSim value="True">
       <!--Whether to display the Add Sim and Evict interactions in the object menu-->
     </kMenuVisibleAddSim>
-    <kMenuVisibleTransferItem value="True">
-      <!--Whether to display the Transfer Item interaction in the object menu-->
-    </kMenuVisibleTransferItem>
     <kOverrideCoreSliders value="False">
-      <!--Whether to handle the CAS Slider panels ourselves, and ignore custom Core changes-->
+      <!--Whether to handle the CAS Slider panels within this mod, and ignore custom Core changes-->
     </kOverrideCoreSliders>
-    <kLogCASParts value="False">
-      <!--Whether to log CAS Parts to script error file whenever a part is selected in CAS-->
-    </kLogCASParts>
     <kByMoneyIntervals value="10">
       <!--Number of intervals to display on Sims By Money and the money filters-->
     </kByMoneyIntervals>
     <kMenuVisibleOwnership value="True">
       <!--Whether to display the Ownership interaction in the object menu-->
     </kMenuVisibleOwnership>
-    <kTagInfo value="Limited">
-      <!--What information to display on the map tags added by this mod (Limited, Personal, Career, Relationship, Household)-->
-    </kTagInfo>
-    <kHairColorByOutfit value="True">
+    <kHairColorByOutfit value="False">
       <!--Whether to retain separate hair coloring for each sim outfit-->
     </kHairColorByOutfit>
-    <kEnableMemories value="False">
-      <!--Whether to allow the creation of memories-->
-    </kEnableMemories>
-    <kUniGenderHair value="True">
+    <kUniGenderHair value="False">
       <!--Whether to unlock all hairs for every gender-->
     </kUniGenderHair>
     <kBeardsForAll value="False">
       <!--Whether to unlock the beard panel for all sims-->
     </kBeardsForAll>
-    <kBodyHairForAll value="False">
-      <!--Whether to unlock the body hair panel for all sims-->
-    </kBodyHairForAll>
     <kDisableMakeupFilter value="True">
       <!--Whether to display all makeup parts in CAS-->
     </kDisableMakeupFilter>
@@ -190,11 +169,15 @@
       <!--Which expansion packs to hide in CAS by default (EP1, SP1, EP2, SP2, etc)-->
     </kHideByProduct>
 
-    <kSubtleMapTags value="False">
-      <!--Whether to display normal map tags-->
-    </kSubtleMapTags>
     <kShowHiddenParts value="False">
       <!--Whether to display normally hidden CAS parts-->
     </kShowHiddenParts>
+    <kUniGenderAdult value="False">
+      <!--Whether to unlock all adults clothing for all genders-->
+    </kUniGenderAdult>
+
+    <kMaxCASSliders value="100">
+      <!--The number of sliders to allow in CAS-->
+    </kMaxCASSliders>
   </Current_Tuning>
 </base>
diff --git a/NRaasOverwatch/XML/OverwatchSpacePersistedSettings.xml b/NRaasOverwatch/XML/OverwatchSpacePersistedSettings.xml
index 94ee22e5..f075bbe9 100644
--- a/NRaasOverwatch/XML/OverwatchSpacePersistedSettings.xml
+++ b/NRaasOverwatch/XML/OverwatchSpacePersistedSettings.xml
@@ -7,9 +7,12 @@
     <kAffectActiveLot value="False">
       <!--Whether certain actions affect the active lot-->
     </kAffectActiveLot>
-    <kBootAllGnomes value="True">
-      <!--Whether to boot all errant gnomes on a nightly basis-->
-    </kBootAllGnomes>
+    <kResetAllGnomes value="True">
+      <!--Whether to reset all errant gnomes on a nightly basis-->
+    </kResetAllGnomes>
+    <kDeleteAllMagicGnomes value="False">
+      <!--Whether to delete all magic gnomes in the world on a nightly basis-->
+    </kDeleteAllMagicGnomes>
     <kTurnOffStereos value="True">
       <!--Whether to turn off all stereos nightly-->
     </kTurnOffStereos>
@@ -43,9 +46,18 @@
     <kCleanupLaundromat value="True">
       <!--Whether to periodically reset any community laundry machines-->
     </kCleanupLaundromat>
+    <kCleanupSinged value="True">
+      <!--Whether to remove duplicated singed outfits off sims-->
+    </kCleanupSinged>
+    <kCleanupSkillModifiers value="True">
+      <!--Whether to reset obviously bogus skill modifiers back to base-line-->
+    </kCleanupSkillModifiers>
     <kCleanupElevators value="True">
       <!--Whether to periodically reset any elevators in town-->
     </kCleanupElevators>
+    <kCleanupAging value="True">
+      <!--Whether to periodically correct aging in town-->
+    </kCleanupAging>
     <kCleanseTheDead value="False">
       <!--Whether to periodically remove all unnecessary urnstones from the mausoleum-->
     </kCleanseTheDead>
@@ -99,5 +111,21 @@
       <!--Whether to clean up broken relationships on a nightly basis-->
     </kCleanupRelationships>
 
+    <kCompressFamilyLevel value="0">
+      <!--Minimum family tree depth to initiate an automatic compression of a dead sim-->
+    </kCompressFamilyLevel>
+    <kMinimumRouteFail value="10">
+      <!--Minimum number of route failures in a row to force a reset-->
+    </kMinimumRouteFail>
+    <kRouteFailTestMinutes value="30">
+      <!--The number of sim-minutes from the start of the route failure to when the sim will be reset-->
+    </kRouteFailTestMinutes>
+
+    <kCleanupVehiclesHourly value="False">
+      <!--Whether to cleanup vehicles hourly-->
+    </kCleanupVehiclesHourly>
+    <kDisableFullMoonLighting value="False">
+      <!--Whether to disable the full moon lighting effect-->
+    </kDisableFullMoonLighting>
   </Current_Tuning>
 </base>
diff --git a/NRaasOverwatch/XML/Personal/OverwatchSpacePersistedSettings.xml b/NRaasOverwatch/XML/Personal/OverwatchSpacePersistedSettings.xml
index 301aff21..8eb0033c 100644
--- a/NRaasOverwatch/XML/Personal/OverwatchSpacePersistedSettings.xml
+++ b/NRaasOverwatch/XML/Personal/OverwatchSpacePersistedSettings.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <base>
   <Current_Tuning>
-    <kTestingCheatsEnabled value="True">
+    <kTestingCheatsEnabled value="False">
       <!--Whether to enable Testing Cheats on load-up-->
     </kTestingCheatsEnabled>
     <kAffectActiveLot value="False">
       <!--Whether certain actions affect the active lot-->
     </kAffectActiveLot>
+    <kResetAllGnomes value="True">
+      <!--Whether to reset all errant gnomes on a nightly basis-->
+    </kResetAllGnomes>
+    <kDeleteAllMagicGnomes value="False">
+      <!--Whether to delete all magic gnomes in the world on a nightly basis-->
+    </kDeleteAllMagicGnomes>
     <kTurnOffStereos value="True">
       <!--Whether to turn off all stereos nightly-->
     </kTurnOffStereos>
@@ -22,7 +28,7 @@
     <kKillAllHomeless value="False">
       <!--Whether to periodically eliminate all the homeless in town-->
     </kKillAllHomeless>
-    <kPurgeGeneticHair value="True">
+    <kPurgeGeneticHair value="False">
       <!--Whether to remove the genetic hair-style from all sims-->
     </kPurgeGeneticHair>
     <kCleanupGenealogy value="True">
@@ -40,9 +46,27 @@
     <kCleanupLaundromat value="True">
       <!--Whether to periodically reset any community laundry machines-->
     </kCleanupLaundromat>
-    <kCleanupBadRoles value="True">
-      <!--Whether to clean up bad roles left over from uninstalling Register, on load-up-->
-    </kCleanupBadRoles>
+    <kCleanupSinged value="True">
+      <!--Whether to remove duplicated singed outfits off sims-->
+    </kCleanupSinged>
+    <kCleanupSkillModifiers value="True">
+      <!--Whether to reset obviously bogus skill modifiers back to base-line-->
+    </kCleanupSkillModifiers>
+    <kCleanupElevators value="True">
+      <!--Whether to periodically reset any elevators in town-->
+    </kCleanupElevators>
+    <kCleanupAging value="True">
+      <!--Whether to periodically correct aging in town-->
+    </kCleanupAging>
+    <kCleanseTheDead value="False">
+      <!--Whether to periodically remove all unnecessary urnstones from the mausoleum-->
+    </kCleanseTheDead>
+    <kShowSimMenu value="True">
+      <!--Whether to display the interactions in the Sim menu-->
+    </kShowSimMenu>
+    <kShowNotices value="True">
+      <!--Whether to display the nightly alarm notifications-->
+    </kShowNotices>
     <kLogging value="True">
       <!--Whether to log the results of any actions performed-->
     </kLogging>
@@ -87,5 +111,21 @@
       <!--Whether to clean up broken relationships on a nightly basis-->
     </kCleanupRelationships>
 
+    <kCompressFamilyLevel value="0">
+      <!--Minimum family tree depth to initiate an automatic compression of a dead sim-->
+    </kCompressFamilyLevel>
+    <kMinimumRouteFail value="10">
+      <!--Minimum number of route failures in a row to force a reset-->
+    </kMinimumRouteFail>
+    <kRouteFailTestMinutes value="30">
+      <!--The number of sim-minutes from the start of the route failure to when the sim will be reset-->
+    </kRouteFailTestMinutes>
+
+    <kCleanupVehiclesHourly value="False">
+      <!--Whether to cleanup vehicles hourly-->
+    </kCleanupVehiclesHourly>
+    <kDisableFullMoonLighting value="False">
+      <!--Whether to disable the full moon lighting effect-->
+    </kDisableFullMoonLighting>
   </Current_Tuning>
 </base>
\ No newline at end of file
diff --git a/NRaasPortraitPanel/XML/PortraitPanelSpacePersistedSettings.xml b/NRaasPortraitPanel/XML/PortraitPanelSpacePersistedSettings.xml
index e4fc2c31..492c6ef2 100644
--- a/NRaasPortraitPanel/XML/PortraitPanelSpacePersistedSettings.xml
+++ b/NRaasPortraitPanel/XML/PortraitPanelSpacePersistedSettings.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <base>
   <Current_Tuning>
-    <!--Visibility Types : ActiveHousehold, WholeTown, SelectedSims, ActiveSimLot, ActiveFamilyLot, ActiveHomeLot, ViewedLot, OnlyIdle, OnlySelectable, Relatives, ActiveHumans, ActiveAnimals, InactiveHumans, InactiveAnimals, SpeciesHumans, SpeciesDogs, SpeciesCats, SpeciesHorses, SpeciesOther -->
     <kSetType value="ActiveHousehold">
-      <!--Which set of sims to display on the panel (See Visibility Types)-->
+      <!--Which set of sims to display on the panel (WholeTown, ActiveHousehold, SelectedSims, ActiveSimLot, ActiveFamilyLot, ViewedLot, ActiveHomeLot)-->
     </kSetType>
     <kVisibilityType value="">
-      <!--Applied to the sims defined by SetType (See Visibility Types)-->
+      <!--Applied to the sims defined by SetType (OnlyIdle, OnlySelectable, ActiveSimLot, ActiveFamilyLot, ViewedLot, ActiveHomeLot)-->
     </kVisibilityType>
     <kSortType value="ByAge">
       <!--The method to sort the portraits (ByAge, ByMood, ByName, ByAutonomy, BySelectability, ByCustom, BySpecies, ByRelationship, ActiveHousehold)-->
@@ -33,28 +32,28 @@
       <!--Whether to zoom in from map view on a single right click-->
     </kZoomInOnRightClick>
     <kSecondSortType value="ByName">
-      <!--The secondary sort method (ByAge, ByMood, ByName, ByAutonomy, BySelectability, ByCustom, BySpecies, ByRelationship, ActiveHousehold)-->
+      <!--The secondary sort method (ByAge, ByMood, ByName, ByAutonomy, BySelectability, ByCustom, ActiveHousehold, BySpecies)-->
     </kSecondSortType>
     <kSecondReverse value="False">
-      <!--Whether to secondary sort in reverse order-->
+      <!--Whether to perform the secondary sort in reverse order-->
     </kSecondReverse>
     <kShowCycleButton value="True">
       <!--Whether to cycle portraits button when there are less than 24 sims listed-->
     </kShowCycleButton>
     <kThirdSortType value="ByName">
-      <!--The tertiary sort method (ByAge, ByMood, ByName, ByAutonomy, BySelectability, ByCustom, BySpecies, ByRelationship, ActiveHousehold)-->
+      <!--The tertiary sort method (ByAge, ByMood, ByName, ByAutonomy, BySelectability, ByCustom, ActiveHousehold, BySpecies)-->
     </kThirdSortType>
     <kThirdReverse value="False">
       <!--Whether to perform the tertiary sort in reverse order-->
     </kThirdReverse>
     <kColumnFilter1 value="ActiveHumans">
-      <!--The sims to display in column one (See Visibility Types)-->
+      <!--The sims to display in column one (ActiveHousehold, ActiveHumans, ActiveAnimals, InactiveHumans, InactiveAnimals, SelectedSims)-->
     </kColumnFilter1>
     <kColumnFilter2 value="ActiveAnimals">
-      <!--The sims to display in column two (See Visibility Types)-->
+      <!--The sims to display in column two (ActiveHousehold, ActiveHumans, ActiveAnimals, InactiveHumans, InactiveAnimals, SelectedSims)-->
     </kColumnFilter2>
     <kColumnFilter3 value="">
-      <!--The sims to display in column three (See Visibility Types)-->
+      <!--The sims to display in column three (ActiveHousehold, ActiveHumans, ActiveAnimals, InactiveHumans, InactiveAnimals, SelectedSims)-->
     </kColumnFilter3>
     <kRevertToSingleListOnTooMany value="True">
       <!--Whether to revert to using a single list when there are too many sims listed-->
diff --git a/NRaasRegister/RegisterSpace/Options/GlobalRoles/MaximumPaparazzi.cs b/NRaasRegister/RegisterSpace/Options/GlobalRoles/MaximumPaparazzi.cs
index 9105fc5b..b715b6f3 100644
--- a/NRaasRegister/RegisterSpace/Options/GlobalRoles/MaximumPaparazzi.cs
+++ b/NRaasRegister/RegisterSpace/Options/GlobalRoles/MaximumPaparazzi.cs
@@ -82,7 +82,7 @@ protected override int Value
                     data.mMaxSpecCount = value;
                 }
 
-                List<Role> roles =  new List(RoleManager.GetRolesOfType(Role.RoleType.Paparazzi));
+                List<Role> roles =  new List<Role>(RoleManager.GetRolesOfType(Role.RoleType.Paparazzi));
                 int count = 0;
                 foreach(Role role in roles)
                 {
diff --git a/NRaasRegister/XML/RegisterSpacePersistedSettings.xml b/NRaasRegister/XML/RegisterSpacePersistedSettings.xml
index eba89b85..f4fec42b 100644
--- a/NRaasRegister/XML/RegisterSpacePersistedSettings.xml
+++ b/NRaasRegister/XML/RegisterSpacePersistedSettings.xml
@@ -19,7 +19,7 @@
     <kAllowImmigration value="True">
       <!--Whether to allow immigrants to spawn to fill role positions-->
     </kAllowImmigration>
-    
+
     <kMaximumWildHorses value="4">
       <!--The maximum number of wild horses that can be spawned by the Pet Manager-->
     </kMaximumWildHorses>
@@ -77,5 +77,47 @@
     <kPayPerPianist value="100">
       <!--How much to pay pianists per hour they are working-->
     </kPayPerPianist>
+
+    <kTouristChanceOfLeaving value="25">
+      <!--Chance of a tourist leaving every 75 minutes-->
+    </kTouristChanceOfLeaving>
+    <kTouristAmount value="10">
+      <!--Size of the tourist pool-->
+    </kTouristAmount>
+    <kPayPerProprietor value="100">
+      <!--How much to pay proprietors per hour they are working-->
+    </kPayPerProprietor>
+    <kPayPerConcessionsStandMerchant value="100">
+      <!--How much to pay concession stand merchants per hour they are working-->
+    </kPayPerConcessionsStandMerchant>
+    <kPayPerKissingBoothAttendant value="100">
+      <!--How much to pay kissing booth merchants per hour they are working-->
+    </kPayPerKissingBoothAttendant>
+    <kPayPerPotionShopMerchant value="100">
+      <!--How much to pay potion merchants per hour they are working-->
+    </kPayPerPotionShopMerchant>
+    <kPayPerUniversityMascot value="100">
+      <!--How much to pay University Mascots per hour they are working-->
+    </kPayPerUniversityMascot>
+    <kPayPerBaristaBarTender value="100">
+      <!--How much to pay Barista Bar Tenders per hour they are working-->
+    </kPayPerBaristaBarTender>
+    <kPayPerHobbyShopMerchant value="100">
+      <!--How much to pay Hobby Shop Merchants per hour they are working-->
+    </kPayPerHobbyShopMerchant>
+    <kPayPerCafeteriaWaiter value="100">
+      <!--How much to pay Cafeteria Waiters per hour they are working-->
+    </kPayPerCafeteriaWaiter>
+    <kPayPerBotShopMerchant value="100">
+      <!--How much to pay Bot Shop Merchants per hour they are working-->
+    </kPayPerBotShopMerchant>
+
+    <kAllowHomeworldTourists value="True">
+      <!--Whether to allow homeworld residents to be used as tourists-->
+    </kAllowHomeworldTourists>
+
+    <kMaximumPaparazzi value="3">
+      <!--The maximum paparazzi that the role manager can spawn-->
+    </kMaximumPaparazzi>
   </Current_Tuning>
 </base>
diff --git a/NRaasRelativity/XML/RelativitySpacePersistedSettings.xml b/NRaasRelativity/XML/RelativitySpacePersistedSettings.xml
index 556622dc..dd3f8854 100644
--- a/NRaasRelativity/XML/RelativitySpacePersistedSettings.xml
+++ b/NRaasRelativity/XML/RelativitySpacePersistedSettings.xml
@@ -10,6 +10,9 @@
     <kApplyLifeSpanSkillFactor value="False">
       <!--Whether to apply a skill gain multiple based on life-span-->
     </kApplyLifeSpanSkillFactor>
+    <kCyclesPerUpdate value="0">
+      <!--Number of cycles between updates-->
+    </kCyclesPerUpdate>
     <kSkillGainFactors value="All:1">
       <!--Skill Gain Factors.  Format <Skill>:<Factor>,<Skill>:<Factor>-->
     </kSkillGainFactors>
@@ -41,5 +44,8 @@
     <kSkipOnHumanSleep value="False">
       <!--Whether to only count humans when checking whether to fast forward while sleeping-->
     </kSkipOnHumanSleep>
+    <kPerformRelativeTuningAlterations value="True">
+      <!--Whether to alter tuning based on the relative speed of the mod-->
+    </kPerformRelativeTuningAlterations>
   </Current_Tuning>
 </base>
diff --git a/NRaasSaver/Saver.cs b/NRaasSaver/Saver.cs
index b9c85d65..66488eda 100644
--- a/NRaasSaver/Saver.cs
+++ b/NRaasSaver/Saver.cs
@@ -50,16 +50,10 @@ public class SaverOptions
 
         [Tunable, TunableComment("Whether to prompt while in Build/Buy Mode")]
         public static bool kPromptInBuildBuy = true;        
-    }
 
-    public class SaverOptions2
-    {
         [Tunable, TunableComment("Whether to pause when the game initially loads")]
         public static bool kPauseOnLoad = true;
-    }
 
-    public class SaverOptions3
-    {
         [Tunable, TunableComment("Whether to pause when the save prompt appears")]
         public static bool kPauseOnSave = false;
     }
diff --git a/NRaasSaver/SaverSpace/PersistedSettings.cs b/NRaasSaver/SaverSpace/PersistedSettings.cs
index e4ab2c4d..bc14dd81 100644
--- a/NRaasSaver/SaverSpace/PersistedSettings.cs
+++ b/NRaasSaver/SaverSpace/PersistedSettings.cs
@@ -24,8 +24,8 @@ public class PersistedSettings
         public int mSimMinutesBetweenSaves = SaverOptions.kSimMinutesBetweenSaves;
         public List<float> mSimSaveHour = new List<float>(SaverOptions.kSimSaveHour);
         public int mSaveCycles = SaverOptions.kSaveCycles;
-        public bool mPauseOnLoad = SaverOptions2.kPauseOnLoad;
-        public bool mPauseOnSave = SaverOptions3.kPauseOnSave;
+        public bool mPauseOnLoad = SaverOptions.kPauseOnLoad;
+        public bool mPauseOnSave = SaverOptions.kPauseOnSave;
 
         public bool mSwitchToMapView = SaverOptions.kSwitchToMapView;
 
diff --git a/NRaasSaver/XML/SaverOptions.xml b/NRaasSaver/XML/SaverOptions.xml
index 5e0fa1ab..40ba13b3 100644
--- a/NRaasSaver/XML/SaverOptions.xml
+++ b/NRaasSaver/XML/SaverOptions.xml
@@ -16,9 +16,15 @@
     <kSwitchToMapView value="False">
       <!--Whether to switch to map view prior to saving-->
     </kSwitchToMapView>
-    
+
     <kPromptInBuildBuy value="True">
       <!--Whether to prompt while in Build/Buy Mode-->
-    </kPromptInBuildBuy>    
+    </kPromptInBuildBuy>
+    <kPauseOnLoad value="True">
+      <!--Whether to pause when the game initially loads-->
+    </kPauseOnLoad>
+    <kPauseOnSave value="False">
+      <!--Whether to pause when the save prompt appears-->
+    </kPauseOnSave>
   </Current_Tuning>
 </base>
diff --git a/NRaasTempest/TempestSpace/PersistedSettings.cs b/NRaasTempest/TempestSpace/PersistedSettings.cs
index 8a153f11..ab8eacd9 100644
--- a/NRaasTempest/TempestSpace/PersistedSettings.cs
+++ b/NRaasTempest/TempestSpace/PersistedSettings.cs
@@ -48,9 +48,9 @@ public class PersistedSettings
         [Tunable, TunableComment("Percent chance occults will give occult items during trick or treating")]
         protected static int kChanceOccultItemTrickOrTreat = 50;
 
-        [Tunable, TunableComment("Whether to enable auto lighting of fireplaces when the temp teaches kAutoLightFireplacesTemperature")]
+        [Tunable, TunableComment("Whether to enable auto lighting of fireplaces when the temp reaches kAutoLightFireplacesTemperature")]
         protected static bool kAutoLightFireplaces = true;
-        [Tunable, TunableComment("At which temperature to auto light said fireplaces")]
+        [Tunable, TunableComment("At which temperature (fahrenheit) to auto light said fireplaces")]
         protected static float kAutoLightFireplacesTemperature = 40.0f;
 
         public int mHailKillsHarvestables = kHailKillsHarvestables;
diff --git a/NRaasTempest/XML/TempestSpacePersistedSettings.xml b/NRaasTempest/XML/TempestSpacePersistedSettings.xml
index ffc570f3..a546aac2 100644
--- a/NRaasTempest/XML/TempestSpacePersistedSettings.xml
+++ b/NRaasTempest/XML/TempestSpacePersistedSettings.xml
@@ -13,5 +13,17 @@
     <kAllowHolidayParties value="True">
       <!-- Whether to suppress inactive holiday parties -->
     </kAllowHolidayParties>
+    <kRemoveLeavesInWinter value="False">
+      <!--Whether to remove fallen leaves on lots in Winter-->
+    </kRemoveLeavesInWinter>
+    <kChanceOccultItemTrickOrTreat value="50">
+      <!--Percent chance occults will give occult items during trick or treating-->
+    </kChanceOccultItemTrickOrTreat>
+    <kAutoLightFireplaces value="True">
+      <!--Whether to enable auto lighting of fireplaces when the temp teaches kAutoLightFireplacesTemperature-->
+    </kAutoLightFireplaces>
+    <kAutoLightFireplacesTemperature value="40">
+      <!--At which temperature (fahrenheit) to auto light said fireplaces-->
+    </kAutoLightFireplacesTemperature>
   </Current_Tuning>
 </base>
diff --git a/NRaasTraveler/XML/TravelerSpacePersistedSettings.xml b/NRaasTraveler/XML/TravelerSpacePersistedSettings.xml
index 7ff19726..939b26dc 100644
--- a/NRaasTraveler/XML/TravelerSpacePersistedSettings.xml
+++ b/NRaasTraveler/XML/TravelerSpacePersistedSettings.xml
@@ -4,9 +4,6 @@
     <kPauseTravel value="False">
       <!-- Whether to pause the travel clock -->
     </kPauseTravel>
-    <kRemoveTravelRestrictions value="False">
-      <!-- Whether to allow children or pregnant sims to be included for travel -->
-    </kRemoveTravelRestrictions>
     <kTreatAsVacation value="True">
       <!-- Whether to handle custom destinations as vacation towns -->
     </kTreatAsVacation>
@@ -37,5 +34,20 @@
     <kSetAsUnselectable value="False">
       <!-- Whether to set inactive travelers as unselectable upon arrival on vacation -->
     </kSetAsUnselectable>
+    <kDisableDescedants value="False">
+      <!-- Whether to disable the generate of decendants and stop the llama messages -->
+    </kDisableDescedants>
+    <kChanceOfOccultHybrid value="0">
+      <!-- Chance of descendant being a hybrid -->
+    </kChanceOfOccultHybrid>
+    <kChanceOfOccultMutation value="0">
+      <!-- Chance of decendant occult mutating -->
+    </kChanceOfOccultMutation>
+    <kMaxOccult value="2">
+      <!-- Maximum occults a descendant can have -->
+    </kMaxOccult>
+    <kDisableDescendantModification value="False">
+      <!-- Disable alteration of descendants -->
+    </kDisableDescendantModification>
   </Current_Tuning>
 </base>
diff --git a/NRaasVector/XML/VectorSpacePersistedSettings.xml b/NRaasVector/XML/VectorSpacePersistedSettings.xml
index 6bce793f..17acac02 100644
--- a/NRaasVector/XML/VectorSpacePersistedSettings.xml
+++ b/NRaasVector/XML/VectorSpacePersistedSettings.xml
@@ -29,7 +29,7 @@
       <!-- Whether to allow active sims to be a patient zero -->
     </kOutbreakAllowActive>
     <kOutbreakShowNotices value="False">
-      <!-- Whether to allow active sims to be a patient zero -->
+      <!-- Whether to show notices when a sim contracts a disease -->
     </kOutbreakShowNotices>
     <kNumPatientZero value="1">
       <!-- The number of initial infected during an outbreak -->
diff --git a/NRaasWoohooer/XML/WoohooerTuningCat.xml b/NRaasWoohooer/XML/WoohooerTuningCat.xml
index 52e49e13..01b6814d 100644
--- a/NRaasWoohooer/XML/WoohooerTuningCat.xml
+++ b/NRaasWoohooer/XML/WoohooerTuningCat.xml
@@ -2,11 +2,8 @@
 <base>
   <Current_Tuning>
     <kLikingGatingForAutonomousWoohoo value="40">
-      <!--Minimum liking gate for performing autonomous woohoo actions-->
+      <!--Range: 0-100. Minimum liking gate for performing autonomous actions-->
     </kLikingGatingForAutonomousWoohoo>
-    <kLikingGatingForAutonomousRomance value="0">
-      <!--Minimum liking gate for performing autonomous romance actions-->
-    </kLikingGatingForAutonomousRomance>
     <kRiskyBabyMadeChance value="10">
       <!--Range: 0-100. Chance of Sim getting Pregnant on RiskyWoohoo.-->
     </kRiskyBabyMadeChance>
@@ -19,9 +16,6 @@
     <kTryForBabyAutonomous value="False">
       <!--Whether Try For Baby is autonomous-->
     </kTryForBabyAutonomous>
-    <kTeenTryForBabyAutonomous value="False">
-      <!--Whether Try For Baby is autonomous for teens-->
-    </kTeenTryForBabyAutonomous>
     <kMustBeRomanticForAutonomous value="True">
       <!--Whether a couple must be flagged as romantic before considering woohoo-->
     </kMustBeRomanticForAutonomous>
@@ -40,7 +34,7 @@
     <kAllowSameSexTryForBaby value="True">
       <!--Whether to display try for baby for same-sex couples-->
     </kAllowSameSexTryForBaby>
-    <kMaximumHouseholdSizeForAutonomous value="8">
+    <kMaximumHouseholdSizeForAutonomous value="6">
       <!--Maximum number of sims per household for autonomous pregnancy-->
     </kMaximumHouseholdSizeForAutonomous>
     <kWoohooBaseChanceScoring value="25">
@@ -65,7 +59,7 @@
       <!--Range: -200 to 200. The base chance of a sim being interested in a romantic interaction-->
     </kRomanceBaseChanceScoring>
     <kAttractionBaseChanceScoring value="0">
-      <!--Range: -200 to 200. The base attraction of a sim to another-->
+      <!--Range: -200 to 200. The base chance of a sim being attracted to another-->
     </kAttractionBaseChanceScoring>
     <kTryForBabyMadeChance value="75">
       <!--Range: 0-100. Chance of Sim getting Pregnant on Try For Baby.-->
@@ -91,7 +85,7 @@
     <kForcePetMate value="True">
       <!--Whether to set a new mate after woohoo-->
     </kForcePetMate>
-    <kWoohooCountScoreFactor value="-2">
+    <kWoohooCountScoreFactor value="-10">
       <!--Scoring factor applied for each woohoo performed during the day-->
     </kWoohooCountScoreFactor>
     <kAllowOffLotRiskyAutonomous value="True">
diff --git a/NRaasWoohooer/XML/WoohooerTuningDog.xml b/NRaasWoohooer/XML/WoohooerTuningDog.xml
index 52e49e13..2658d3ca 100644
--- a/NRaasWoohooer/XML/WoohooerTuningDog.xml
+++ b/NRaasWoohooer/XML/WoohooerTuningDog.xml
@@ -2,11 +2,8 @@
 <base>
   <Current_Tuning>
     <kLikingGatingForAutonomousWoohoo value="40">
-      <!--Minimum liking gate for performing autonomous woohoo actions-->
+      <!--Range: 0-100. Minimum liking gate for performing autonomous actions-->
     </kLikingGatingForAutonomousWoohoo>
-    <kLikingGatingForAutonomousRomance value="0">
-      <!--Minimum liking gate for performing autonomous romance actions-->
-    </kLikingGatingForAutonomousRomance>
     <kRiskyBabyMadeChance value="10">
       <!--Range: 0-100. Chance of Sim getting Pregnant on RiskyWoohoo.-->
     </kRiskyBabyMadeChance>
@@ -19,9 +16,6 @@
     <kTryForBabyAutonomous value="False">
       <!--Whether Try For Baby is autonomous-->
     </kTryForBabyAutonomous>
-    <kTeenTryForBabyAutonomous value="False">
-      <!--Whether Try For Baby is autonomous for teens-->
-    </kTeenTryForBabyAutonomous>
     <kMustBeRomanticForAutonomous value="True">
       <!--Whether a couple must be flagged as romantic before considering woohoo-->
     </kMustBeRomanticForAutonomous>
@@ -40,7 +34,7 @@
     <kAllowSameSexTryForBaby value="True">
       <!--Whether to display try for baby for same-sex couples-->
     </kAllowSameSexTryForBaby>
-    <kMaximumHouseholdSizeForAutonomous value="8">
+    <kMaximumHouseholdSizeForAutonomous value="6">
       <!--Maximum number of sims per household for autonomous pregnancy-->
     </kMaximumHouseholdSizeForAutonomous>
     <kWoohooBaseChanceScoring value="25">
@@ -65,7 +59,7 @@
       <!--Range: -200 to 200. The base chance of a sim being interested in a romantic interaction-->
     </kRomanceBaseChanceScoring>
     <kAttractionBaseChanceScoring value="0">
-      <!--Range: -200 to 200. The base attraction of a sim to another-->
+      <!--Range: -200 to 200. The base chance of a sim being attracted to another-->
     </kAttractionBaseChanceScoring>
     <kTryForBabyMadeChance value="75">
       <!--Range: 0-100. Chance of Sim getting Pregnant on Try For Baby.-->
@@ -89,9 +83,9 @@
       <!--Whether to test all the standard conditions that normally restrict Try For Baby-->
     </kTestAllConditionsForUserDirected>
     <kForcePetMate value="True">
-      <!--Whether to set a new mate after woohoo-->
+      <!--Whether for a new mate after woohoo-->
     </kForcePetMate>
-    <kWoohooCountScoreFactor value="-2">
+    <kWoohooCountScoreFactor value="-10">
       <!--Scoring factor applied for each woohoo performed during the day-->
     </kWoohooCountScoreFactor>
     <kAllowOffLotRiskyAutonomous value="True">
diff --git a/NRaasWoohooer/XML/WoohooerTuningHorse.xml b/NRaasWoohooer/XML/WoohooerTuningHorse.xml
index 52e49e13..2658d3ca 100644
--- a/NRaasWoohooer/XML/WoohooerTuningHorse.xml
+++ b/NRaasWoohooer/XML/WoohooerTuningHorse.xml
@@ -2,11 +2,8 @@
 <base>
   <Current_Tuning>
     <kLikingGatingForAutonomousWoohoo value="40">
-      <!--Minimum liking gate for performing autonomous woohoo actions-->
+      <!--Range: 0-100. Minimum liking gate for performing autonomous actions-->
     </kLikingGatingForAutonomousWoohoo>
-    <kLikingGatingForAutonomousRomance value="0">
-      <!--Minimum liking gate for performing autonomous romance actions-->
-    </kLikingGatingForAutonomousRomance>
     <kRiskyBabyMadeChance value="10">
       <!--Range: 0-100. Chance of Sim getting Pregnant on RiskyWoohoo.-->
     </kRiskyBabyMadeChance>
@@ -19,9 +16,6 @@
     <kTryForBabyAutonomous value="False">
       <!--Whether Try For Baby is autonomous-->
     </kTryForBabyAutonomous>
-    <kTeenTryForBabyAutonomous value="False">
-      <!--Whether Try For Baby is autonomous for teens-->
-    </kTeenTryForBabyAutonomous>
     <kMustBeRomanticForAutonomous value="True">
       <!--Whether a couple must be flagged as romantic before considering woohoo-->
     </kMustBeRomanticForAutonomous>
@@ -40,7 +34,7 @@
     <kAllowSameSexTryForBaby value="True">
       <!--Whether to display try for baby for same-sex couples-->
     </kAllowSameSexTryForBaby>
-    <kMaximumHouseholdSizeForAutonomous value="8">
+    <kMaximumHouseholdSizeForAutonomous value="6">
       <!--Maximum number of sims per household for autonomous pregnancy-->
     </kMaximumHouseholdSizeForAutonomous>
     <kWoohooBaseChanceScoring value="25">
@@ -65,7 +59,7 @@
       <!--Range: -200 to 200. The base chance of a sim being interested in a romantic interaction-->
     </kRomanceBaseChanceScoring>
     <kAttractionBaseChanceScoring value="0">
-      <!--Range: -200 to 200. The base attraction of a sim to another-->
+      <!--Range: -200 to 200. The base chance of a sim being attracted to another-->
     </kAttractionBaseChanceScoring>
     <kTryForBabyMadeChance value="75">
       <!--Range: 0-100. Chance of Sim getting Pregnant on Try For Baby.-->
@@ -89,9 +83,9 @@
       <!--Whether to test all the standard conditions that normally restrict Try For Baby-->
     </kTestAllConditionsForUserDirected>
     <kForcePetMate value="True">
-      <!--Whether to set a new mate after woohoo-->
+      <!--Whether for a new mate after woohoo-->
     </kForcePetMate>
-    <kWoohooCountScoreFactor value="-2">
+    <kWoohooCountScoreFactor value="-10">
       <!--Scoring factor applied for each woohoo performed during the day-->
     </kWoohooCountScoreFactor>
     <kAllowOffLotRiskyAutonomous value="True">
diff --git a/NRaasWoohooerKamaSimtra/XML/WoohooerSpaceSkillsKamaSimtraSettings.xml b/NRaasWoohooerKamaSimtra/XML/WoohooerSpaceSkillsKamaSimtraSettings.xml
index 86c16b10..445b3cdc 100644
--- a/NRaasWoohooerKamaSimtra/XML/WoohooerSpaceSkillsKamaSimtraSettings.xml
+++ b/NRaasWoohooerKamaSimtra/XML/WoohooerSpaceSkillsKamaSimtraSettings.xml
@@ -25,6 +25,10 @@
     <kDailyRelationshipChange value="1">
       <!--Change in relationship per day once certain goals are acheived-->
     </kDailyRelationshipChange>
+    <kDistinctSimStats value="False">
+      <!--Whether to only count a sim once in the statistics, rather than for each style and location used-->
+    </kDistinctSimStats>
+
     <kWomanizerMinNotches value="25">
       <!--Minimum number of different women that must be shagged to be considered a Womanizer-->
     </kWomanizerMinNotches>
@@ -50,7 +54,7 @@
       <!--Minimum number of woohoos per location to be considered Experienced-->
     </kExperiencedMinPerLocation>
     <kCasanovaMinNotches value="25">
-      <!--Minimum number of satisying shags to be considered Casanovat-->
+      <!--Minimum number of satisying shags to be considered Casanova-->
     </kCasanovaMinNotches>
     <kStarryEyedMinNotches value="25">
       <!--Minimum number of celebrity shags to be considered Starry Eyed-->
@@ -141,12 +145,16 @@
     <kCyberWoohooChanceOfMisunderstanding value="10">
       <!--The chance a Cyber woohoo may not be the proper gender-->
     </kCyberWoohooChanceOfMisunderstanding>
+    <kCyberWoohooBaseChanceScoring value="0">
+      <!--The base scoring chance of a sim liking cyber woohoo-->
+    </kCyberWoohooBaseChanceScoring>
+
     <kSkillPoints value="">
       <!--The number of skill points to achieve the next level in skill in a comma separated format-->
     </kSkillPoints>
 
     <kShowNotices value="False">
-      <!--Whether to display a notice when a sim receives a new notch -->
+      <!--Whether to display a notice when a sim receives a new notch-->
     </kShowNotices>
     <kBasePositiveBuffLength value="60">
       <!--Base number of minutes that a positive buff lasts-->
@@ -158,7 +166,10 @@
       <!--The minimum level for Tantraport-->
     </kMinLevelTantraport>
     <kGraveRobberMinNotchPerDeathType value="5">
-      <!--Minimum number of each death type that must be put to rest to count towards Grave Robber-->
+      <!--Minimum number of each occult that must be put to rest to count towards Grave Robber-->
     </kGraveRobberMinNotchPerDeathType>
+    <kSeedServicePool value="False">
+      <!--Whether to seed the service pool with professionals-->
+    </kSeedServicePool>
   </Current_Tuning>
 </base>