diff --git a/data/json/hobbies.json b/data/json/hobbies.json
index 9de3e6bffd862..bcea218930429 100644
--- a/data/json/hobbies.json
+++ b/data/json/hobbies.json
@@ -3,7 +3,7 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "heroin_addict",
-    "name": "Heroin Addict",
+    "name": "Heroin Dependence",
     "description": "The last thing you remember was meeting God behind the local Foodplace.  Then people started eating each other.  This doesn't feel like a fever dream.",
     "points": -3,
     "addictions": [ { "intensity": 40, "type": "opiate" } ]
@@ -12,8 +12,8 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "smoker",
-    "name": "Chain Smoker",
-    "description": "Your coworkers always muttered when you had to duck outside every hour for a smoke, but it ended up saving your life when things got bad.  Now you're down to your last pack.  You start out with a strong nicotine addiction.",
+    "name": "Nicotine Dependence",
+    "description": "Your coworkers always muttered when you had to duck outside every hour for a smoke, but it ended up saving your life when things got bad.  You'll need to find a steady supply of nicotine if you want to keep the cravings at bay.",
     "points": -1,
     "addictions": [ { "intensity": 10, "type": "nicotine" } ]
   },
@@ -21,9 +21,9 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "crackhead",
-    "name": "Crackhead",
-    "description": "Cocaine.  It is, indeed, a helluva drug.  You blew your money on some dust, and before you knew it you were turning tricks behind the local CVS just to score one more line.  Where are you going to get your next fix now?",
-    "points": -1,
+    "name": "Crack Cocaine Dependence",
+    "description": "Cocaine.  It is, indeed, a helluva drug.  You blew your money on some rocks, and before you knew it you were turning tricks behind the local pharmacy just to score a little more.  Where are you going to get your next fix now?",
+    "points": -2,
     "traits": [ "STIMBOOST" ],
     "addictions": [ { "intensity": 20, "type": "crack" } ]
   },
@@ -31,8 +31,8 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "tweaker",
-    "name": "Tweaker",
-    "description": "You're not entirely sure what happened last night, but you woke up on the floor and everything has gone completely to shit.  The only thing running through your head, though, is where you're gonna find your next hit.",
+    "name": "Amphetamine Dependence",
+    "description": "You're not entirely sure what happened last night, but you woke up on the floor and everything has completely gone to shit.  The only thing running through your head, though, is where you're gonna find your next hit.",
     "points": -2,
     "traits": [ "STIMBOOST" ],
     "addictions": [ { "intensity": 30, "type": "amphetamine" } ]
@@ -41,18 +41,18 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "pillhead",
-    "name": "Pillhead",
-    "description": "After an accident in your youth, you got addicted to the opiates treating your pain.  With the pharmacies shut down and your dealers turned undead, satisfying those cravings just got a lot more difficult.",
-    "points": -1,
+    "name": "Painkiller Dependence",
+    "description": "After a bad accident, you became hooked on the opiates prescribed to you for the pain.  With the pharmacies shut down and your dealers turned undead, satisfying those cravings just got a lot more difficult.",
+    "points": -2,
     "addictions": [ { "intensity": 20, "type": "opiate" } ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "alcoholic",
-    "name": "Alcoholic",
-    "description": "You found solace in the bottom of a bottle.  God-damn, you need a drink.",
-    "points": -1,
+    "name": "Alcohol Dependence",
+    "description": "One drink became two, two became too many, and before long you were only able to find solace at the bottom of a bottle.  God-damn, you need a drink.",
+    "points": -2,
     "traits": [ "DISORGANIZED" ],
     "addictions": [ { "intensity": 20, "type": "alcohol" } ]
   },
@@ -60,17 +60,18 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "sleepingpillhead",
-    "name": "Sleeping Pill Reliance",
-    "description": "You had difficulties falling asleep, so you started taking those sleeping pills.  Problem is, now you can not fall asleep without them anymore and the Cataclysm does complicate the matter.",
-    "points": -1,
-    "addictions": [ { "intensity": 10, "type": "sleeping pill" } ]
+    "name": "Sleeping Pill Dependence",
+    "description": "You'd been having trouble falling asleep, so you started taking prescription sleep meds.  Now you can hardly seem to fall asleep at all without them, and you'll need plenty of rest to face the days ahead.",
+    "points": -3,
+    "traits": [ "INSOMNIA" ],
+    "addictions": [ { "intensity": 20, "type": "sleeping pill" } ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "caffeine_junkie",
-    "name": "Caffeine Junkie",
-    "description": "Coffee was your day-to-day companion in surviving your job, but getting caffeine into your body will be much harder now.",
+    "name": "Caffeine Dependence",
+    "description": "Coffee was your faithful companion every morning, and without it you feel like a zombie.  Thanks to all the actual zombies shambling about, getting your caffiene fix will be much harder now.",
     "points": -1,
     "traits": [ "STIMBOOST" ],
     "addictions": [ { "intensity": 10, "type": "caffeine" } ]
@@ -80,7 +81,7 @@
     "subtype": "hobby",
     "id": "cosplay",
     "name": "Cosplay",
-    "description": "You liked to make your own costumes and wore them to various conventions.  Now that everyone is dead or dying, maybe this will be useful for something else.",
+    "description": "You liked to make your own costumes and wear them to various conventions.  Now that everyone is dead or dying, maybe this will be useful for something else.",
     "points": 1,
     "skills": [ { "level": 1, "name": "tailor" } ],
     "proficiencies": [ "prof_closures", "prof_leatherworking_basic" ]
@@ -90,7 +91,7 @@
     "subtype": "hobby",
     "id": "lockpicking",
     "name": "Lockpicking",
-    "description": "Silently picking people's locks while they were away was a rush for you.  Will you still feel the same thrill now that no one is left to stop you?",
+    "description": "Whether it was for fun, innocent utilty, or criminal intent, you learned the basics of how to silently pick locks.  Now, being able to get into secured places just got a lot more useful.",
     "points": 1,
     "proficiencies": [ "prof_lockpicking" ],
     "skills": [ { "level": 1, "name": "traps" } ]
@@ -112,7 +113,7 @@
     "name": "Camping",
     "description": "You enjoyed camping in the vast wilderness as a means of escaping the pace of modern life.  The wilderness isn't filled with people, so it must be safe.  Right?  It must be.",
     "points": 2,
-    "skills": [ { "level": 2, "name": "survival" }, { "level": 2, "name": "firstaid" } ],
+    "skills": [ { "level": 2, "name": "survival" }, { "level": 1, "name": "firstaid" }, { "level": 1, "name": "cooking" } ],
     "traits": [ "OUTDOORSMAN" ]
   },
   {
@@ -120,17 +121,18 @@
     "subtype": "hobby",
     "id": "bushcraft",
     "name": "Bushcraft",
-    "description": "You take camping to a whole new level.  You have spent nights and weekends surviving in the wild with just a knife to aid you.  Maybe this can keep you safe away from people.",
-    "points": 5,
-    "skills": [ { "level": 3, "name": "survival" } ],
-    "proficiencies": [ "prof_fibers", "prof_leatherworking_basic", "prof_fibers_rope", "prof_traps", "prof_knapping", "prof_carving" ]
+    "description": "You take camping to a whole new level.  You have spent nights and weekends surviving in the wild with just a knife to aid you.  Maybe this skill for self-sufficiency can keep you safe.",
+    "points": 4,
+    "skills": [ { "level": 3, "name": "survival" }, { "level": 1, "name": "fabrication" }, { "level": 1, "name": "cooking" } ],
+    "proficiencies": [ "prof_fibers", "prof_leatherworking_basic", "prof_fibers_rope", "prof_traps", "prof_knapping", "prof_carving" ],
+    "traits": [ "OUTDOORSMAN" ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "hobby_heli_pilot",
-    "name": "Helicopter Pilot",
-    "description": "You got your pilot's license, and earned a living ferrying businessmen and tourists around.",
+    "name": "Piloting",
+    "description": "You're probably one of the last people alive who knows how to safely operate a flying vehicle.  It remains to be seen whether you'll live long enough to make use of that skill.",
     "points": 2,
     "skills": [ { "level": 2, "name": "driving" }, { "level": 2, "name": "mechanics" } ],
     "proficiencies": [ "prof_helicopter_pilot" ]
@@ -139,8 +141,8 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "loves_books",
-    "name": "Loves Books",
-    "description": "You love reading, you just never seemed to have enough time.  Maybe the Cataclysm is a blessing in disguise.",
+    "name": "Reading",
+    "description": "You love reading, but you never seemed to have enough time.  Maybe the Cataclysm is a blessing in disguise.",
     "points": 1,
     "traits": [ "LOVES_BOOKS" ]
   },
@@ -149,8 +151,8 @@
     "subtype": "hobby",
     "id": "chem_cooking",
     "name": "Chemical Cooking",
-    "description": "You decided to cook your fix instead of waiting for your next one.",
-    "points": 2,
+    "description": "Perhaps you produced illicit chemicals for your own consumption, or to sell to others.  Or maybe you're just a real nerd about chemistry.  In any case, you know your way around a Periodic Table.",
+    "points": 3,
     "proficiencies": [ "prof_intro_chemistry", "prof_intro_chem_synth" ],
     "skills": [ { "level": 3, "name": "chemistry" }, { "level": 1, "name": "cooking" } ]
   },
@@ -159,8 +161,8 @@
     "subtype": "hobby",
     "id": "archery",
     "name": "Archery",
-    "description": "You enjoy nocking back an arrow and hearing them whistle through the air.",
-    "points": 2,
+    "description": "You enjoy nocking back an arrow and hearing it whistle through the air.  If you can get the proper gear together and stay on-target, you'll have a good, quiet alternative to using guns.",
+    "points": 3,
     "skills": [ { "level": 3, "name": "archery" }, { "level": 2, "name": "gun" } ],
     "proficiencies": [ "prof_bow_basic" ]
   },
@@ -169,9 +171,9 @@
     "subtype": "hobby",
     "id": "swimming",
     "name": "Swimming",
-    "description": "Swimming through water is certainly an advantage you have over the undead.",
-    "points": 1,
-    "skills": [ { "level": 3, "name": "swimming" } ],
+    "description": "You're a strong swimmer, and you're pretty sure zombies aren't.  You can't swim forever, but it's certainly an advantage over the undead.",
+    "points": 2,
+    "skills": [ { "level": 4, "name": "swimming" } ],
     "traits": [ "OUTDOORSMAN" ]
   },
   {
@@ -180,24 +182,25 @@
     "id": "baseball",
     "name": "Baseball",
     "description": "You got the stance, you got the grip, you got the game.  Swinging at a zombie's head is close enough to swinging at a baseball… right?",
-    "points": 2,
-    "skills": [ { "level": 3, "name": "bashing" }, { "level": 2, "name": "swimming" } ]
+    "points": 3,
+    "skills": [ { "level": 3, "name": "bashing" }, { "level": 2, "name": "throw" }, { "level": 1, "name": "swimming" } ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "vid_games",
-    "name": "Video Games",
-    "description": "You love video games so much that you spent that vast majority of your time playing.",
+    "name": "Video Gaming",
+    "description": "You loved immersing yourself in virtual worlds through video games.  Now you're faced with real survival horror, and no extra lives.",
     "points": 1,
-    "skills": [ { "level": 1, "name": "computer" } ]
+    "skills": [ { "level": 1, "name": "computer" } ],
+    "traits": [ "WAKEFUL" ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "trapping",
     "name": "Trapping",
-    "description": "You like to trap little wild animals such as mice and other rodents.",
+    "description": "You liked to trap little wild animals such as mice and other rodents.  This skill could be useful for working with more deadly devices, if you're creative enough.",
     "points": 2,
     "proficiencies": [ "prof_traps", "prof_disarming" ],
     "skills": [ { "level": 3, "name": "traps" } ]
@@ -207,17 +210,17 @@
     "subtype": "hobby",
     "id": "dodgeball",
     "name": "Dodgeball",
-    "description": "Dodging fast moving balls as if your life depended on it was fun.  Zombies aren't as fun, but your life certainly depends on it.",
-    "points": 2,
-    "skills": [ { "level": 3, "name": "dodge" }, { "level": 2, "name": "throw" } ]
+    "description": "Dodging fast-moving balls as though your life depended on it was fun.  Dodging zombies isn't as fun, but your life certainly depends on it.",
+    "points": 3,
+    "skills": [ { "level": 3, "name": "dodge" }, { "level": 2, "name": "throw" }, { "level": 1, "name": "swimming" } ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "amateur_electronics",
-    "name": "Amateur Electronics",
+    "name": "Electronic Tinkering",
     "description": "You found unexpected solace while soldering components to circuit boards.",
-    "points": 2,
+    "points": 3,
     "proficiencies": [ "prof_elec_soldering" ],
     "skills": [ { "level": 3, "name": "electronics" }, { "level": 2, "name": "computer" } ]
   },
@@ -225,10 +228,17 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "diy_crafts",
-    "name": "DIY Crafts",
-    "description": "You spent much of your time making something useful out of bits and bobbles.",
+    "name": "DIY Crafting",
+    "description": "You spent much of your time making useful things out of bits and bobbles.",
     "points": 3,
-    "proficiencies": [ "prof_pottery", "prof_carving", "prof_basketweaving", "prof_elastics", "prof_leatherworking_basic" ],
+    "proficiencies": [
+      "prof_pottery",
+      "prof_carving",
+      "prof_basketweaving",
+      "prof_elastics",
+      "prof_leatherworking_basic",
+      "prof_plasticworking"
+    ],
     "skills": [ { "level": 3, "name": "fabrication" }, { "level": 1, "name": "tailor" } ]
   },
   {
@@ -236,9 +246,9 @@
     "subtype": "hobby",
     "id": "cooking",
     "name": "Cooking",
-    "description": "You enjoyed cooking for yourself and others.",
+    "description": "You enjoyed cooking for yourself and others.  The grocery stores are closed for good, so you might need to start getting creative with your recipes.",
     "points": 2,
-    "proficiencies": [ "prof_baking", "prof_food_prep" ],
+    "proficiencies": [ "prof_baking", "prof_baking_bread", "prof_baking_desserts_1", "prof_food_prep", "prof_knife_skills" ],
     "skills": [ { "level": 3, "name": "cooking" } ]
   },
   {
@@ -246,7 +256,7 @@
     "subtype": "hobby",
     "id": "paintball",
     "name": "Paintball",
-    "description": "Shooting your enemies has always been fun.  Now you can do it for real.",
+    "description": "Pretending to shoot at your friends has always been fun.  Now you can do it for real.",
     "points": 2,
     "skills": [ { "level": 3, "name": "rifle" }, { "level": 1, "name": "gun" } ]
   },
@@ -255,7 +265,7 @@
     "subtype": "hobby",
     "id": "plinking",
     "name": "Plinking",
-    "description": "You enjoyed plinking with your airsoft pistol.",
+    "description": "You enjoyed target plinking with your airsoft pistol.  You're a good shot, but you'll need a real gun for it to matter.",
     "points": 2,
     "skills": [ { "level": 3, "name": "pistol" }, { "level": 1, "name": "gun" } ]
   },
@@ -264,7 +274,7 @@
     "subtype": "hobby",
     "id": "skeet_shooting",
     "name": "Skeet Shooting",
-    "description": "Where the skeet go, your bullet follows.  Or atleast, one of them will.",
+    "description": "Where the skeet go, your shot follows.  Throw enough pellets downrange, and you'll at least hit something.",
     "points": 2,
     "skills": [ { "level": 3, "name": "shotgun" }, { "level": 1, "name": "gun" } ]
   },
@@ -273,7 +283,7 @@
     "subtype": "hobby",
     "id": "public_speaking",
     "name": "Public Speaking",
-    "description": "You were an incredibly social individual.",
+    "description": "You are an incredibly social individual, with the projection and vocabulary to make people listen.",
     "points": 1,
     "skills": [ { "level": 3, "name": "speech" } ],
     "traits": [ "BOOMING_VOICE" ]
@@ -283,7 +293,7 @@
     "subtype": "hobby",
     "id": "street_fighting",
     "name": "Street Fighting",
-    "description": "You were always instigating fights in the street.  At least this might come in useful now.",
+    "description": "You were constantly instigating fights in the street.  You can throw and dodge a punch better than most.",
     "points": 2,
     "skills": [ { "level": 1, "name": "melee" }, { "level": 3, "name": "unarmed" }, { "level": 2, "name": "dodge" } ]
   },
@@ -292,7 +302,7 @@
     "subtype": "hobby",
     "id": "knife_throwing",
     "name": "Knife Throwing",
-    "description": "Throwing knives are fun and deadly in the right hands.",
+    "description": "You learned how to throw knives before the world ended, a skill that can be deadly in the right situation.",
     "points": 2,
     "skills": [ { "level": 3, "name": "throw" } ]
   },
@@ -301,9 +311,9 @@
     "subtype": "hobby",
     "id": "sewing",
     "name": "Sewing",
-    "description": "You used to sew torn clothes back together and even made your own clothes a few times.",
-    "points": 2,
-    "proficiencies": [ "prof_closures", "prof_elastics" ],
+    "description": "You used to sew torn clothes back together, and have even made your own clothes a few times.",
+    "points": 3,
+    "proficiencies": [ "prof_closures", "prof_elastics", "prof_knitting" ],
     "skills": [ { "level": 3, "name": "tailor" }, { "level": 1, "name": "fabrication" } ]
   },
   {
@@ -311,8 +321,8 @@
     "subtype": "hobby",
     "id": "fencing",
     "name": "Fencing",
-    "description": "You were in a fencing club, and you weren't too shabby with a saber.",
-    "points": 2,
+    "description": "You were in a fencing club, and you weren't too shabby with a saber.  If you can get your hands on a real sword, you'll be a formidable fighter.",
+    "points": 5,
     "skills": [ { "level": 3, "name": "stabbing" }, { "level": 1, "name": "melee" } ],
     "traits": [ "MARTIAL_FENCING" ]
   },
@@ -320,7 +330,7 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "car_fan",
-    "name": "Gearhead",
+    "name": "Motorsports",
     "description": "You're a big fan of cars and other things that go vroom, whether it's fixing them or driving them.  You may not be a professional, but you know your way around an engine.",
     "points": 1,
     "skills": [ { "level": 3, "name": "driving" }, { "level": 1, "name": "mechanics" } ]
@@ -329,7 +339,7 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "martial_training",
-    "name": "Martial Training",
+    "name": "Martial Arts",
     "description": "You have received some martial arts training at a local dojo.  You start with your choice of Karate, Judo, Aikido, Tai Chi, Taekwondo, or Pankration.",
     "points": 4,
     "skills": [ { "level": 2, "name": "melee" }, { "level": 3, "name": "unarmed" } ],
@@ -339,7 +349,7 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "self_defense",
-    "name": "Self-Defense Classes",
+    "name": "Self-Defense",
     "description": "You have taken some self-defense classes at a nearby gym.  You start with your choice of Boxing, Capoeira, Krav Maga, Muay Thai, Ninjutsu, Wing Chun, or Zui Quan.",
     "points": 4,
     "skills": [ { "level": 2, "name": "melee" }, { "level": 3, "name": "unarmed" } ],
@@ -349,9 +359,9 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "shaolin",
-    "name": "Shaolin Adept",
+    "name": "Shaolin Kung Fu",
     "description": "You have studied the arts of the Shaolin monks.  You start with one of the five animal fighting styles: Tiger, Crane, Leopard, Snake, or Dragon.",
-    "points": 4,
+    "points": 5,
     "skills": [ { "level": 2, "name": "melee" }, { "level": 3, "name": "unarmed" }, { "level": 3, "name": "dodge" } ],
     "traits": [ "MARTIAL_ARTS3" ]
   },
@@ -359,9 +369,9 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "melee_training",
-    "name": "Melee Weapon Training",
-    "description": "You have practiced fighting with weapons.  You start with your choice of Eskrima, Fencing, Fior Di Battaglia, Medieval Swordsmanship, Niten Ichi-Ryu, Pentjak Silat, or Sōjutsu.",
-    "points": 5,
+    "name": "Melee Training",
+    "description": "You have practiced fighting with weapons.  You start with your choice of Barbaran Montante, Eskrima, Fencing, Fior Di Battaglia, Medieval Swordsmanship, Niten Ichi-Ryu, Pentjak Silat, or Sōjutsu.",
+    "points": 6,
     "skills": [
       { "level": 2, "name": "melee" },
       { "level": 3, "name": "bashing" },
@@ -374,18 +384,18 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "gourmand",
-    "name": "Gourmand",
-    "description": "You truly enjoy eating and can eat faster, can eat and drink more, than anyone else!",
+    "name": "Fine Dining",
+    "description": "Everyone eats to live, but you live to eat.  Tasty food will raise your morale more, and you aren't as upset by gross food.  You also eat faster, and can overeat with less chance of getting sick.",
     "points": 3,
     "traits": [ "GOURMAND" ],
-    "skills": [ { "level": 1, "name": "cooking" } ]
+    "skills": [ { "level": 2, "name": "cooking" } ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "marathon_runner",
-    "name": "Marathon Runner",
-    "description": "You went and ran the Boston Marathon every year.  Now, that training came in handy in avoiding the dead.",
+    "name": "Marathon Running",
+    "description": "You ran the Boston Marathon every year.  That conditioning should make you better equipped than most in avoiding the dead.",
     "points": 5,
     "traits": [ "GOODCARDIO", "FLEET" ],
     "skills": [ { "level": 2, "name": "swimming" } ]
@@ -394,78 +404,30 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "hates_books",
-    "name": "Book hater",
+    "name": "Book Hating",
     "description": "Reading is for nerds!  You've managed to make hatred of the written word a central part of your identity.  Or, perhaps, you have a barrier that makes books additionally challenging and frustrating for you.  Whatever the reason, boring books are more boring, and you can't have fun by reading books.",
     "points": -1,
     "traits": [ "HATES_BOOKS" ]
   },
-  {
-    "type": "profession",
-    "subtype": "hobby",
-    "id": "hoarder",
-    "name": "Hoarder",
-    "description": "You don't feel right unless you're carrying as much as you can.  You suffer morale penalties for carrying less than maximum volume (weight is ignored).  Xanax can help control this anxiety.",
-    "points": -3,
-    "traits": [ "HOARDER" ]
-  },
-  {
-    "type": "profession",
-    "subtype": "hobby",
-    "id": "nomadic",
-    "name": "Nomadic",
-    "description": "You're too adventurous for your own good.  The more time you spend somewhere, the unhappier it makes you to be there.",
-    "points": -1,
-    "traits": [ "NOMAD" ],
-    "skills": [ { "level": 1, "name": "survival" }, { "level": 1, "name": "driving" } ]
-  },
-  {
-    "type": "profession",
-    "subtype": "hobby",
-    "id": "pyromaniac",
-    "name": "Pyromaniac",
-    "description": "You have an unhealthy obsession with fire, and you get anxious if you don't light them every now and then or stand near them often.  However, you gain a mood bonus from doing so.",
-    "points": 0,
-    "skills": [ { "level": 1, "name": "survival" } ],
-    "traits": [ "PYROMANIA" ]
-  },
-  {
-    "type": "profession",
-    "subtype": "hobby",
-    "id": "rigid_table_manners",
-    "name": "Rigid Table Manners",
-    "description": "You've been taught proper table manners from your early childhood on; now, you can't even think about eating without being seated at a table and taking your time.  Eating without a table and chair frustrates you, but eating like a civilized person gives you a bigger morale bonus.",
-    "points": -1,
-    "traits": [ "TABLEMANNERS" ]
-  },
-  {
-    "type": "profession",
-    "subtype": "hobby",
-    "id": "truthteller",
-    "name": "Truth Teller",
-    "description": "When you try to tell a lie, you blush, stammer, and get all shifty-eyed.  Telling lies and otherwise bluffing will be much more difficult for you.  However, this does make you a good, honest speaker when you're not trying to hide something.",
-    "points": 0,
-    "traits": [ "TRUTHTELLER" ],
-    "skills": [ { "level": 1, "name": "speech" } ]
-  },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "meatarian",
-    "name": "Meatarian",
-    "description": "You absolutely love meat, and dislike eating fruits and vegetables.  It's not just a taste thing, it's a lifestyle.  You spend a lot of time online telling vegans they are wrong.",
+    "name": "Butchering",
+    "description": "You absolutely love meat, and dislike eating fruits and vegetables.  Your particular tastes have turned you into a decent amateur butcher.",
     "points": -3,
     "traits": [ "ANTIFRUIT", "MEATARIAN" ],
-    "skills": [ { "level": 2, "name": "survival" }, { "level": 2, "name": "cooking" }, { "level": 1, "name": "speech" } ]
+    "skills": [ { "level": 2, "name": "survival" }, { "level": 2, "name": "cooking" } ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "vegetarian",
-    "name": "Vegetarian",
-    "description": "You have been a vegetarian so long, eating meat makes you sick.  You spend a lot of time online telling carnists they are wrong.",
+    "name": "Vegetarian Foraging",
+    "description": "You have been a vegetarian for so long that eating meat makes you feel sick.  You like to supplement your diet with wild plants and mushrooms foraged in the woods.",
     "points": -1,
     "traits": [ "VEGETARIAN" ],
-    "skills": [ { "level": 2, "name": "cooking" }, { "level": 1, "name": "speech" } ]
+    "skills": [ { "level": 2, "name": "cooking" }, { "level": 2, "name": "survival" } ]
   },
   {
     "type": "profession",
@@ -482,7 +444,7 @@
     "subtype": "hobby",
     "id": "arts_and_crafts",
     "name": "Arts and Crafts",
-    "description": "You loved doing crafts at home.  Hopefully this can aid you in surviving now that the world has gone to hell.",
+    "description": "You loved doing crafts at home.  Now, you might want to channel those skills into making more practical things.",
     "points": 1,
     "skills": [ { "level": 1, "name": "fabrication" }, { "level": 2, "name": "tailor" } ]
   },
@@ -490,17 +452,17 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "car_rebuilding",
-    "name": "Car Rebuilding",
+    "name": "Car Restoration",
     "description": "Spending time every weekend in your garage working on an old classic car was your favorite pasttime.  You never finished the car, but at least you learned a little over the years.",
     "points": 2,
-    "skills": [ { "level": 3, "name": "mechanics" } ]
+    "skills": [ { "level": 3, "name": "mechanics" }, { "level": 1, "name": "driving" } ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "trickster",
-    "name": "Trickster",
-    "description": "Mischief is something of a second nature for you.",
+    "name": "Practical Jokes",
+    "description": "Pranks and physical jokes are a passion of yours, from the setup right through to playing innocent at the end.",
     "points": 1,
     "skills": [ { "level": 1, "name": "traps" }, { "level": 1, "name": "speech" } ],
     "traits": [ "LIAR" ]
@@ -510,8 +472,8 @@
     "subtype": "hobby",
     "id": "modelling",
     "name": "Modelling",
-    "description": "Having style and good looks is certainly far more important than practicality.",
-    "points": 3,
+    "description": "You were deep into the fashion scene, keeping up on the latest trends and even modelling clothes yourself.  Having style and good looks is just as, if not more, important to you than practicality.",
+    "points": 2,
     "skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "tailor" } ],
     "traits": [ "STYLISH" ]
   },
@@ -530,17 +492,17 @@
     "name": "Handloading",
     "type": "profession",
     "id": "handloading",
-    "description": "You learned the cheap way to shoot your ammo.  The problem is you shoot even more now.",
-    "points": 2,
+    "description": "You figured you could save money on ammo by learning to make your own.  Now that the factories are shut down, your abilities just went from handy to lifesaving.",
+    "points": 3,
     "proficiencies": [ "prof_handloading" ],
     "skills": [ { "level": 3, "name": "fabrication" }, { "level": 2, "name": "gun" } ]
   },
   {
     "subtype": "hobby",
     "type": "profession",
-    "name": "Game Master",
+    "name": "Tabletop Gaming",
     "id": "game_mastering",
-    "description": "You've guided players' journeys through your dungeons and fortresses.  Now, you're the last member of your party.",
+    "description": "As the Game Master, you've guided players' journeys through dungeons and fortresses.  Now, you're the last member of your party.",
     "points": 2,
     "traits": [ "PROF_DICEMASTER" ],
     "skills": [ { "level": 2, "name": "speech" } ]
@@ -549,17 +511,18 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "ham_radio_operator",
-    "name": "Ham Radio Operator",
-    "description": "You whiled your nights away using, building and repairing old Ham Radios.  Now you have no one to talk to.  But you won't give up hope and maybe your electronics knowledge can help you somehow.",
-    "points": 1,
-    "skills": [ { "level": 3, "name": "electronics" } ]
+    "name": "Ham Radio",
+    "description": "You whiled your nights away using, building and repairing old ham radios.  Now you have no one to talk to. But you won't give up hope, and maybe your electronics knowledge can help you somehow.",
+    "points": 2,
+    "skills": [ { "level": 3, "name": "electronics" } ],
+    "proficiencies": [ "prof_elec_soldering", "prof_elec_circuits" ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "golfing",
-    "name": "Golfing",
-    "points": 1,
+    "name": "Golf",
+    "points": 2,
     "description": "The backswing's a breeze, and your drive could get skulls into the green if you tried.",
     "skills": [ { "level": 2, "name": "bashing" }, { "level": 1, "name": "melee" }, { "level": 1, "name": "driving" } ]
   },
@@ -569,24 +532,24 @@
     "id": "basketball",
     "name": "Basketball",
     "description": "Your ability to play point or post will beat the undead in overtime.",
-    "points": 1,
-    "skills": [ { "level": 2, "name": "throw" }, { "level": 2, "name": "dodge" } ]
+    "points": 2,
+    "skills": [ { "level": 2, "name": "throw" }, { "level": 2, "name": "dodge" }, { "level": 1, "name": "swimming" } ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "shooter",
-    "name": "Gun Range Shooter",
-    "description": "You liked going to the local gun store and doing some target shooting.  Sometimes even cans off of fence posts.  Maybe if you just imagine targets on those dead things, this could help.",
-    "points": 1,
+    "name": "Target Shooting",
+    "description": "You liked going to the local gun range and shooting at some targets or blasting cans off of fence posts.  Maybe if you just imagine targets on those undead, this could help.",
+    "points": 2,
     "skills": [ { "level": 3, "name": "gun" } ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
-    "name": "Red Cross Certified",
+    "name": "First Aid",
     "id": "redcross",
-    "description": "The medical professionals aren't coming, but you'll live regardless.",
+    "description": "You've got training and some experience in dealing with urgent injuries.  In the absence of any medical professionals, that'll have to do.",
     "points": 1,
     "skills": [ { "level": 2, "name": "firstaid" } ]
   },
@@ -603,8 +566,8 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "back_yard_grilling",
-    "name": "Back Yard Grilling",
-    "description": "You enjoyed inviting the neighborhood to a backyard get together most weekends.  You, of course, were the grill master.",
+    "name": "Backyard Grilling",
+    "description": "You enjoyed inviting the neighborhood to a backyard cookout on the weekends.  You, of course, were the grill master.",
     "points": 1,
     "skills": [ { "level": 2, "name": "cooking" } ],
     "proficiencies": [ "prof_food_prep", "prof_knife_skills" ]
@@ -615,7 +578,7 @@
     "id": "carpentry",
     "name": "Carpentry",
     "points": 2,
-    "description": "You could make a boat from scratch.  These undead can't swim, right?",
+    "description": "With enough time and materials, you could make a boat from scratch.  These undead can't swim, right?",
     "skills": [ { "level": 3, "name": "fabrication" } ],
     "proficiencies": [ "prof_carving", "prof_carpentry_basic" ]
   },
@@ -625,7 +588,7 @@
     "subtype": "hobby",
     "name": "Fishing",
     "points": 1,
-    "description": "A quiet day at the lake would be a welcome break from the hordes.",
+    "description": "A quiet day at the lake would be a welcome break from the hordes.  Though, now that you think about it, the fish have been acting strangely vicious lately too.",
     "skills": [ { "level": 2, "name": "survival" }, { "level": 1, "name": "swimming" } ],
     "traits": [ "OUTDOORSMAN" ]
   },
@@ -633,17 +596,17 @@
     "subtype": "hobby",
     "type": "profession",
     "id": "gunsmithing",
-    "name": "Home Gunsmith",
+    "name": "Home Gunsmithing",
     "description": "You could have been the next Browning, if not for the those pesky corpses walking around.  It's time to test for accuracy.",
-    "points": 2,
+    "points": 3,
     "proficiencies": [ "prof_gunsmithing_basic", "prof_gunsmithing_improv" ],
-    "skills": [ { "level": 2, "name": "fabrication" }, { "level": 1, "name": "gun" }, { "level": 1, "name": "traps" } ]
+    "skills": [ { "level": 3, "name": "fabrication" }, { "level": 1, "name": "gun" }, { "level": 1, "name": "traps" } ]
   },
   {
     "subtype": "hobby",
     "type": "profession",
     "id": "roller_derby",
-    "description": "Being able your way through the pack is always useful, whether it's living or rotting.",
+    "description": "Being able to body your way through the pack is always useful, whether your opponent is living or rotting.",
     "name": "Roller Derby",
     "points": 3,
     "skills": [
@@ -659,7 +622,7 @@
     "subtype": "hobby",
     "id": "hockey",
     "name": "Roller Hockey",
-    "description": "Knowing your way around the rink can be handy in outmanuvering the undead.",
+    "description": "Your time in the rink has taught you that sometimes the best way forward is straight through whoever's trying to block you.",
     "points": 3,
     "skills": [ { "level": 2, "name": "bashing" }, { "level": 2, "name": "swimming" }, { "level": 1, "name": "melee" } ],
     "traits": [ "PROF_SKATER" ]
@@ -671,7 +634,14 @@
     "name": "Deep Frying",
     "points": 2,
     "description": "You'd have been a hit at the county fair, but you're cooking for one now.",
-    "proficiencies": [ "prof_frying", "prof_frying_bread", "prof_frying_dessert", "prof_food_prep" ],
+    "proficiencies": [
+      "prof_frying",
+      "prof_frying_bread",
+      "prof_baking_desserts_1",
+      "prof_frying_dessert",
+      "prof_food_prep",
+      "prof_knife_skills"
+    ],
     "skills": [ { "level": 3, "name": "cooking" } ]
   },
   {
@@ -682,15 +652,22 @@
     "description": "Your white lightning could knock out an elephant, but you're drinking alone now.",
     "points": 2,
     "skills": [ { "level": 2, "name": "cooking" }, { "level": 2, "name": "chemistry" } ],
-    "proficiencies": [ "prof_distilling", "prof_beverage_distilling", "prof_fermenting", "prof_food_prep" ]
+    "proficiencies": [
+      "prof_distilling",
+      "prof_beverage_distilling",
+      "prof_fermenting",
+      "prof_food_prep",
+      "prof_brewing",
+      "prof_winemaking"
+    ]
   },
   {
     "subtype": "hobby",
     "type": "profession",
     "id": "coaching",
     "name": "Sports Coaching",
-    "description": "They tore apart your little league team, but you still have team spirit.",
-    "points": 2,
+    "description": "They tore apart your team, but you're determined to keep the team spirit alive.",
+    "points": 1,
     "skills": [ { "level": 3, "name": "speech" }, { "level": 1, "name": "swimming" } ]
   },
   {
@@ -698,7 +675,7 @@
     "subtype": "hobby",
     "id": "gardening",
     "name": "Gardening",
-    "description": "Earning your green thumb will come in handy when the grocery store is overrun.",
+    "description": "Your green thumb will come in handy when the grocery stores are overrun.",
     "points": 1,
     "skills": [ { "level": 2, "name": "survival" }, { "level": 1, "name": "cooking" } ]
   },
@@ -707,7 +684,7 @@
     "subtype": "hobby",
     "id": "ropemaking",
     "name": "Ropemaking",
-    "description": "Your knots are strong, whether from cloth or natural cordage.",
+    "description": "Your knots are strong, whether they're made from cloth or natural cordage.",
     "points": 1,
     "skills": [ { "level": 1, "name": "survival" }, { "level": 1, "name": "tailor" } ],
     "proficiencies": [ "prof_fibers", "prof_fibers_rope" ]
@@ -727,7 +704,7 @@
     "subtype": "hobby",
     "id": "trivia",
     "name": "Trivia",
-    "description": "You love learning and spouting random bits of trivial knowledge.",
+    "description": "You loved learning and sharing interesting facts about many different topics.  None of them are useful anymore, but your strong memory certainly is.",
     "points": 3,
     "skills": [ { "level": 1, "name": "speech" } ],
     "traits": [ "GOODMEMORY" ]
@@ -737,7 +714,7 @@
     "subtype": "hobby",
     "id": "scrapart",
     "name": "Scrap Art",
-    "description": "You spent hours welding discarded scrap into large and intricate designs.  Some say you just welded junk into bigger junk.  You call it art.",
+    "description": "You spent hours welding discarded scrap into large and intricate designs.  Some said you were just welding junk into bigger junk.  You call it art.",
     "points": 2,
     "skills": [ { "level": 2, "name": "fabrication" } ],
     "proficiencies": [ "prof_welding_basic" ]
@@ -747,7 +724,7 @@
     "subtype": "hobby",
     "id": "moshing",
     "name": "Moshing",
-    "description": "You went to loud concerts and spent your time in the mosh pits.  Now that the world's gone to hell, the whole world is your mosh pit.",
+    "description": "You went to loud concerts and spent your time in the mosh pits.  Now that everything's gone to hell, the whole world is your mosh pit.",
     "points": 1,
     "skills": [ { "level": 1, "name": "unarmed" } ],
     "traits": [ "BADHEARING", "MASOCHIST", "PAINRESIST" ]
@@ -756,17 +733,18 @@
     "type": "profession",
     "subtype": "hobby",
     "id": "fireperformance",
-    "name": "Fire Performance",
-    "description": "Whether you twirled, spun, juggled, or ate it, fire was how you grabbed attention.",
-    "points": 2,
-    "traits": [ "PYROMANIA", "ADRENALINE", "DEFT" ]
+    "name": "Fire Performing",
+    "description": "Whether you twirled, spun, juggled, or ate it, your manipulation of flaming objects was impressive and terrifying to behold.",
+    "points": 1,
+    "traits": [ "PYROMANIA", "ADRENALINE", "DEFT" ],
+    "skills": [ { "level": 1, "name": "survival" } ]
   },
   {
     "type": "profession",
     "subtype": "hobby",
     "id": "socialdance",
     "name": "Social Dancing",
-    "description": "You love meeting new people on the dance floor.  Zombies aren't terribly friendly, but they're ready to tango!",
+    "description": "You loved meeting new people on the dance floor.  These zombies aren't terribly friendly, but they're ready to tango!",
     "points": 2,
     "skills": [ { "level": 1, "name": "dodge" }, { "level": 2, "name": "speech" } ],
     "traits": [ "LIGHTSTEP" ]
@@ -779,23 +757,5 @@
     "description": "You make a habit of clearing your thoughts and finding your center, even amidst the chaos of the world.",
     "points": 2,
     "traits": [ "SELFAWARE", "SPIRITUAL" ]
-  },
-  {
-    "type": "profession",
-    "subtype": "hobby",
-    "id": "underweight",
-    "name": "Extreme Dieting",
-    "description": "You lost an awful lot of weight before the Cataclysm.  Now that food is not always close at hand, your skeletal figure presents an additional danger.  You need to gain weight or die trying.",
-    "points": -1,
-    "traits": [ "XS" ]
-  },
-  {
-    "type": "profession",
-    "subtype": "hobby",
-    "id": "obese",
-    "name": "Binge Eating",
-    "description": "You gained an awful lot of weight before the Cataclysm.  Now that mobility is key to survival, your bloated figure presents an additional danger.  You need to lose weight or die trying.",
-    "points": -1,
-    "traits": [ "XXXL" ]
   }
 ]
diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index bd095da97be67..7865e218b1dd4 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -555,6 +555,7 @@
     "points": -1,
     "consume_time_modifier": 1.5,
     "description": "You've been taught proper table manners from your early childhood on; now, you can't even think about eating without being seated at a table and taking your time.  Eating without a table and chair frustrates you, but eating like a civilized person gives you a bigger morale bonus.",
+    "starting_trait": true,
     "valid": false
   },
   {
@@ -631,6 +632,7 @@
     "consume_time_modifier": 1.25,
     "description": "You eat faster, and can eat and drink more, than anyone else!  You also enjoy food more; delicious food is better for your morale, and you don't mind unsavory meals as much.  Activate to skip prompt for overeating.",
     "category": [ "MOUSE", "LUPINE" ],
+    "starting_trait": true,
     "valid": false,
     "active": true,
     "stomach_size_multiplier": 2.0
@@ -771,6 +773,7 @@
     "name": { "str": "Stylish" },
     "points": 2,
     "description": "Practicality is far less important than style.  Your morale is improved by wearing fashionable and attractive clothing.",
+    "starting_trait": true,
     "valid": false
   },
   {
@@ -871,7 +874,6 @@
     "name": { "str": "Martial Arts Training" },
     "points": 2,
     "description": "You have received some martial arts training at a local dojo.  You start with your choice of Karate, Judo, Aikido, Tai Chi, Taekwondo, or Pankration.",
-    "starting_trait": true,
     "player_display": false,
     "initial_ma_styles": [ "style_karate", "style_judo", "style_aikido", "style_tai_chi", "style_taekwondo", "style_pankration" ],
     "valid": false
@@ -882,7 +884,6 @@
     "name": { "str": "Self-Defense Classes" },
     "points": 2,
     "description": "You have taken some self-defense classes at a nearby gym.  You start with your choice of Boxing, Capoeira, Krav Maga, Muay Thai, Ninjutsu, Wing Chun, or Zui Quan.",
-    "starting_trait": true,
     "player_display": false,
     "initial_ma_styles": [
       "style_krav_maga",
@@ -901,7 +902,6 @@
     "name": { "str": "Shaolin Adept" },
     "points": 2,
     "description": "You have studied the arts of the Shaolin monks.  You start with one of the five animal fighting styles: Tiger, Crane, Leopard, Snake, or Dragon.",
-    "starting_trait": true,
     "player_display": false,
     "initial_ma_styles": [ "style_tiger", "style_crane", "style_leopard", "style_snake", "style_dragon" ],
     "valid": false
@@ -912,7 +912,6 @@
     "name": { "str": "Melee Weapon Training" },
     "points": 3,
     "description": "You have practiced fighting with weapons.  You start with your choice of Barbaran Montante, Eskrima, Fencing, Fior Di Battaglia, Medieval Swordsmanship, Niten Ichi-Ryu, Pentjak Silat, or Sōjutsu.",
-    "starting_trait": true,
     "player_display": false,
     "initial_ma_styles": [
       "style_barbaran",
@@ -963,6 +962,7 @@
     "points": -1,
     "description": "You lost an awful lot of weight before the Cataclysm.  Whatever the reason, now that food is not always close at hand, your skeletal figure presents an additional danger.  You need to gain weight or die trying.",
     "purifiable": false,
+    "starting_trait": true,
     "valid": false,
     "cancels": [ "XXXL" ]
   },
@@ -973,6 +973,7 @@
     "points": -1,
     "description": "You gained an awful lot of weight before the Cataclysm.  Whatever the reason, now that mobility is key to survival, your bloated figure presents an additional danger.  You need to lose weight or die trying.",
     "purifiable": false,
+    "starting_trait": true,
     "valid": false,
     "cancels": [ "XS" ]
   },
@@ -1453,6 +1454,7 @@
     "name": { "str": "Hoarder" },
     "points": -4,
     "description": "You don't feel right unless you're carrying as much as you can.  You suffer morale penalties for carrying less than maximum volume (weight is ignored).  Xanax can help control this anxiety.",
+    "starting_trait": true,
     "valid": false
   },
   {
@@ -1521,6 +1523,7 @@
     "name": { "str": "Truth Teller" },
     "points": -1,
     "description": "When you try to tell a lie, you blush, stammer, and get all shifty-eyed.  Telling lies and otherwise bluffing will be much more difficult for you.",
+    "starting_trait": true,
     "cancels": [ "LIAR" ],
     "social_modifiers": { "lie": -40 }
   },
@@ -6984,7 +6987,8 @@
     "id": "PYROMANIA",
     "name": { "str": "Pyromaniac" },
     "points": -2,
-    "description": "You have an unhealthy obsession with fire, and you get anxious if you don't light them every now and then or stand near them often.  However, you gain a mood bonus from doing so."
+    "description": "You have an unhealthy obsession with fire, and you get anxious if you don't light them every now and then or stand near them often.  However, you gain a mood bonus from doing so.",
+    "starting_trait": true
   },
   {
     "type": "mutation",
@@ -7567,6 +7571,7 @@
     "name": { "str": "Nomad" },
     "points": -1,
     "description": "You're too adventurous for your own good.  The more time you spend somewhere, the unhappier it makes you to be there.",
+    "starting_trait": true,
     "changes_to": [ "NOMAD2" ],
     "category": [ "BIRD", "FISH", "CHIMERA" ]
   },