diff --git a/source/behavior/entities/1.10.0/minecraft.entity.json b/source/behavior/entities/1.10.0/minecraft.entity.json
index fa60c404..63b359f0 100644
--- a/source/behavior/entities/1.10.0/minecraft.entity.json
+++ b/source/behavior/entities/1.10.0/minecraft.entity.json
@@ -3,6 +3,7 @@
   "title": "Entity 1.10.0",
   "required": ["description"],
   "additionalProperties": false,
+  "type": "object",
   "properties": {
     "description": {
       "required": ["identifier"],
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.beg.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.beg.json
index b17ef107..9f64ea9e 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.beg.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.beg.json
@@ -10,7 +10,12 @@
     "items": {
       "type": "array",
       "description": "List of items that this mob likes",
-      "items": { "type": "string", "description": "UNDOCUMENTED: properties", "title": "Properties" },
+      "items": {
+        "type": "string",
+        "description": "List of items that this mob likes",
+        "title": "Properties",
+        "$ref": "../../../../general/item/identifier.json"
+      },
       "title": "Properties"
     },
     "look_distance": { "type": "number", "default": 8, "description": "Distance in blocks the mob will beg from", "title": "Look Distance" },
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
index f6fa4e8d..e5818c15 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.drink_potion.json
@@ -8,14 +8,17 @@
   "properties": {
     "priority": { "$ref": "./types/priority.json" },
     "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
-    "speed_modifier": { "default": 0.0, "description": "UNDOCUMENTED: speed modifier", "title": "Speed Modifier" },
+    "speed_modifier": { "default": 0.0, "description": "Movement speed modifier of the mob when using this AI Goal", "title": "Speed Modifier" },
     "potions": {
       "type": "array",
+      "title": "Potions",
       "description": "A list of potions that this entity can drink.",
       "items": {
         "required": ["id", "chance", "filters"],
         "additionalProperties": false,
+        "title": "Potions",
         "type": "object",
+        "description": "A potion that this entity can drink.",
         "properties": {
           "id": { "type": "integer", "default": -1, "description": "The registry ID of the potion to use", "title": "Id" },
           "chance": {
@@ -30,11 +33,8 @@
             "description": "The filters to use when determining if this potion can be selected.",
             "$ref": "../../filters/filters.json"
           }
-        },
-        "description": "UNDOCUMENTED: potions",
-        "title": "Potions"
-      },
-      "title": "Potions"
+        }
+      }
     }
   }
 }
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json
index eed00de6..103b8a3b 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.explore_outskirts.json
@@ -15,6 +15,7 @@
       "title": "Explore Dist"
     },
     "wait_time": { "type": "integer", "default": 0, "description": "The time the mob will stand around `searching` for POIs", "title": "Wait Time" },
+
     "next_xz": { "title": "Next XZ", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "type": "integer" },
     "next_y": { "title": "Next Y", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "type": "integer" },
     "min_wait_time": { "title": "Minimum Wait Time", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "type": "number" },
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.hurt_by_target.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.hurt_by_target.json
index 455e48e6..788eab46 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.hurt_by_target.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.hurt_by_target.json
@@ -1,5 +1,5 @@
 {
-  "$id": "blockception.minecraft.behavior.entities.1.8.0.minecraft.behavior.guardian_attack",
+  "$id": "blockception.minecraft.behavior.entities.1.8.0.minecraft.behavior.hurt_by_target",
   "type": "object",
   "title": "Guardian Attack 1.8.0",
   "additionalProperties": false,
@@ -7,7 +7,11 @@
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/priority.json" },
-    "entity_types": { "$ref": "../types/entity_types.json", "description": "UNDOCUMENTED: entity types", "title": "Entity Types" },
+    "entity_types": {
+      "$ref": "../types/entity_types.json",
+      "description": "List of entity types that this mob can target if they hurt their owner",
+      "title": "Entity Types"
+    },
     "alert_same_type": {
       "type": "boolean",
       "default": false,
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.jump_to_block.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.jump_to_block.json
index e16b26af..26100d96 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.jump_to_block.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.jump_to_block.json
@@ -1,53 +1,49 @@
 {
-  "$id": "blockception.minecraft.behavior.entities.1.8.0.minecraft.behavior.melee_attack",
+  "$id": "blockception.minecraft.behavior.entities.1.8.0.minecraft.behavior.jump_to_block",
   "type": "object",
   "title": "Melee Attack 1.8.0",
-  "description": "Allows the mob to use close combat melee attacks.",
+  "description": "Allows the mob to search around for a block to jump to and then jump to that block.",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "./types/priority.json" },
     "search_width": {
-      "type": "number",
-      "title": "Search Range",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED"
+      "type": "integer",
+      "title": "Search Width",
+      "default": 8,
+      "description": "The maximum width in blocks that the mob will search. Range [2, 15]."
     },
     "search_height": {
-      "type": "number",
+      "type": "integer",
+      "default": 10,
       "title": "Search Height",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED"
+      "description": "The maximum height in blocks that the mob will search. Range [2, 15]."
     },
-
     "minimum_path_length": {
-      "type": "number",
+      "type": "integer",
+      "default": 5,
       "title": "Minimum Path Length",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED"
+      "description": "The minimum length in blocks of the mob's path to a block in order to consider jumping to it."
     },
     "minimum_distance": {
       "type": "number",
+      "default": 5,
       "title": "Minimum Distance",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED"
+      "description": "The minimum distance in blocks from the mob to a block in order to consider jumping to it."
     },
-
     "scale_factor": {
       "type": "number",
       "title": "Scale Factor",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED"
+      "default": 0.7,
+      "description": "The scale factor of the bounding box of the mob while it is jumping."
     },
-
     "cooldown_range": {
-      "title": "Cooldown range",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
+      "title": "Cooldown Range",
+      "description": "The minimum and maximum cooldown time-range in seconds between each attempted jump.",
       "type": "array",
       "items": [
-        { "title": "Min", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "type": "integer", "minimum": 0 },
-        { "title": "Max", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "type": "integer", "minimum": 0 }
+        { "title": "Minimum", "description": "Minimum", "type": "integer", "minimum": 0 },
+        { "title": "Maximum", "description": "Maximum", "type": "integer", "minimum": 0 }
       ]
     }
   }
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.melee_attack.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.melee_attack.json
index 19958b03..3ed1261e 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.melee_attack.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.melee_attack.json
@@ -8,12 +8,6 @@
   "properties": {
     "priority": { "$ref": "./types/priority.json" },
     "speed_multiplier": { "$ref": "./types/speed_multiplier.json" },
-    "cooldown_time": {
-      "type": "number",
-      "title": "Cooldown Time",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED"
-    },
     "melee_fov": {
       "type": "number",
       "default": 90.0,
@@ -46,6 +40,12 @@
       "description": "If true, this goal will only trigger if the mob can reach its target.",
       "title": "Require Complete Path"
     },
+    "cooldown_time": {
+      "type": "number",
+      "title": "Cooldown Time",
+      "description": "UNDOCUMENTED",
+      "$comment": "UNDOCUMENTED"
+    },
     "on_attack": {
       "$ref": "../types/event.json",
       "title": "On Attack",
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json
index df5e88ac..2deea4e9 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.ocelot_sit_on_block.json
@@ -1,8 +1,7 @@
 {
   "$id": "blockception.minecraft.behavior.entities.1.8.0.minecraft.behavior.ocelot_sit_on_block",
   "additionalProperties": false,
-  "description": "UNDOCUMENTED",
-  "$comment": "UNDOCUMENTED",
+  "description": "Allows an entity to sit in place, similar to the ocelot entity animation pose.",
   "type": "object",
   "title": "Ocelot Sit On Block 1.8.0",
   "required": [],
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.play_dead.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.play_dead.json
index 04658d2e..4cfc1def 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.play_dead.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.play_dead.json
@@ -1,60 +1,56 @@
 {
   "$id": "blockception.minecraft.behavior.entities.1.8.0.minecraft.behavior.play_dead",
-  "description": "UNDOCUMENTED",
-  "$comment": "UNDOCUMENTED",
+  "description": "Allows the mob to play dead when attacked by other entities. When playing dead, other entities will not target this mob.",
   "type": "object",
-  "title": "Play dead 1.8.0",
+  "title": "Play Dead 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/priority.json" },
     "duration": {
       "title": "Duration",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
+      "description": "The amount of time in seconds that the mob will remain playing dead.",
       "type": "number",
       "minimum": 0
     },
     "force_below_health": {
       "title": "Force Below Health",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
+      "description": "The amount of health at which the mob will start to play dead.",
       "type": "number",
       "minimum": 0
     },
     "random_start_chance": {
       "title": "Random Start Chance",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
+      "description": "The likelihood that the mob will start to play dead upon taking damage.",
       "type": "number",
       "minimum": 0
     },
     "random_damage_range": {
       "title": "Random Damage Range",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
+      "description": "The range of damage that may cause the mob to start playing dead. Damage taken below the minimum value will never cause the mob to start playing dead. Damage taken above the maximum value will always cause the mob to start playing dead.",
       "type": "array",
       "items": [
-        { "title": "Min", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "type": "integer", "minimum": 0 },
-        { "title": "Max", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "type": "integer", "minimum": 0 }
+        { "title": "Minimum", "description": "Minimum", "type": "integer", "minimum": 0 },
+        { "title": "Maximum", "description": "Maximum", "type": "integer", "minimum": 0 }
       ]
     },
     "damage_sources": {
-      "title": "Damage sources",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
-      "type": "array",
-      "items": {
-        "title": "Damage Source",
-        "description": "UNDOCUMENTED",
-        "$comment": "UNDOCUMENTED",
-        "$ref": "../../../../general/entity_damage.json"
-      }
+      "title": "Damage Sources",
+      "description": "The list of Entity Damage Sources that will cause this mob to start playing dead.",
+      "oneOf": [
+        { "type": "string", "$ref": "../../../../general/entity_damage.json" },
+        {
+          "type": "array",
+          "items": {
+            "title": "Damage Source",
+            "$ref": "../../../../general/entity_damage.json"
+          }
+        }
+      ]
     },
     "apply_regeneration": {
-      "title": "Apply regeneration",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
+      "title": "Apply Regeneration",
+      "description": "Whether the mob will receive the effect of CombatRegeneration while playing dead.",
       "type": "boolean"
     },
     "filters": { "$ref": "../../filters/filters.json" }
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.raid_garden.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.raid_garden.json
index eb9bf8be..a6f34d6f 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.raid_garden.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.raid_garden.json
@@ -33,7 +33,7 @@
       "description": "Distance in blocks within the mob considers it has reached the goal. This is the `wiggle room` to stop the AI from bouncing back and forth trying to reach a specific spot",
       "title": "Goal Radius"
     },
-    "max_to_eat": { "type": "integer", "default": 6, "description": "Maximum number of things this entity wants to eat", "title": "Maximum to eat" },
+    "max_to_eat": { "type": "integer", "default": 6, "description": "Maximum number of things this entity wants to eat", "title": "Maximum To Eat" },
     "search_range": {
       "type": "integer",
       "default": 0,
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.ram_attack.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.ram_attack.json
index e993560b..7b6f4585 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.ram_attack.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.ram_attack.json
@@ -1,73 +1,81 @@
 {
   "$id": "blockception.minecraft.behavior.entities.1.8.0.minecraft.behavior.ram_attack",
-  "description": "UNDOCUMENTED",
-  "$comment": "UNDOCUMENTED",
+  "description": "Allows the mob to search for a random target and, if a direct path exists between the mob and the target, it will perform a charge. If the attack hits, the target will be knocked back based on the mob's speed.",
   "type": "object",
   "title": "Ram Attack 1.8.0",
   "additionalProperties": false,
   "required": [],
   "properties": {
     "priority": { "$ref": "types/priority.json" },
-    "run_speed": {
-      "title": "Run speed",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
-      "type": "number"
-    },
-    "ram_speed": {
-      "title": "Ram speed",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
-      "type": "number"
-    },
-    "min_ram_distance": {
-      "title": "Minimum Ram speed",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
-      "type": "number"
-    },
-    "ram_distance": {
-      "title": "Ram Distance",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
-      "type": "number"
-    },
-    "knockback_force": {
-      "title": "Knockback force",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
-      "type": "number"
-    },
-    "knockback_height": {
-      "title": "Knockback height",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
-      "type": "number"
-    },
-    "pre_ram_sound": {
-      "title": "Pre ram sound",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
-      "type": "string"
-    },
-    "ram_impact_sound": {
-      "title": "Ram impact sound",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
-      "type": "string"
+    "baby_knockback_modifier": {
+      "type": "integer",
+      "default": 4,
+      "description": "The modifier to knockback for baby mobs.",
+      "title": "Baby Knockback Modifier"
     },
     "cooldown_range": {
-      "title": "Cooldown range",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED",
       "type": "array",
+      "default": [10.0, 20.0],
+      "description": "The minimum and maximum cooldown time-range in seconds between each attempted ram attack.",
+      "title": "Cooldown Range",
       "items": [
-        { "title": "Min", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "type": "integer", "minimum": 0 },
-        { "title": "Max", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "type": "integer", "minimum": 0 }
+        { "title": "Minimum", "description": "Minimum", "type": "number", "minimum": 0 },
+        { "title": "Maximum", "description": "Maximum", "type": "number", "minimum": 0 }
       ]
     },
+    "knockback_force": {
+      "type": "number",
+      "default": 5,
+      "description": "The force of the knockback of the ram's attack.",
+      "title": "Knockback Force"
+    },
+    "knockback_height": {
+      "type": "number",
+      "default": 0.1,
+      "description": "The height in blocks of the knockback of the ram attack.",
+      "title": "Knockback Height"
+    },
+    "min_ram_distance": {
+      "type": "integer",
+      "default": 4,
+      "description": "The minimum distance in blocks at which the mob can start a ram attack.",
+      "title": "Min Ram Distance"
+    },
+    "pre_ram_sound": {
+      "type": "string",
+      "description": "The sound to play when the mob is about to perform a ram attack.",
+      "title": "Pre Ram Sound"
+    },
+    "ram_distance": {
+      "type": "integer",
+      "default": 7,
+      "description": "The distance in blocks at which the mob will start to ram its target.",
+      "title": "Ram Distance"
+    },
+    "ram_impact_sound": {
+      "type": "string",
+      "description": "The sound to play when the mob hits the target with a ram attack .",
+      "title": "Ram Impact Sound"
+    },
+    "ram_speed": {
+      "type": "number",
+      "default": 2,
+      "description": "Sets the mob's speed when performing a ram attack toward the target.",
+      "title": "Ram Speed"
+    },
+    "run_speed": {
+      "type": "number",
+      "default": 1,
+      "description": "Sets the mob's speed when running toward the target.",
+      "title": "Run Speed"
+    },
+    "trigger": {
+      "description": "The event to trigger when attacking.",
+      "title": "Trigger",
+      "$ref": "../types/trigger.json"
+    },
     "on_start": {
-      "title": "On start",
+      "title": "On Start",
       "description": "UNDOCUMENTED",
       "$comment": "UNDOCUMENTED",
       "$ref": "../types/event.json"
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.random_look_around.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.random_look_around.json
index 7020bef2..e425807d 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.random_look_around.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.random_look_around.json
@@ -8,11 +8,24 @@
   "properties": {
     "priority": { "$ref": "./types/priority.json" },
     "look_time": {
-      "$ref": "../types/range_number_type.json",
-      "default": [2, 4],
+      "title": "Look Time",
       "description": "The range of time in seconds the mob will stay looking in a random direction before looking elsewhere",
-      "title": "Look Time"
+      "oneOf": [
+        { "type": "number" },
+        {
+          "type": "array",
+          "items": [
+            { "type": "number", "title": "Minimum", "description": "Minimum" },
+            { "type": "number", "title": "Maximum", "description": "Maximum" }
+          ]
+        }
+      ]
     },
-    "look_distance": { "type": "number", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED", "title": "Look Distance" }
+    "look_distance": {
+      "description": "UNDOCUMENTED",
+      "$comment": "UNDOCUMENTED",
+      "title": "Look Distance",
+      "type": "number"
+    }
   }
 }
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.rise_to_liquid_level.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
index d817c3d3..3319d386 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.rise_to_liquid_level.json
@@ -10,10 +10,17 @@
     "liquid_y_offset": {
       "type": "number",
       "title": "Liquid Y Offset",
-      "description": "UNDOCUMENTED",
-      "$comment": "UNDOCUMENTED"
+      "description": "Vertical offset from the liquid"
     },
-    "rise_delta": { "type": "number", "title": "Rise Delta", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED" },
-    "sink_delta": { "type": "number", "title": "Sink Delta", "description": "UNDOCUMENTED", "$comment": "UNDOCUMENTED" }
+    "rise_delta": {
+      "type": "number",
+      "title": "Rise Delta",
+      "description": "Displacement for how much the entity will move up in the vertical axis"
+    },
+    "sink_delta": {
+      "type": "number",
+      "title": "Sink Delta",
+      "description": "Displacement for how much the entity will move down in the vertical axis"
+    }
   }
 }
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json
index f2af600c..04be238d 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.summon_entity.json
@@ -60,40 +60,68 @@
             "items": {
               "type": "object",
               "additionalProperties": false,
+              "title": "Sequence",
               "properties": {
-                "delay": { "type": "number", "default": 0, "description": "Amount of time in seconds to wait before this step starts" },
+                "delay": {
+                  "type": "number",
+                  "default": 0,
+                  "description": "Amount of time in seconds to wait before this step starts",
+                  "title": "Delay"
+                },
                 "delay_per_summon": {
                   "type": "number",
                   "default": 0,
+                  "title": "Delay Per Summon",
                   "description": "Amount of time in seconds before each entity is summoned in this step"
                 },
                 "entity_lifespan": {
                   "type": "number",
+                  "title": "Entity Lifespan",
                   "default": -1,
                   "description": "Amount of time in seconds that the spawned entity will be alive for. A value of -1.0 means it will remain alive for as long as it can"
                 },
                 "base_delay": {
                   "type": "number",
                   "default": 0,
-                  "description": "UNDOCUMENTED",
-                  "$comment": "UNDOCUMENTED"
+                  "description": "Amount of time in seconds to wait before this step starts",
+                  "title": "Base Delay"
+                },
+                "entity_type": {
+                  "type": "string",
+                  "description": "The entity type of the entities we will spawn in this step",
+                  "title": "Entity Type"
+                },
+                "num_entities_spawned": {
+                  "type": "integer",
+                  "default": 1,
+                  "description": "Number of entities that will be spawned in this step",
+                  "title": "Number Entities Spawned"
+                },
+                "shape": {
+                  "type": "string",
+                  "default": "line",
+                  "description": "The base shape of this step. Valid values are circle and line",
+                  "title": "Shape"
+                },
+                "size": { "type": "number", "default": 1, "description": "The base size of the entity", "title": "Size" },
+                "sound_event": { "type": "string", "description": "The sound event to play for this step", "title": "Sound Event" },
+                "summon_cap": {
+                  "type": "integer",
+                  "default": 0,
+                  "description": "Maximum number of summoned entities at any given time",
+                  "title": "Summon Cap"
                 },
-                "entity_type": { "type": "string", "description": "The entity type of the entities we will spawn in this step" },
-                "num_entities_spawned": { "type": "integer", "default": 1, "description": "Number of entities that will be spawned in this step" },
-                "shape": { "type": "string", "default": "line", "description": "The base shape of this step. Valid values are circle and line" },
-                "size": { "type": "number", "default": 1, "description": "The base size of the entity" },
-                "sound_event": { "type": "string", "description": "The sound event to play for this step" },
-                "summon_cap": { "type": "integer", "default": 0, "description": "Maximum number of summoned entities at any given time" },
                 "summon_cap_radius": {
                   "type": "number",
                   "default": 0,
-                  "description": "UNDOCUMENTED",
-                  "$comment": "UNDOCUMENTED"
+                  "description": "Maximum radius where the summon entities can spawn",
+                  "title": "Summon Cap Radius"
                 },
                 "target": {
                   "type": "string",
                   "default": "self",
-                  "description": "The target of the spell. This is where the spell will start (line will start here, circle will be centered here)"
+                  "description": "The target of the spell. This is where the spell will start (line will start here, circle will be centered here)",
+                  "title": "Target"
                 }
               }
             }
diff --git a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.swim_wander.json b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.swim_wander.json
index ec73d8ce..72d932f7 100644
--- a/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.swim_wander.json
+++ b/source/behavior/entities/1.8.0/behaviors/minecraft.behavior.swim_wander.json
@@ -1,5 +1,5 @@
 {
-  "$id": "blockception.minecraft.behavior.entities.1.8.0.minecraft.behavior.swim_idle",
+  "$id": "blockception.minecraft.behavior.entities.1.8.0.minecraft.behavior.swim_wander",
   "description": "Has the fish swim around when they can't pathfind",
   "type": "object",
   "title": "Swim Idle 1.8.0",
diff --git a/tools/table to json schema.xlsm b/tools/table to json schema.xlsm
index ab3a0248..47b2b471 100644
Binary files a/tools/table to json schema.xlsm and b/tools/table to json schema.xlsm differ