diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js
index 9c49c075c..4f956c4aa 100644
--- a/kubejs/client_scripts/tooltips.js
+++ b/kubejs/client_scripts/tooltips.js
@@ -283,8 +283,21 @@ const registerTooltips = (event) => {
 		text.add(1, Text.translate("gtceu.universal.tooltip.item_storage_capacity", "9"))
 	})
 
-	//Nuclear Fission Tooltips
+	// Hot or not containers
+	event.addAdvanced(['#tfg:insulating_container'], (item, advanced, text) => {
+		text.add(1, Text.translate("tfg.tooltip.hotornot_container"))
+	})
+	event.addAdvanced(['#tfg:hot_protection_equipment'], (item, advanced, text) => {
+		text.add(1, Text.translate("tfg.tooltip.hotornot_hot_equipment"))
+	})
+	event.addAdvanced(['#tfg:cold_protection_equipment'], (item, advanced, text) => {
+		text.add(1, Text.translate("tfg.tooltip.hotornot_cold_equipment"))
+	})
+	event.addAdvanced(['#tfg:floating_protection_equipment'], (item, advanced, text) => {
+		text.add(1, Text.translate("tfg.tooltip.hotornot_floating_equipment"))
+	})
 
+	//Nuclear Fission Tooltips
 	event.addAdvanced(['minecraft:blue_ice'], (item, advanced, text) => {
 		text.add(1, Text.translate("tfg.tooltip.component.blue_ice"))
 	})
diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js
index d5d3d82e4..37de5025b 100644
--- a/kubejs/server_scripts/tfc/tags.js
+++ b/kubejs/server_scripts/tfc/tags.js
@@ -584,8 +584,8 @@ function registerTFCFluidTags(event) {
             if (temp >= 1300) {
                 event.add("tfchotornot:hot_whitelist", idStr);
             }
-            // Frostburns ya.
-            if (temp < 223) {
+            // Frostburns ya. (The zero check is to stop 'invalid' fluids from counting as too cold)
+            if (temp < 223 && temp > 0) {
                 event.add("tfchotornot:cold_whitelist", idStr);
             }
             // Blue steel: can do heat, can't do cryo.
diff --git a/kubejs/server_scripts/tfchotornot/tags.js b/kubejs/server_scripts/tfchotornot/tags.js
index 80dfa7aae..7e1daaf8b 100644
--- a/kubejs/server_scripts/tfchotornot/tags.js
+++ b/kubejs/server_scripts/tfchotornot/tags.js
@@ -25,7 +25,7 @@ const registerHotOrNotItemTags = (event) => {
     event.add('tfg:insulating_container', 'gtceu:zpm_quantum_tank')
     event.add('tfg:insulating_container', 'gtceu:uv_quantum_tank')
     event.add('tfg:insulating_container', 'gtceu:uhv_quantum_tank')
-    event.add('tfg:insulating_container', '#tfc:barrels')
+    event.add('tfg:insulating_container', 'gtceu:glass_vial')
     event.add('tfg:insulating_container', 'gtceu:fluid_cell')
     event.add('tfg:insulating_container', 'gtceu:universal_fluid_cell')
     event.add('tfg:insulating_container', 'gtceu:steel_fluid_cell')
@@ -34,10 +34,23 @@ const registerHotOrNotItemTags = (event) => {
     event.add('tfg:insulating_container', 'gtceu:titanium_fluid_cell')
     event.add('tfg:insulating_container', 'gtceu:tungsten_steel_fluid_cell')
 
-    event.add('tfg:prevents_gas_floating', 'create:copper_diving_boots')
-    event.add('tfg:prevents_gas_floating', 'create:netherite_diving_boots')
-    event.add('tfg:prevents_gas_floating', 'ad_astra:space_boots')
-    event.add('tfg:prevents_gas_floating', 'ad_astra:netherite_space_boots')
+    event.add('tfg:hot_protection_equipment', 'tfc:metal/chestplate/blue_steel')
+    event.add('tfg:hot_protection_equipment', 'create:netherite_backtank')
+    event.add('tfg:hot_protection_equipment', 'ad_astra:netherite_space_suit')
+    event.add('tfg:hot_protection_equipment', 'gtceu:quarktech_chestplate')
+    event.add('tfg:hot_protection_equipment', 'gtceu:advanced_quarktech_chestplate')
+
+    event.add('tfg:cold_protection_equipment', 'tfc:metal/chestplate/red_steel')
+    event.add('tfg:cold_protection_equipment', 'ad_astra:space_suit')
+    event.add('tfg:cold_protection_equipment', 'ad_astra:netherite_space_suit')
+    event.add('tfg:cold_protection_equipment', 'gtceu:quarktech_chestplate')
+    event.add('tfg:cold_protection_equipment', 'gtceu:advanced_quarktech_chestplate')
+
+    event.add('tfg:floating_protection_equipment', 'create:copper_diving_boots')
+    event.add('tfg:floating_protection_equipment', 'create:netherite_diving_boots')
+    event.add('tfg:floating_protection_equipment', 'ad_astra:space_boots')
+    event.add('tfg:floating_protection_equipment', 'ad_astra:netherite_space_boots')
+	event.add('tfg:floating_protection_equipment', 'gtceu:quarktech_boots')
 }
 
 const registerHotOrNotFluidTags = (event) => {