diff --git a/src/main/java/net/aufdemrand/denizen/objects/Duration.java b/src/main/java/net/aufdemrand/denizen/objects/Duration.java
index ae3710d213..30a7c37dea 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/Duration.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/Duration.java
@@ -348,7 +348,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <d@duration.in_hours>
-        // @returns Element(double)
+        // @returns Element(Decimal)
         // @description
         // returns the number of hours in the Duration.
         // -->
@@ -358,7 +358,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <d@duration.in_minutes>
-        // @returns Element(double)
+        // @returns Element(Decimal)
         // @description
         // returns the number of minutes in the Duration.
         // -->
@@ -368,7 +368,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <d@duration.in_seconds>
-        // @returns Element(double)
+        // @returns Element(Decimal)
         // @description
         // returns the number of seconds in the Duration.
         // -->
@@ -378,7 +378,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <d@duration.in_ticks>
-        // @returns Element(integer)
+        // @returns Element(Number)
         // @description
         // returns the number of ticks in the Duration. (20t/second)
         // -->
diff --git a/src/main/java/net/aufdemrand/denizen/objects/Element.java b/src/main/java/net/aufdemrand/denizen/objects/Element.java
index 8a0667556e..0e889706ee 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/Element.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/Element.java
@@ -209,7 +209,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <el@element.as_double>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the element as a number with a decimal.
         // -->
@@ -324,7 +324,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <el@element.as_money>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the element as a number with two decimal places.
         // -->
@@ -633,7 +633,7 @@ else if (element.toLowerCase().contains(contains.toLowerCase()))
 
         // <--[tag]
         // @attribute <el@element.abs>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the absolute value of the element.
         // -->
@@ -644,7 +644,7 @@ else if (element.toLowerCase().contains(contains.toLowerCase()))
 
         // <--[tag]
         // @attribute <el@element.add[<#>]>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the element plus a number.
         // -->
@@ -656,7 +656,7 @@ else if (element.toLowerCase().contains(contains.toLowerCase()))
 
         // <--[tag]
         // @attribute <el@element.div[<#>]>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the element divided by a number.
         // -->
@@ -668,7 +668,7 @@ else if (element.toLowerCase().contains(contains.toLowerCase()))
 
         // <--[tag]
         // @attribute <el@element.mod[<#>]>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the remainder of the element divided by a number.
         // -->
@@ -680,7 +680,7 @@ else if (element.toLowerCase().contains(contains.toLowerCase()))
 
         // <--[tag]
         // @attribute <el@element.mul[<#>]>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the element multiplied by a number.
         // -->
@@ -692,7 +692,7 @@ else if (element.toLowerCase().contains(contains.toLowerCase()))
 
         // <--[tag]
         // @attribute <el@element.sqrt>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the square root of the element.
         // -->
@@ -703,7 +703,7 @@ else if (element.toLowerCase().contains(contains.toLowerCase()))
 
         // <--[tag]
         // @attribute <el@element.sub[<#>]>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the element minus a number.
         // -->
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dChunk.java b/src/main/java/net/aufdemrand/denizen/objects/dChunk.java
index 128e75a395..4dc7c857de 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dChunk.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dChunk.java
@@ -216,7 +216,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <ch@chunk.average_height>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // returns the average height of the blocks in the chunk.
         // -->
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
index a08fc65c46..9146e793a7 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -1300,7 +1300,7 @@ else if (attribute.startsWith("equipment")) {
 
         // <--[tag]
         // @attribute <e@entity.fall_distance>
-        // @returns Element(Float)
+        // @returns Element(Decimal)
         // @description
         // Returns how far the entity has fallen.
         // -->
@@ -1436,7 +1436,7 @@ else if ((float) getLivingEntity().getHealth() / maxHealth < 1)
 
         // <--[tag]
         // @attribute <e@entity.health.max>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the maximum health of the entity.
         // -->
@@ -1446,7 +1446,7 @@ else if ((float) getLivingEntity().getHealth() / maxHealth < 1)
 
         // <--[tag]
         // @attribute <e@entity.health.percentage>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the entity's current health as a percentage.
         // -->
@@ -1460,7 +1460,7 @@ else if ((float) getLivingEntity().getHealth() / maxHealth < 1)
 
         // <--[tag]
         // @attribute <e@entity.health>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the current health of the entity.
         // -->
@@ -1566,7 +1566,7 @@ else if ((float) getLivingEntity().getHealth() / maxHealth < 1)
 
         // <--[tag]
         // @attribute <e@entity.last_damage.amount>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the amount of the last damage taken by the entity.
         // -->
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dList.java b/src/main/java/net/aufdemrand/denizen/objects/dList.java
index e7eec9e577..0f15492d35 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dList.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dList.java
@@ -504,7 +504,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <fl@flag_name.is_expired>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns true of the flag is expired or does not exist, false if it
         // is not yet expired, or has no expiration.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java
index bad684b6f1..c3a78c5ee1 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java
@@ -534,7 +534,7 @@ else if (dEntity.matches(attribute.getContext(1))) {
 
         // <--[tag]
         // @attribute <l@location.pitch>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the pitch of the object at the location.
         // -->
@@ -571,7 +571,7 @@ else if (dEntity.matches(attribute.getContext(1))) {
 
         // <--[tag]
         // @attribute <l@location.yaw.raw>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the raw yaw of the object at the location.
         // -->
@@ -582,7 +582,7 @@ else if (dEntity.matches(attribute.getContext(1))) {
 
         // <--[tag]
         // @attribute <l@location.yaw>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the normalized yaw of the object at the location.
         // -->
@@ -857,7 +857,7 @@ public int compare(dEntity ent1, dEntity ent2) {
 
         // <--[tag]
         // @attribute <l@location.x>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the X coordinate of the location.
         // -->
@@ -867,7 +867,7 @@ public int compare(dEntity ent1, dEntity ent2) {
 
         // <--[tag]
         // @attribute <l@location.y>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the Y coordinate of the location.
         // -->
@@ -877,7 +877,7 @@ public int compare(dEntity ent1, dEntity ent2) {
 
         // <--[tag]
         // @attribute <l@location.z>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the Z coordinate of the location.
         // -->
@@ -911,7 +911,7 @@ public int compare(dEntity ent1, dEntity ent2) {
 
         // <--[tag]
         // @attribute <l@location.distance[<location>]>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the distance between 2 locations.
         // -->
@@ -921,7 +921,7 @@ public int compare(dEntity ent1, dEntity ent2) {
 
                 // <--[tag]
                 // @attribute <l@location.distance[<location>].horizontal>
-                // @returns Element(Number)
+                // @returns Element(Decimal)
                 // @description
                 // Returns the horizontal distance between 2 locations.
                 // -->
@@ -929,7 +929,7 @@ public int compare(dEntity ent1, dEntity ent2) {
 
                     // <--[tag]
                     // @attribute <l@location.distance[<location>].horizontal.multiworld>
-                    // @returns Element(Number)
+                    // @returns Element(Decimal)
                     // @description
                     // Returns the horizontal distance between 2 multiworld locations.
                     // -->
@@ -947,7 +947,7 @@ else if (this.getWorld() == toLocation.getWorld())
 
                 // <--[tag]
                 // @attribute <l@location.distance[<location>].vertical>
-                // @returns Element(Number)
+                // @returns Element(Decimal)
                 // @description
                 // Returns the vertical distance between 2 locations.
                 // -->
@@ -955,7 +955,7 @@ else if (attribute.getAttribute(2).startsWith("vertical")) {
 
                     // <--[tag]
                     // @attribute <l@location.distance[<location>].vertical.multiworld>
-                    // @returns Element(Number)
+                    // @returns Element(Decimal)
                     // @description
                     // Returns the vertical distance between 2 multiworld locations.
                     // -->
@@ -989,7 +989,7 @@ else return new Element(this.distance(toLocation))
 
         // <--[tag]
         // @attribute <l@location.biome.humidity>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the current humidity at the location.
         // -->
@@ -999,7 +999,7 @@ else return new Element(this.distance(toLocation))
 
         // <--[tag]
         // @attribute <l@location.biome.temperature>
-        // @returns Element(Number)
+        // @returns Element(Decimal)
         // @description
         // Returns the current temperature at the location.
         // -->
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java b/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java
index 83da762592..055a71db17 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java
@@ -458,7 +458,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.has_gravity>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether the material is affected by gravity.
         // -->
@@ -468,7 +468,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.id>
-        // @returns Element(integer)
+        // @returns Element(Number)
         // @description
         // Returns the material's ID.
         // -->
@@ -478,7 +478,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.is_block>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether the material is a placeable block.
         // -->
@@ -488,7 +488,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.is_burnable>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether the material is a block that can burn away.
         // -->
@@ -498,7 +498,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.is_edible>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether the material is edible.
         // -->
@@ -508,7 +508,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.is_flammable>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether the material is a block that can catch fire.
         // -->
@@ -518,7 +518,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.is_occluding>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether the material is a block that completely blocks vision.
         // -->
@@ -528,7 +528,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.is_record>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether the material is a playable music disc.
         // -->
@@ -538,7 +538,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.is_solid>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether the material is a block that is solid (cannot be walked through).
         // -->
@@ -548,7 +548,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.is_transparent>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether the material is a block that does not block any light.
         // -->
@@ -558,7 +558,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.max_durability>
-        // @returns Element(integer)
+        // @returns Element(Number)
         // @description
         // Returns the maximum durability of this material.
         // -->
@@ -568,7 +568,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.max_stack_size>
-        // @returns Element(integer)
+        // @returns Element(Number)
         // @description
         // Returns the maximum amount of this material that can be held in a stack.
         // -->
@@ -578,7 +578,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <m@material.is_made_of[<material>]>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns true if the material is a variety of the specified material.
         // Example: <m@red_wool.is_made_of[m@wool]> will return true.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java
index 4fb9ae999a..ad844afe6e 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java
@@ -366,7 +366,7 @@ && getCitizen().getTrait(Anchors.class).getAnchor(attribute.getContext(1)) != nu
 
         // <--[tag]
         // @attribute <n@npc.has_flag[flag_name]>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns true if the NPC has the specified flag, otherwise returns false.
         // -->
@@ -610,6 +610,7 @@ && getCitizen().getTrait(ConstantsTrait.class).getConstant(attribute.getContext(
     public void adjust(Mechanism mechanism, Element value) {
 
 
+        // TODO:
 //        getAssignmentTrait().setAssignment();
 //        getAssignmentTrait().removeAssignment();
 //
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
index d97e516149..a226f4798a 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -322,7 +322,7 @@ else return new Element(PlayerTags.playerChatHistory.get(player_name).get(x - 1)
 
         // <--[tag]
         // @attribute <p@player.has_flag[flag_name]>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns true if the Player has the specified flag, otherwise returns false.
         // -->
@@ -340,7 +340,7 @@ else return new Element(PlayerTags.playerChatHistory.get(player_name).get(x - 1)
 
         // <--[tag]
         // @attribute <p@player.money>
-        // @returns Element(number)
+        // @returns Element(Decimal)
         // @description
         // returns the amount of money the player has with the registered Economy system.
         // -->
@@ -461,7 +461,7 @@ else if (attribute.startsWith("list.offline")) {
 
         // <--[tag]
         // @attribute <p@player.first_played>
-        // @returns Element(number)
+        // @returns Element(Number)
         // @description
         // returns the millisecond time of when the player first logged on to this server.
         // -->
@@ -471,7 +471,7 @@ else if (attribute.startsWith("list.offline")) {
 
         // <--[tag]
         // @attribute <p@player.has_played_before>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player has played before.
         // -->
@@ -481,7 +481,7 @@ else if (attribute.startsWith("list.offline")) {
 
         // <--[tag]
         // @attribute <p@player.health.is_scaled>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player's health bar is currently being scaled.
         // -->
@@ -491,7 +491,7 @@ else if (attribute.startsWith("list.offline")) {
 
         // <--[tag]
         // @attribute <p@player.health.scale>
-        // @returns Element(number)
+        // @returns Element(Decimal)
         // @description
         // returns the current scale for the player's health bar
         // -->
@@ -501,7 +501,7 @@ else if (attribute.startsWith("list.offline")) {
 
         // <--[tag]
         // @attribute <p@player.is_banned>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is banned.
         // -->
@@ -511,7 +511,7 @@ else if (attribute.startsWith("list.offline")) {
 
         // <--[tag]
         // @attribute <p@player.is_online>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is currently online.
         // -->
@@ -520,7 +520,7 @@ else if (attribute.startsWith("list.offline")) {
 
         // <--[tag]
         // @attribute <p@player.is_op>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is a full server operator.
         // -->
@@ -530,7 +530,7 @@ else if (attribute.startsWith("list.offline")) {
 
         // <--[tag]
         // @attribute <p@player.is_whitelisted>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is whitelisted.
         // -->
@@ -540,7 +540,7 @@ else if (attribute.startsWith("list.offline")) {
 
         // <--[tag]
         // @attribute <p@player.last_played>
-        // @returns Element(number)
+        // @returns Element(Number)
         // @description
         // returns the millisecond time of when the player
         // was last seen.
@@ -671,7 +671,7 @@ else if (attribute.startsWith("list.offline")) {
 
         // <--[tag]
         // @attribute <p@player.has_permission[permission.node]>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player has the specified node.
         // -->
@@ -686,7 +686,7 @@ else if (attribute.startsWith("list.offline")) {
 
             // <--[tag]
             // @attribute <p@player.has_permission[permission.node].global>
-            // @returns Element(boolean)
+            // @returns Element(Boolean)
             // @description
             // returns whether the player has the specified node, regardless of world.
             // (Note: this may or may not be functional with your permissions system.)
@@ -704,7 +704,7 @@ else if (attribute.getAttribute(2).startsWith("world"))
 
             // <--[tag]
             // @attribute <p@player.has_permission[permission.node].world>
-            // @returns Element(boolean)
+            // @returns Element(Boolean)
             // @description
             // returns whether the player has the specified node in regards to the
             // player's current world.
@@ -718,7 +718,7 @@ else if (attribute.getAttribute(2).startsWith("world"))
 
         // <--[tag]
         // @attribute <p@player.in_group[group_name]>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is in the specified group.
         // -->
@@ -733,7 +733,7 @@ else if (attribute.getAttribute(2).startsWith("world"))
 
             // <--[tag]
             // @attribute <p@player.in_group[group_name].global>
-            // @returns Element(boolean)
+            // @returns Element(Boolean)
             // @description
             // returns whether the player has the group with no regard to the
             // player's current world.
@@ -752,7 +752,7 @@ else if (attribute.getAttribute(2).startsWith("world"))
 
             // <--[tag]
             // @attribute <p@player.in_group[group_name].world>
-            // @returns Element(boolean)
+            // @returns Element(Boolean)
             // @description
             // returns whether the player has the group in regards to the
             // player's current world.
@@ -786,7 +786,7 @@ else if (attribute.getAttribute(2).startsWith("world"))
 
         // <--[tag]
         // @attribute <p@player.allowed_flight>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is allowed to fly.
         // -->
@@ -796,7 +796,7 @@ else if (attribute.getAttribute(2).startsWith("world"))
 
         // <--[tag]
         // @attribute <p@player.fly_speed>
-        // @returns Element(Float)
+        // @returns Element(Decimal)
         // @description
         // returns the speed the player can fly at.
         // -->
@@ -829,7 +829,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.saturation>
-        // @returns Element(number)
+        // @returns Element(Decimal)
         // @description
         // returns the current saturation of the player.
         // -->
@@ -839,7 +839,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.food_level>
-        // @returns Element(number)
+        // @returns Element(Number)
         // @description
         // returns the current food level of the player.
         // -->
@@ -849,7 +849,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.oxygen.max>
-        // @returns Element(number)
+        // @returns Element(Number)
         // @description
         // returns how much air the player can have.
         // -->
@@ -859,7 +859,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.oxygen>
-        // @returns Element(number)
+        // @returns Element(Number)
         // @description
         // returns how much air the player has.
         // -->
@@ -869,7 +869,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.gamemode.id>
-        // @returns Element(number)
+        // @returns Element(Number)
         // @description
         // returns the gamemode ID of the player. 0 = survival, 1 = creative, 2 = adventure
         // -->
@@ -889,7 +889,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.is_blocking>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is currently blocking.
         // -->
@@ -899,7 +899,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.is_flying>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is currently flying.
         // -->
@@ -909,7 +909,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.is_sleeping>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is currently sleeping.
         // -->
@@ -919,7 +919,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.is_sneaking>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is currently sneaking.
         // -->
@@ -929,7 +929,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.is_sprinting>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether the player is currently sprinting.
         // -->
@@ -961,7 +961,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.walk_speed>
-        // @returns Element(Float)
+        // @returns Element(Decimal)
         // @description
         // returns the speed the player can walk at.
         // -->
@@ -971,7 +971,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.weather>
-        // @returns Element(String)
+        // @returns Element
         // @description
         // returns the type of weather the player is experiencing. This can be different
         // from the weather currently in the world that the player is residing in if
@@ -983,7 +983,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.xp.level>
-        // @returns Element(number)
+        // @returns Element(Number)
         // @description
         // returns the number of XP levels the player has.
         // -->
@@ -993,7 +993,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.xp.to_next_level>
-        // @returns Element(number)
+        // @returns Element(Number)
         // @description
         // returns the amount of XP needed to get to the next level.
         // -->
@@ -1003,7 +1003,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.xp.total>
-        // @returns Element(number)
+        // @returns Element(Number)
         // @description
         // returns the total amount of experience points.
         // -->
@@ -1013,7 +1013,7 @@ else if (getPlayerEntity().getFoodLevel() / maxHunger < 1)
 
         // <--[tag]
         // @attribute <p@player.xp>
-        // @returns Element(number)
+        // @returns Element(Decimal)
         // @description
         // returns the percentage of experience points to the next level.
         // -->
@@ -1032,7 +1032,7 @@ public void adjust(Mechanism mechanism, Element value) {
         // <--[mechanism]
         // @object dPlayer
         // @name level
-        // @input Element(Integer)
+        // @input Element(Number)
         // @description
         // Sets the level on the player. Does not affect the current progression
         // of experience towards next level.
@@ -1065,7 +1065,7 @@ public void adjust(Mechanism mechanism, Element value) {
         // <--[mechanism]
         // @object dPlayer
         // @name health_scale
-        // @input Element(Integer)
+        // @input Element(Decimal)
         // @description
         // Sets the 'health scale' on the Player. Each heart equals '2'. The standard health scale is
         // 20, so for example, indicating a value of 40 will display double the amount of hearts
@@ -1111,7 +1111,7 @@ public void adjust(Mechanism mechanism, Element value) {
         // <--[mechanism]
         // @object dPlayer
         // @name saturation
-        // @input Element(Integer)
+        // @input Element(Decimal)
         // @description
         // Sets the current food saturation level of a player.
         // @tags
@@ -1125,7 +1125,7 @@ public void adjust(Mechanism mechanism, Element value) {
         // <--[mechanism]
         // @object dPlayer
         // @name food_level
-        // @input Element(Integer)
+        // @input Element(Number)
         // @description
         // Sets the current food level of a player. Typically, '20' is full.
         // @tags
@@ -1153,7 +1153,7 @@ public void adjust(Mechanism mechanism, Element value) {
         // <--[mechanism]
         // @object dPlayer
         // @name fly_speed
-        // @input Element(Number)
+        // @input Element(Decimal)
         // @description
         // Sets the fly speed of the player. Valid range is 0.0 to 1.0
         // @tags
@@ -1212,7 +1212,7 @@ public void adjust(Mechanism mechanism, Element value) {
         // <--[mechanism]
         // @object dPlayer
         // @name time
-        // @input Element(Integer)
+        // @input Element(Number)
         // @description
         // Sets the time of day the Player is currently experiencing. Setting this will cause the
         // player to have a different time than other Players in the world are experiencing though
@@ -1229,7 +1229,7 @@ public void adjust(Mechanism mechanism, Element value) {
         // <--[mechanism]
         // @object dPlayer
         // @name freeze_time
-        // @input Element(Integer)
+        // @input Element(Number)
         // @description
         // Sets the time of day the Player is currently experiencing and freezes it there. Note:
         // there is a small 'twitch effect' when looking at the sky when time is frozen.
@@ -1265,7 +1265,7 @@ public void adjust(Mechanism mechanism, Element value) {
         // <--[mechanism]
         // @object dPlayer
         // @name walk_speed
-        // @input Element(Number)
+        // @input Element(Decimal)
         // @description
         // Sets the walk speed of the player. The standard value is '0.2'. Valid range is 0.0 to 1.0
         // @tags
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dWorld.java b/src/main/java/net/aufdemrand/denizen/objects/dWorld.java
index 089a90d28a..7a5f539fae 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dWorld.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dWorld.java
@@ -271,7 +271,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <w@world.spawn_location>
-        // @returns Element(Number)
+        // @returns dLocation
         // @description
         // returns the spawn location of the world.
         // -->
@@ -311,7 +311,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <w@world.allows_animals>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether animals can spawn in this world.
         // -->
@@ -321,7 +321,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <w@world.allows_monsters>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether monsters can spawn in this world.
         // -->
@@ -331,7 +331,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <w@world.allows_pvp>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether player versus player combat is allowed in this world.
         // -->
@@ -361,7 +361,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <w@world.can_generate_structures>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // Returns whether the world will generate structures.
         // -->
@@ -481,7 +481,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <w@world.has_storm>
-        // @returns Element(boolean)
+        // @returns Element(Boolean)
         // @description
         // returns whether there is currently a storm in this world.
         // -->
@@ -491,7 +491,7 @@ public String getAttribute(Attribute attribute) {
 
         // <--[tag]
         // @attribute <w@world.weather_duration>
-        // @returns Element
+        // @returns Duration
         // @description
         // Returns the duration of storms.
         // -->