diff --git a/data-final-fixes.lua b/data-final-fixes.lua
index 5ad1fd0..0ed30ce 100644
--- a/data-final-fixes.lua
+++ b/data-final-fixes.lua
@@ -64,18 +64,18 @@ end
 local set_burner_colors = function(entity)
 	local entity = entity_or_bust(entity)
 	if not entity then return end
-	local burner = table_or_bust(get_energy_source(entity))
+	local burner = table_or_bust(adamo.entity.get.energy_source(entity))
 	if not burner then return end
 	local color
 	if burner.type == "fluid" and burner.burns_fluid then
-		color = colors.gas_fire_glow
-	elseif uses_fuel_type("chemical",entity) then
-		color = colors.chemical_fire_glow
+		color = adamo.colors.gas_fire_glow
+	elseif adamo.entity.test.uses_fueltype("chemical",entity) then
+		color = adamo.colors.chemical_fire_glow
 	elseif burner.type == "heat" then
-		color = colors.chemical_fire_glow
+		color = adamo.colors.chemical_fire_glow
 	else return end
-	local min_size = 0.05*get_collision_hypotenuse(entity)
-	local glow_num = 0.3*get_collision_hypotenuse(entity)
+	local min_size = 0.05*adamo.entity.get.collision_hypotenuse(entity)
+	local glow_num = 0.3*adamo.entity.get.collision_hypotenuse(entity)
 	burner.light_flicker = {
 		color = color,
 		minimum_light_size = min_size,
@@ -235,7 +235,7 @@ for _,panel in pairs(data.raw["solar-panel"]) do
 end
 
 for _,battery in pairs(data.raw["accumulator"]) do
-	local energy_source = get_energy_source(battery)
+	local energy_source = adamo.entity.get.energy_source(battery)
 	if energy_source then
 		energy_source.input_flow_limit = 
 			energy_mult(
diff --git a/data-updates.lua b/data-updates.lua
index 7eb89bd..fba85f1 100644
--- a/data-updates.lua
+++ b/data-updates.lua
@@ -15,8 +15,8 @@ heu_fuel_reproc.results = {{"uranium-238",5}}
 heu_fuel_item.fuel_value = "100GJ"
 
 
--- Increasing height of plumbing entities
--- improves megareactor performance.
+-- Increased height of vanilla fluid boxes.
+-- Improves megareactor performance.
 
 -- water pump
 data.raw["offshore-pump"]["offshore-pump"]