diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
index f9f17efc85bac..a408ab0e3ea2a 100644
--- a/data/json/items/comestibles/egg.json
+++ b/data/json/items/comestibles/egg.json
@@ -3,13 +3,13 @@
     "type": "COMESTIBLE",
     "id": "egg_bird",
     "name": { "str": "bird egg" },
-    "weight": "55 g",
+    "weight": "50 g",
     "color": "brown",
     "spoils_in": "7 days",
     "comestible_type": "FOOD",
     "symbol": "o",
     "quench": 4,
-    "calories": 80,
+    "calories": 71,
     "description": "A nutritious egg laid by a bird.",
     "price": 44,
     "price_postapoc": 50,
@@ -18,7 +18,7 @@
     "fun": -8,
     "flags": [ "FREEZERBURN", "RAW" ],
     "rot_spawn": "GROUP_EGG_BIRD_WILD",
-    "vitamins": [ [ "calcium", 3 ], [ "iron", 4 ] ],
+    "vitamins": [ [ "iron", "900 μg" ], [ "calcium", "28 mg" ] ],
     "rot_spawn_chance": 50
   },
   {
@@ -48,24 +48,24 @@
   {
     "type": "COMESTIBLE",
     "id": "egg_pigeon",
-    "name": { "str": "pigeon egg" },
+    "name": { "str": "feral pigeon egg" },
     "copy-from": "egg_chicken",
-    "proportional": { "volume": 0.27, "weight": 0.27, "calories": 0.27 },
+    "proportional": { "volume": 0.3, "weight": 0.3, "calories": 0.3 },
     "rot_spawn": "GROUP_EGG_PIGEON"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_crow",
-    "name": { "str": "crow egg" },
+    "name": { "str": "American crow egg" },
     "copy-from": "egg_chicken",
-    "weight": "17 g",
+    "proportional": { "volume": 0.34, "weight": 0.34, "calories": 0.34 },
     "rot_spawn": "GROUP_EGG_CROW"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_raven",
     "name": { "str": "raven egg" },
-    "copy-from": "egg_chicken",
+    "copy-from": "egg_crow",
     "rot_spawn": "GROUP_EGG_RAVEN"
   },
   {
@@ -73,7 +73,7 @@
     "id": "egg_bluejay",
     "name": { "str": "blue jay egg" },
     "copy-from": "egg_chicken",
-    "weight": "6 g",
+    "proportional": { "volume": 0.18, "weight": 0.18, "calories": 0.18 },
     "rot_spawn": "GROUP_EGG_BLUEJAY"
   },
   {
@@ -81,17 +81,17 @@
     "id": "egg_cardinal",
     "name": { "str": "cardinal egg" },
     "copy-from": "egg_chicken",
-    "weight": "5 g",
+    "proportional": { "volume": 0.09, "weight": 0.09, "calories": 0.09 },
     "rot_spawn": "GROUP_EGG_CARDINAL"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_robin",
-    "name": { "str": "robin egg" },
+    "name": { "str": "American robin egg" },
     "copy-from": "egg_chicken",
     "description": "A nutritious egg laid by a robin.  The shell is colored a distinctive light blue.",
-    "weight": "7 g",
     "color": "light_blue",
+    "proportional": { "volume": 0.15, "weight": 0.15, "calories": 0.15 },
     "rot_spawn": "GROUP_EGG_ROBIN"
   },
   {
@@ -99,10 +99,25 @@
     "id": "egg_sparrow",
     "name": { "str": "sparrow egg" },
     "copy-from": "egg_chicken",
-    "calories": 54,
-    "weight": "3 g",
+    "proportional": { "volume": 0.06, "weight": 0.06, "calories": 0.06 },
     "rot_spawn": "GROUP_EGG_SPARROW"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_chickadee",
+    "name": { "str": "black-capped chickadee egg" },
+    "copy-from": "egg_chicken",
+    "proportional": { "volume": 0.03, "weight": 0.03, "calories": 0.03 },
+    "rot_spawn": "GROUP_EGG_CHICKADEE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_waxwing",
+    "name": { "str": "cedar waxwing egg" },
+    "copy-from": "egg_chicken",
+    "proportional": { "volume": 0.06, "weight": 0.06, "calories": 0.06 },
+    "rot_spawn": "GROUP_EGG_WAXWING"
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_duck",
@@ -893,17 +908,13 @@
     "id": "rehydrated_eggs",
     "copy-from": "egg_bird",
     "name": { "str_sp": "rehydrated egg" },
-    "weight": "50 g",
     "color": "yellow",
     "symbol": "%",
     "looks_like": "powder_egg",
     "quench": 2,
-    "calories": 80,
     "description": "Rehydrated eggs.  You can use them instead of eggs when cooking, provided you don't care that they have lost their complete shape.",
     "price": 22,
     "price_postapoc": 25,
-    "material": [ "egg" ],
-    "volume": "50 ml",
     "flags": [  ],
     "fun": -2,
     "rot_spawn": "GROUP_NULL",
diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
index 16e2dafa953b2..85d586c0b5e80 100644
--- a/data/json/monstergroups/eggs.json
+++ b/data/json/monstergroups/eggs.json
@@ -64,6 +64,16 @@
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_sparrow_chick" } ]
   },
+  {
+    "name": "GROUP_EGG_CHICKADEE",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_chickadee_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_WAXWING",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_waxwing_chick" } ]
+  },
   {
     "name": "GROUP_EGG_DUCK",
     "type": "monstergroup",
diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
index b246c36ce4b0c..981bda0f35ad1 100644
--- a/data/json/monstergroups/misc.json
+++ b/data/json/monstergroups/misc.json
@@ -253,6 +253,8 @@
       { "monster": "mon_bluejay", "weight": 5 },
       { "monster": "mon_cardinal", "weight": 5 },
       { "monster": "mon_sparrow", "weight": 10 },
+      { "monster": "mon_chickadee", "weight": 5 },
+      { "monster": "mon_waxwing", "weight": 5 },
       { "monster": "mon_robin", "weight": 10 },
       { "monster": "mon_pigeon", "weight": 10 },
       { "monster": "mon_deer", "weight": 10 },
diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json
index 5ac075653f96d..f1de59072f8ae 100644
--- a/data/json/monstergroups/wilderness.json
+++ b/data/json/monstergroups/wilderness.json
@@ -495,6 +495,8 @@
       { "monster": "mon_pigeon", "weight": 50, "cost_multiplier": 0, "pack_size": [ 1, 3 ] },
       { "monster": "mon_bluejay", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_cardinal", "weight": 25, "cost_multiplier": 0 },
+      { "monster": "mon_chickadee", "weight": 15, "cost_multiplier": 0 },
+      { "monster": "mon_waxwing", "weight": 15, "cost_multiplier": 0 },
       { "monster": "mon_robin", "weight": 35, "cost_multiplier": 0 },
       { "monster": "mon_sparrow", "weight": 25, "cost_multiplier": 0 },
       { "group": "GROUP_STRAY_CATS", "weight": 50, "cost_multiplier": 0 },
@@ -611,6 +613,8 @@
       { "monster": "mon_cardinal", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_robin", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_sparrow", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_chickadee", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_waxwing", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_squirrel", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_hummingbird", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_woodpecker", "weight": 50, "cost_multiplier": 0 }
diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json
index e2149301f3300..e468c01c4c1ff 100644
--- a/data/json/monsters/bird.json
+++ b/data/json/monsters/bird.json
@@ -10,7 +10,7 @@
     "species": [ "BIRD" ],
     "volume": "600 ml",
     "weight": "450 g",
-    "//": "0.75g/ml density for most wild flying birds",
+    "//": "~0.75g/ml density for most wild flying birds",
     "hp": 4,
     "speed": 200,
     "material": [ "flesh" ],
@@ -111,222 +111,103 @@
   {
     "id": "mon_crow",
     "type": "MONSTER",
-    "name": { "str": "crow" },
+    "name": { "str": "American crow" },
     "description": "A small, elegant black bird, famous for its distinctive call.  An intelligent bird, there is a glitter of mischief behind its eyes.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "1000 ml",
-    "weight": "450 g",
-    "hp": 4,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
+    "copy-from": "mon_bird_flying_base",
     "color": "dark_gray",
-    "aggression": -99,
-    "morale": 10,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
     "stomach_size": 30,
     "special_attacks": [ [ "EAT_CARRION", 40 ], [ "EAT_FOOD", 120 ] ],
-    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_flying", "prof_wp_basic_bird" ],
-    "weakpoint_sets": [ "wps_bird_body" ],
-    "harvest": "bird_tiny",
-    "dissect": "dissect_bird_sample_single",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
     "reproduction": { "baby_egg": "egg_crow", "baby_count": 4, "baby_timer": 18 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [
-      "SEES",
-      "HEARS",
-      "SMELLS",
-      "ANIMAL",
-      "PATH_AVOID_DANGER_1",
-      "WARM",
-      "CANPLAY",
-      "FLIES",
-      "SWARMS",
-      "EATS",
-      "SMALL_HIDER"
-    ]
+    "extend": { "flags": [ "EATS" ] }
   },
   {
     "id": "mon_raven",
     "type": "MONSTER",
     "name": { "str": "raven" },
     "description": "A small, elegant black bird, famous for its distinctive call.  A clever bird, there is a glitter of mischief behind its eyes.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "1250 ml",
-    "weight": "1200 g",
-    "hp": 4,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "1960 ml",
+    "weight": "1470 g",
     "color": "dark_gray",
-    "aggression": -99,
-    "morale": 10,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
     "stomach_size": 50,
     "special_attacks": [ [ "EAT_CARRION", 40 ], [ "EAT_FOOD", 120 ] ],
-    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_flying", "prof_wp_basic_bird" ],
-    "weakpoint_sets": [ "wps_bird_body" ],
-    "harvest": "bird_tiny",
-    "dissect": "dissect_bird_sample_single",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
     "reproduction": { "baby_egg": "egg_raven", "baby_count": 5, "baby_timer": 18 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [
-      "SEES",
-      "HEARS",
-      "SMELLS",
-      "ANIMAL",
-      "PATH_AVOID_DANGER_1",
-      "WARM",
-      "CANPLAY",
-      "FLIES",
-      "SWARMS",
-      "EATS",
-      "SMALL_HIDER"
-    ]
+    "extend": { "flags": [ "EATS" ] }
   },
   {
     "id": "mon_bluejay",
     "type": "MONSTER",
     "name": { "str": "blue jay" },
     "description": "A small, noisy bird with distinctive blue feathers.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "550 ml",
-    "weight": "85 g",
-    "hp": 3,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "120 ml",
+    "weight": "90 g",
     "color": "light_blue",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_flying", "prof_wp_basic_bird" ],
-    "weakpoint_sets": [ "wps_bird_body" ],
-    "harvest": "bird_tiny",
-    "dissect": "dissect_bird_sample_single",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_bluejay", "baby_count": 5, "baby_timer": 18 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CANPLAY", "FLIES", "SWARMS", "SMALL_HIDER" ]
+    "reproduction": { "baby_egg": "egg_bluejay", "baby_count": 5, "baby_timer": 18 }
   },
   {
     "id": "mon_cardinal",
     "type": "MONSTER",
     "name": { "str": "cardinal" },
     "description": "A small songbird, famous for its distinctive crest and facial markings.  A well-known example of sexual dimorphism, the males are colored much more vibrantly than the females.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "450 ml",
-    "weight": "40 g",
-    "hp": 3,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "60 ml",
+    "weight": "45 g",
     "color": "red",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_flying", "prof_wp_basic_bird" ],
-    "weakpoint_sets": [ "wps_bird_body" ],
-    "harvest": "bird_tiny",
-    "dissect": "dissect_bird_sample_single",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_cardinal", "baby_count": 3, "baby_timer": 13 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "SMALL_HIDER" ]
+    "reproduction": { "baby_egg": "egg_cardinal", "baby_count": 3, "baby_timer": 16 }
   },
   {
     "id": "mon_robin",
     "type": "MONSTER",
-    "name": { "str": "robin" },
+    "name": { "str": "American robin" },
     "description": "A brown songbird with a reddish-orange breast.  Their eggs are a distinctive shade of blue.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "550 ml",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "103 ml",
     "weight": "77 g",
-    "hp": 3,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
     "color": "brown",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_flying", "prof_wp_basic_bird" ],
-    "weakpoint_sets": [ "wps_bird_body" ],
-    "harvest": "bird_tiny",
-    "dissect": "dissect_bird_sample_single",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_robin", "baby_count": 3, "baby_timer": 14 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "SMALL_HIDER" ]
+    "reproduction": { "baby_egg": "egg_robin", "baby_count": 5, "baby_timer": 16 }
   },
   {
     "id": "mon_sparrow",
     "type": "MONSTER",
-    "name": { "str": "sparrow" },
+    "name": { "str": "house sparrow" },
     "description": "A small bird with brown and gray feathers.  Introduced to North America in the 1850s, it is now one of the most abundant birds in the continent.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "400 ml",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "40 ml",
     "weight": "30 g",
-    "hp": 3,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
-    "color": "brown",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_flying", "prof_wp_basic_bird" ],
-    "weakpoint_sets": [ "wps_bird_body" ],
-    "harvest": "bird_tiny",
-    "dissect": "dissect_bird_sample_single",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_sparrow", "baby_count": 5, "baby_timer": 14 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "SMALL_HIDER" ]
+    "reproduction": { "baby_egg": "egg_sparrow", "baby_count": 5, "baby_timer": 16 }
+  },
+  {
+    "id": "mon_chickadee",
+    "type": "MONSTER",
+    "name": { "str": "black-capped chickadee" },
+    "description": "A tiny species of tit native to North America, with a distinctive black cap on its head.",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "16 ml",
+    "weight": "12 g",
+    "reproduction": { "baby_egg": "egg_chickadee", "baby_count": 8, "baby_timer": 14 }
+  },
+  {
+    "id": "mon_chickadee_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 7, "into": "mon_chickadee" }
+  },
+  {
+    "id": "mon_waxwing",
+    "type": "MONSTER",
+    "name": { "str": "cedar waxwing" },
+    "description": "A small species of waxwing with a distinctive feathered crest and a black mask pattern on its face.",
+    "copy-from": "mon_bird_flying_base",
+    "volume": "40 ml",
+    "weight": "30 g",
+    "reproduction": { "baby_egg": "egg_waxwing", "baby_count": 5, "baby_timer": 16 }
+  },
+  {
+    "id": "mon_waxwing_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 8, "into": "mon_waxwing" }
   },
   {
     "id": "mon_duck",
@@ -472,6 +353,17 @@
       "SMALL_HIDER"
     ]
   },
+  {
+    "abstract": "mon_generic_chick_tiny",
+    "type": "MONSTER",
+    "name": { "str": "brown chick" },
+    "description": "A tiny darkly-colored chick, it could be from a number of different species.",
+    "copy-from": "mon_generic_chick",
+    "volume": "7 ml",
+    "weight": "5 g",
+    "upgrades": { "age_grow": 14, "into": "mon_sparrow" },
+    "//": "Grows up into a sparrow as a fallback"
+  },
   {
     "id": "mon_chicken_chick",
     "type": "MONSTER",
@@ -501,7 +393,7 @@
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
       "pet": "The %s runs around your leg."
     },
-    "volume": "250 ml",
+    "volume": "67 ml",
     "weight": "50 g",
     "upgrades": { "age_grow": 36, "into": "mon_crow" }
   },
@@ -509,41 +401,31 @@
     "id": "mon_raven_chick",
     "type": "MONSTER",
     "copy-from": "mon_crow_chick",
-    "volume": "750 ml",
-    "weight": "60 g",
     "upgrades": { "age_grow": 35, "into": "mon_raven" }
   },
   {
     "id": "mon_bluejay_chick",
     "type": "MONSTER",
-    "copy-from": "mon_crow_chick",
-    "volume": "225 ml",
-    "weight": "38 g",
-    "upgrades": { "age_grow": 18, "into": "mon_bluejay" }
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 10, "into": "mon_bluejay" }
   },
   {
     "id": "mon_cardinal_chick",
     "type": "MONSTER",
-    "copy-from": "mon_generic_chick",
-    "volume": "200 ml",
-    "weight": "15 g",
-    "upgrades": { "age_grow": 11, "into": "mon_cardinal" }
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 10, "into": "mon_cardinal" }
   },
   {
     "id": "mon_robin_chick",
     "type": "MONSTER",
-    "copy-from": "mon_generic_chick",
-    "volume": "215 ml",
-    "weight": "35 g",
-    "upgrades": { "age_grow": 14, "into": "mon_robin" }
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 7, "into": "mon_robin" }
   },
   {
     "id": "mon_sparrow_chick",
     "type": "MONSTER",
-    "copy-from": "mon_generic_chick",
-    "volume": "175 ml",
-    "weight": "12 g",
-    "upgrades": { "age_grow": 15, "into": "mon_sparrow" }
+    "copy-from": "mon_generic_chick_tiny",
+    "upgrades": { "age_grow": 7, "into": "mon_sparrow" }
   },
   {
     "id": "mon_turkey_chick",
@@ -678,7 +560,7 @@
     "id": "mon_pigeon_chick",
     "type": "MONSTER",
     "copy-from": "mon_generic_chick",
-    "upgrades": { "age_grow": 16, "into": "mon_pigeon" },
+    "upgrades": { "age_grow": 10, "into": "mon_pigeon" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
index b03a17a123a11..70473f85704db 100644
--- a/data/json/requirements/cooking_components.json
+++ b/data/json/requirements/cooking_components.json
@@ -95,13 +95,15 @@
         [ "egg_bird_unfert", 1 ],
         [ "egg_chicken", 1 ],
         [ "egg_grouse", 1 ],
-        [ "egg_crow", 1 ],
-        [ "egg_raven", 1 ],
-        [ "egg_bluejay", 1 ],
-        [ "egg_cardinal", 1 ],
-        [ "egg_robin", 1 ],
-        [ "egg_pigeon", 1 ],
-        [ "egg_sparrow", 2 ],
+        [ "egg_crow", 3 ],
+        [ "egg_raven", 3 ],
+        [ "egg_bluejay", 6 ],
+        [ "egg_cardinal", 12 ],
+        [ "egg_robin", 7 ],
+        [ "egg_pigeon", 3 ],
+        [ "egg_sparrow", 20 ],
+        [ "egg_waxwing", 20 ],
+        [ "egg_chickadee", 50 ],
         [ "egg_duck", 1 ],
         [ "egg_goose_canadian", 1 ],
         [ "egg_turkey", 1 ],
diff --git a/data/mods/Tamable_Wildlife/bird.json b/data/mods/Tamable_Wildlife/bird.json
index c59a7094f8b40..7d9810289bc1f 100644
--- a/data/mods/Tamable_Wildlife/bird.json
+++ b/data/mods/Tamable_Wildlife/bird.json
@@ -3,7 +3,6 @@
     "id": "mon_crow",
     "type": "MONSTER",
     "copy-from": "mon_crow",
-    "name": { "str": "crow" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -15,7 +14,6 @@
     "id": "mon_raven",
     "type": "MONSTER",
     "copy-from": "mon_raven",
-    "name": { "str": "raven" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -27,7 +25,6 @@
     "id": "mon_bluejay",
     "type": "MONSTER",
     "copy-from": "mon_bluejay",
-    "name": { "str": "blue jay" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -39,7 +36,6 @@
     "id": "mon_cardinal",
     "type": "MONSTER",
     "copy-from": "mon_cardinal",
-    "name": { "str": "cardinal" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -51,7 +47,6 @@
     "id": "mon_robin",
     "type": "MONSTER",
     "copy-from": "mon_robin",
-    "name": { "str": "robin" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -63,7 +58,6 @@
     "id": "mon_sparrow",
     "type": "MONSTER",
     "copy-from": "mon_sparrow",
-    "name": { "str": "sparrow" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -72,10 +66,9 @@
     "extend": { "flags": [ "CANPLAY" ] }
   },
   {
-    "id": "mon_duck",
+    "id": "mon_chickadee",
     "type": "MONSTER",
-    "copy-from": "mon_duck",
-    "name": { "str": "duck" },
+    "copy-from": "mon_chickadee",
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -84,10 +77,9 @@
     "extend": { "flags": [ "CANPLAY" ] }
   },
   {
-    "id": "mon_goose_canadian",
+    "id": "mon_waxwing",
     "type": "MONSTER",
-    "copy-from": "mon_goose_canadian",
-    "name": { "str": "goose", "str_pl": "geese" },
+    "copy-from": "mon_waxwing",
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -96,10 +88,9 @@
     "extend": { "flags": [ "CANPLAY" ] }
   },
   {
-    "id": "mon_turkey",
+    "id": "mon_duck",
     "type": "MONSTER",
-    "copy-from": "mon_turkey",
-    "name": { "str": "turkey" },
+    "copy-from": "mon_duck",
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -108,10 +99,9 @@
     "extend": { "flags": [ "CANPLAY" ] }
   },
   {
-    "id": "mon_pheasant",
+    "id": "mon_goose_canadian",
     "type": "MONSTER",
-    "copy-from": "mon_pheasant",
-    "name": { "str": "pheasant" },
+    "copy-from": "mon_goose_canadian",
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -120,10 +110,20 @@
     "extend": { "flags": [ "CANPLAY" ] }
   },
   {
-    "id": "mon_pigeon",
+    "id": "mon_turkey",
     "type": "MONSTER",
-    "copy-from": "mon_pigeon",
-    "name": { "str": "pigeon" },
+    "copy-from": "mon_turkey",
+    "petfood": {
+      "food": [ "BIRDFOOD" ],
+      "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
+      "pet": "The %s runs around your leg."
+    },
+    "extend": { "flags": [ "CANPLAY" ] }
+  },
+  {
+    "id": "mon_pheasant",
+    "type": "MONSTER",
+    "copy-from": "mon_pheasant",
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -135,7 +135,6 @@
     "id": "mon_hummingbird",
     "type": "MONSTER",
     "copy-from": "mon_hummingbird",
-    "name": { "str": "hummingbird" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It quickly flies around you and seems friendly.",
@@ -147,7 +146,6 @@
     "id": "mon_woodpecker",
     "type": "MONSTER",
     "copy-from": "mon_woodpecker",
-    "name": { "str": "woodpecker" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -159,7 +157,6 @@
     "id": "mon_coot",
     "type": "MONSTER",
     "copy-from": "mon_coot",
-    "name": { "str": "coot" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -171,7 +168,6 @@
     "id": "mon_cormorant",
     "type": "MONSTER",
     "copy-from": "mon_coot",
-    "name": { "str": "cormorant" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -183,7 +179,6 @@
     "id": "mon_moorhen",
     "type": "MONSTER",
     "copy-from": "mon_coot",
-    "name": { "str": "moorhen" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
@@ -195,7 +190,6 @@
     "id": "mon_grebe",
     "type": "MONSTER",
     "copy-from": "mon_coot",
-    "name": { "str": "grebe" },
     "petfood": {
       "food": [ "BIRDFOOD" ],
       "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",