diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm
index 8643ea0e8b5..0c644a60234 100644
--- a/code/game/machinery/Freezer.dm
+++ b/code/game/machinery/Freezer.dm
@@ -22,6 +22,18 @@
 	component_parts += new /obj/item/stack/cable_coil(src, 1)
 	RefreshParts()
 
+/obj/machinery/atmospherics/unary/cold_sink/freezer/upgraded/New()
+	..()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/thermomachine(src)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src)
+	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
+	component_parts += new /obj/item/stack/cable_coil(src, 1)
+	RefreshParts()
+	
 /obj/machinery/atmospherics/unary/cold_sink/freezer/RefreshParts()
 	var/H
 	var/T
@@ -85,9 +97,11 @@
 	data["on"] = on ? 1 : 0
 	data["gasPressure"] = round(air_contents.return_pressure())
 	data["gasTemperature"] = round(air_contents.temperature)
+	data["gasTemperatureCelsius"] = round(air_contents.temperature - T0C)
 	data["minGasTemperature"] = round(min_temperature)
 	data["maxGasTemperature"] = round(T20C)
 	data["targetGasTemperature"] = round(current_temperature)
+	data["targetGasTemperatureCelsius"] = round(current_temperature - T0C)
 	
 	var/temp_class = "good"
 	if (air_contents.temperature > (T0C - 20))
@@ -101,7 +115,7 @@
 	if (!ui)
 		// the ui does not exist, so we'll create a new() one
         // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
-		ui = new(user, src, ui_key, "freezer.tmpl", "Gas Cooling System", 440, 300)
+		ui = new(user, src, ui_key, "freezer.tmpl", "Gas Cooling System", 520, 300)
 		// when the ui is first opened this is the data it will use
 		ui.set_initial_data(data)
 		// open the new ui window
@@ -159,6 +173,21 @@
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
 	component_parts += new /obj/item/stack/cable_coil(src, 1)
 	RefreshParts()
+	
+/obj/machinery/atmospherics/unary/heat_reservoir/heater/upgraded/New()
+	..()
+	var/obj/item/weapon/circuitboard/thermomachine/H = new /obj/item/weapon/circuitboard/thermomachine(null)
+	H.build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater
+	H.name = "circuit board (Heater)"
+	component_parts = list()
+	component_parts += H
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src)
+	component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src)
+	component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
+	component_parts += new /obj/item/stack/cable_coil(src, 1)
+	RefreshParts()
 
 /obj/machinery/atmospherics/unary/heat_reservoir/heater/RefreshParts()
 	var/H
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 7df232e9d8d..02a645d919e 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -41,7 +41,8 @@
 	update_icon()
 	update_adjacent()
 
-	craft_holder = new /datum/crafting_holder(src, "table")
+	spawn(5)
+		craft_holder = new /datum/crafting_holder(src, "table")
 
 /obj/structure/table/Destroy()
 	update_adjacent()
diff --git a/nano/templates/freezer.tmpl b/nano/templates/freezer.tmpl
index d45fa135b6f..7e36e008819 100644
--- a/nano/templates/freezer.tmpl
+++ b/nano/templates/freezer.tmpl
@@ -24,7 +24,7 @@
 	<div class="itemContent">		
 		{{:helper.displayBar(data.gasTemperature, data.minGasTemperature, data.maxGasTemperature, data.gasTemperatureClass)}}
 		<div class="statusValue">
-			<span class="{{:data.gasTemperatureClass}}">{{:data.gasTemperature}} K</span>
+			<span class="{{:data.gasTemperatureClass}}">{{:data.gasTemperature}} K ({{:data.gasTemperatureCelsius}} &deg;C)</span>
 		</div>
 	</div>
 </div>
@@ -39,7 +39,7 @@
 			{{:helper.link('-', null, {'temp' : -100}, (data.targetGasTemperature > data.minGasTemperature) ? null : 'disabled')}}
 			{{:helper.link('-', null, {'temp' : -10}, (data.targetGasTemperature > data.minGasTemperature) ? null : 'disabled')}}
 			{{:helper.link('-', null, {'temp' : -1}, (data.targetGasTemperature > data.minGasTemperature) ? null : 'disabled')}}				
-			<div style="float: left; width: 80px; text-align: center;">&nbsp;{{:data.targetGasTemperature}} K&nbsp;</div>
+			<div style="float: left; width: 110px; text-align: center;">&nbsp;{{:data.targetGasTemperature}} K&nbsp; ({{:data.targetGasTemperatureCelsius}} &deg;C)</div>
 			{{:helper.link('+', null, {'temp' : 1}, (data.targetGasTemperature < data.maxGasTemperature) ? null : 'disabled')}}
 			{{:helper.link('+', null, {'temp' : 10}, (data.targetGasTemperature < data.maxGasTemperature) ? null : 'disabled')}}
 			{{:helper.link('+', null, {'temp' : 100}, (data.targetGasTemperature < data.maxGasTemperature) ? null : 'disabled')}}