diff --git a/data/Canham_2023/data.csv b/data/Canham_2023/data.csv
index 29cfd3349..aa89079b6 100644
--- a/data/Canham_2023/data.csv
+++ b/data/Canham_2023/data.csv
@@ -6,7 +6,7 @@ Atalaya hemiglauca,AH04,149.297,499.844,42,41.2,-30.42,-2.647654,19.8,67.2,0.758
 Atalaya hemiglauca,AH05,151.109,482.079,44.2,35.9,-30.14,-2.5,12.98331,60,0.761,8.42,5,,
 Atalaya hemiglauca,AH06,168.395,513.422,44.9,24.6,-27.96,-2.980446,17.331,160.8,0.698,11.07,3,-3.75,
 Atalaya hemiglauca,AH07,154.214,491.587,47.3,30.2,-27.78,-2.5,23.7,123.2,0.678,11.76,3,,
-Atalaya hemiglauca,AH08,193.251,487.97,44.7,29,-29.3,-3.237381,20,85.6,0.699,8.98,00,-3.25,
+Atalaya hemiglauca,AH08,193.251,487.97,44.7,29,-29.3,-3.237381,20,85.6,0.699,8.98,0,-3.25,
 Atalaya hemiglauca,AH09,155.456,491.299,46.2,29.3,-29.99,-2.750428,20.9,44.8,0.699,10.72,3,,
 Atalaya hemiglauca,AH10,133.835,497.755,44.3,34.5,-31.27,-2.794474,20.7,172,0.917,6.76,38,-2,
 Barringtonia acutangula,BA01,80.259,319.33,48.8,44,-30.23,-1.201477,24.5,198.4,0.352,5.97,38,,deciduous
@@ -25,14 +25,14 @@ Lysiphyllum cunninghamii,LC03,117.017,534.066,44.6,33.4,-28.06,-2.5,22.09423,22,
 Lysiphyllum cunninghamii,LC04,141.704,540.506,45.1,27.7,-27.92,-3.315685,32.15167,24.8,0.693,11.01,3,,
 Lysiphyllum cunninghamii,LC05,130.219,526.926,44.5,20.1,-28.64,-2.500118,23.12688,31.2,0.716,10.56,6,-3.85,
 Lysiphyllum cunninghamii,LC06,123.583,510.529,45.4,46,-26.96,-1.429048,36.53218,15.2,0.711,10.19,3,,
-Lysiphyllum cunninghamii,LC07,119.726,507.022,46.4,35.4,-29.83,-2.070162,32.033,44,0.68,12.29,00,-2.85,
+Lysiphyllum cunninghamii,LC07,119.726,507.022,46.4,35.4,-29.83,-2.070162,32.033,44,0.68,12.29,0,-2.85,
 Lysiphyllum cunninghamii,LC08,127.747,490.627,42.1,40.8,-27.66,-2.354014,32.17129,14.4,0.634,10.61,10,-2.8,
 Lysiphyllum cunninghamii,LC09,109.395,483.396,44.2,23.1,-29.21,-2.968211,40.19758,11.2,0.708,11.03,31,-2.2,
 Lysiphyllum cunninghamii,LC10,127.158,540.017,44,26.4,-29.01,-2.5,31.0522,24.8,0.784,10.87,5,-3.45,
 Eucalyptus camaldulensis subsp. obtusa,EC01,212.375,517.983,48.7,96.7,-32.9,-1.886637,33.46978,53.6,0.571,7.67,36,,evergreen
 Eucalyptus camaldulensis subsp. obtusa,EC02,137.206,490.308,46.9,79.8,-32.05,-2.038351,26.28469,116,0.615,7.56,19,,
 Eucalyptus camaldulensis subsp. obtusa,EC03,173.927,469.632,47.4,74.1,-30.52,-1.548951,26.3,86.4,0.516,7.71,6,,
-Eucalyptus camaldulensis subsp. obtusa,EC04,173.094,491.974,47.3,73.9,-29.88,-1.605232,24,121.6,0.535,10.82,00,-0.85,
+Eucalyptus camaldulensis subsp. obtusa,EC04,173.094,491.974,47.3,73.9,-29.88,-1.605232,24,121.6,0.535,10.82,0,-0.85,
 Eucalyptus camaldulensis subsp. obtusa,EC05,181.958,480.778,47.3,99.1,-29.11,-1.61502,23.4,74.4,0.54,11.85,2,-0.95,
 Eucalyptus camaldulensis subsp. obtusa,EC06,187.989,492.34,48.6,105.5,-31.4,-1.314039,22.2,200,0.56,10.02,5,-0.55,
 Eucalyptus camaldulensis subsp. obtusa,EC07,196.702,478.6,49,128.2,-34.17,-1.216159,23.8,155.2,0.592,6.14,38,-0.6,
diff --git a/data/Canham_2023/metadata.yml b/data/Canham_2023/metadata.yml
index 3455a13b7..e537bc8b7 100644
--- a/data/Canham_2023/metadata.yml
+++ b/data/Canham_2023/metadata.yml
@@ -170,23 +170,24 @@ contexts:
   category: plot
   var_in: Inundation (days)
   values:
-  - value: 2
-  - value: 3
-  - value: 4
-  - value: 5
-  - value: 6
-  - value: 10
-  - value: 11
-  - value: 12
-  - value: 15
-  - value: 18
-  - value: 19
-  - value: 31
-  - value: 34
-  - value: 36
-  - value: 37
-  - value: 38
-  - value: '00'
+  - value: 38.0
+  - value: 10.0
+  - value: 6.0
+  - value: 5.0
+  - value: 3.0
+  - find: 0.0
+    value: '0.0'
+  - value: 18.0
+  - value: 36.0
+  - value: 4.0
+  - value: 31.0
+  - value: 19.0
+  - value: 2.0
+  - value: 34.0
+  - value: 12.0
+  - value: 15.0
+  - value: 37.0
+  - value: 11.0
 traits:
 - var_in: LMA (g m-2)
   unit_in: g/m2
diff --git a/data/Taseski_2017/metadata.yml b/data/Taseski_2017/metadata.yml
index a25c59c3f..b0a56648d 100644
--- a/data/Taseski_2017/metadata.yml
+++ b/data/Taseski_2017/metadata.yml
@@ -91,7 +91,7 @@ traits:
   replicates: unknown
   methods: Following methods described in (Perez-Harguindeguy et al. 2013).
 - var_in: leaf_mass_per_area
-  unit_in: .na
+  unit_in: g/cm2
   trait_name: leaf_mass_per_area
   entity_type: population
   value_type: mean
@@ -189,6 +189,4 @@ taxonomic_updates:
   reason: match_07_fuzzy. Fuzzy alignment with accepted canonical name in APC (2022-11-10)
   taxonomic_resolution: Species
 exclude_observations: .na
-questions:
-  additional_traits: The author has individual level data and also trait data linked
-    to individual plots, that we're hoping to include in AusTraits in the future.
+questions: .na
diff --git a/data/Yang_2023/metadata.yml b/data/Yang_2023/metadata.yml
index 4ea7a23da..85f28e889 100644
--- a/data/Yang_2023/metadata.yml
+++ b/data/Yang_2023/metadata.yml
@@ -84,7 +84,11 @@ dataset:
   custom_R_code: '
     data %>%
       mutate(
-        seedbank_longevity = seed_longevity_categorical
+        seedbank_longevity = seed_longevity_categorical,
+        entity_type = "species",
+        entity_type = ifelse(!is.na(fire_severity), "population", entity_type),
+        entity_type = ifelse(!is.na(fire_intensity), "population", entity_type),
+        entity_type = ifelse(!is.na(habitat_conditions), "population", entity_type)
       )
   '
   collection_date: unknown/2022
@@ -94,6 +98,7 @@ dataset:
     online state and national floras and the taxonomic literature.
   basis_of_record: field
   life_stage: adult
+  entity_type: entity_type
   sampling_strategy: This dataset is sourced from Australia's online state and national
     floras and the taxonomic literature. Briefly, the textual descriptions of each
     taxon were downloaded and organised into a tabular format of individual taxon
@@ -174,7 +179,6 @@ traits:
 - var_in: fire_response
   unit_in: .na
   trait_name: resprouting_capacity
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -183,7 +187,6 @@ traits:
 - var_in: post_fire_recruitment
   unit_in: .na
   trait_name: post_fire_recruitment
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -192,7 +195,6 @@ traits:
 - var_in: bud_bank_location
   unit_in: .na
   trait_name: bud_bank_location
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -201,7 +203,6 @@ traits:
 - var_in: clonal_spread_mechanism
   unit_in: .na
   trait_name: clonal_spread_mechanism
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -210,7 +211,6 @@ traits:
 - var_in: dispersal_syndrome
   unit_in: .na
   trait_name: dispersal_syndrome
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -219,7 +219,6 @@ traits:
 - var_in: dispersers
   unit_in: .na
   trait_name: dispersers
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -228,7 +227,6 @@ traits:
 - var_in: fire_and_establishing
   unit_in: .na
   trait_name: seedling_establishment_conditions
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -237,7 +235,6 @@ traits:
 - var_in: fire_ephemeral
   unit_in: .na
   trait_name: life_history_ephemeral_class
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -246,7 +243,6 @@ traits:
 - var_in: fire_exposure_level
   unit_in: .na
   trait_name: fire_exposure_level
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -255,7 +251,6 @@ traits:
 - var_in: resprouting_capacity_juvenile
   unit_in: .na
   trait_name: resprouting_capacity_juvenile
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -265,7 +260,6 @@ traits:
 - var_in: fire_response_on_maturity
   unit_in: .na
   trait_name: .na
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -274,7 +268,6 @@ traits:
 - var_in: changes_fire_regime
   unit_in: .na
   trait_name: .na
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -283,7 +276,6 @@ traits:
 - var_in: time_from_fire_to_fruit
   unit_in: a
   trait_name: fire_time_from_fire_to_fruiting
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -292,7 +284,6 @@ traits:
 - var_in: fire_tolerance
   unit_in: .na
   trait_name: .na
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -301,7 +292,6 @@ traits:
 - var_in: post_fire_flowering
   unit_in: .na
   trait_name: post_fire_flowering
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -328,7 +318,6 @@ traits:
 - var_in: seed_longevity_categorical
   unit_in: .na
   trait_name: seedbank_longevity_class
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -337,7 +326,6 @@ traits:
 - var_in: seedbank_longevity
   unit_in: a
   trait_name: seedbank_longevity
-  entity_type: species
   value_type: bin
   basis_of_value: expert_score
   replicates: .na
@@ -346,7 +334,6 @@ traits:
 - var_in: seed_release
   unit_in: .na
   trait_name: .na
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -355,7 +342,6 @@ traits:
 - var_in: seed_storage_location
   unit_in: .na
   trait_name: seedbank_location
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -364,7 +350,6 @@ traits:
 - var_in: serotiny
   unit_in: .na
   trait_name: serotiny
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -373,7 +358,6 @@ traits:
 - var_in: storage_organ
   unit_in: .na
   trait_name: storage_organ
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na
@@ -382,7 +366,6 @@ traits:
 - var_in: threats
   unit_in: .na
   trait_name: .na
-  entity_type: species
   value_type: mode
   basis_of_value: expert_score
   replicates: .na