diff --git a/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm b/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm
index b5f2fb2237..ca0a4b55aa 100644
--- a/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm
+++ b/_maps/RandomRuins/SpaceRuins/whiteshipdock.dmm
@@ -3,16 +3,7 @@
 /turf/open/space/basic,
 /area/space)
 "b" = (
-/obj/docking_port/stationary{
-	dheight = 0;
-	dir = 2;
-	dwidth = 11;
-	height = 22;
-	id = "whiteship_away";
-	json_key = "whiteship";
-	name = "Deep Space";
-	width = 35
-	},
+/obj/docking_port/stationary/picked/whiteship,
 /turf/open/space,
 /area/space)
 
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index 23b73cea35..b39a181a38 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -768,8 +768,8 @@
 	if(!(GAS_QCD in largest_values))
 		largest_values[GAS_QCD] = 0
 	var/previous_largest = largest_values[GAS_QCD]
-	var/research_amount = amount * QCD_RESEARCH_AMOUNT
-	if(previous_largest < research_amount)
+	var/research_amount = min(amount * QCD_RESEARCH_AMOUNT, 100000)
+	if(previous_largest <= research_amount)
 		SSresearch.science_tech.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, research_amount)
 		largest_values[GAS_QCD] = research_amount
 	else
diff --git a/code/modules/events/floorcluwne.dm b/code/modules/events/floorcluwne.dm
index 3df636809a..ce9a2d8cc3 100644
--- a/code/modules/events/floorcluwne.dm
+++ b/code/modules/events/floorcluwne.dm
@@ -1,7 +1,7 @@
 /datum/round_event_control/floor_cluwne
 	name = "Floor Cluwne"
 	typepath = /datum/round_event/floor_cluwne
-	max_occurrences = 1
+	max_occurrences = 0
 	min_players = 20
 	weight = 10
 
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index f7f5b335c5..fe44e5fef0 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -42,7 +42,7 @@
 #define THERMAL_RELEASE_MODIFIER 350         //Higher == more heat released during reaction, not to be confused with the above values
 #define THERMAL_RELEASE_CAP_MODIFIER 250     //Higher == lower cap on how much heat can be released per tick--currently 1.3x old value
 #define PLASMA_RELEASE_MODIFIER 750        //Higher == less plasma released by reaction
-#define OXYGEN_RELEASE_MODIFIER 325        //Higher == less oxygen released at high temperature/power
+#define OXYGEN_RELEASE_MODIFIER 550        //Higher == less oxygen released at high temperature/power
 
 #define REACTION_POWER_MODIFIER 0.55       //Higher == more overall power
 
@@ -600,13 +600,13 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	var/max_temp_increase = effective_temperature + ((device_energy * dynamic_heat_modifier) / THERMAL_RELEASE_CAP_MODIFIER)
 	//Calculate how much gas to release
 	//Varies based on power and gas content
-	removed.adjust_moles(GAS_PLASMA, max((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0))
+	removed.adjust_moles(GAS_PLASMA, clamp((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0, 50))
 	//Varies based on power, gas content, and heat
-	removed.adjust_moles(GAS_O2, max(((device_energy + effective_temperature * dynamic_heat_modifier) - T0C) / OXYGEN_RELEASE_MODIFIER, 0))
+	removed.adjust_moles(GAS_O2, clamp((device_energy * dynamic_heat_modifier + effective_temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0, 100))
 
 	if(removed.return_temperature() < max_temp_increase)
 		removed.adjust_heat(device_energy * dynamic_heat_modifier * THERMAL_RELEASE_MODIFIER)
-		removed.set_temperature(min(removed.return_temperature(), max_temp_increase))
+	removed.set_temperature(min(removed.return_temperature(), max_temp_increase))
 
 
 	if(produces_gas)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index dc23a64d3d..1fc81e38b8 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -299,6 +299,16 @@
 		reserved_area = null
 	return ..()
 
+/obj/docking_port/stationary/picked/whiteship
+	name = "Deep Space"
+	id = "whiteship_away"
+	dheight = 0
+	dir = 2
+	dwidth = 11
+	height = 22
+	width = 35
+	shuttlekeys = list("whiteship_meta", "whiteship_pubby", "whiteship_box", "whiteship_cere", "whiteship_kilo", "whiteship_donut", "whiteship_delta")
+
 /obj/docking_port/stationary/picked
 	///Holds a list of map name strings for the port to pick from
 	var/list/shuttlekeys