diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 1cbb13b05ff..37431115b6f 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -15,7 +15,7 @@
 	var/lastout = 0			//Amount of power it actually outputs to the powernet
 	var/loaddemand = 0		//For use in restore()
 	var/capacity = 5e6		//Maximum amount of power it can hold
-	var/charge = 2.0e6		//Current amount of power it holds
+	var/charge = 1.0e6		//Current amount of power it holds
 	var/charging = 0		//1 if it's actually charging, 0 if not
 	var/chargemode = 0		//1 if it's trying to charge, 0 if not.
 	//var/chargecount = 0
diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm
index f3ee2000011..cb22fb197a5 100644
--- a/code/modules/supermatter/supermatter.dm
+++ b/code/modules/supermatter/supermatter.dm
@@ -16,7 +16,7 @@
 */
 
 //Controls how much power is produced by each collector in range - this is the main parameter for tweaking SM balance, as it basically controls how the power variable relates to the rest of the game.
-#define POWER_FACTOR 0.7             //Obtained from testing. Aiming to make the ideal running output (500 kW) run the SM to ~85% of the safety level.
+#define POWER_FACTOR 1.0
 #define DECAY_FACTOR 700             //Affects how fast the supermatter power decays
 #define CRITICAL_TEMPERATURE 800     //K
 #define CHARGING_FACTOR 0.05
diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm
index 0c6514313ff..9877ea07c35 100644
--- a/maps/tgstation2.dmm
+++ b/maps/tgstation2.dmm
@@ -11083,8 +11083,8 @@
 "efn" = (/obj/machinery/atmospherics/unary/heat_exchanger{dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 6},/area/engine/engine_waste)
 "efo" = (/obj/machinery/door/window/brigdoor{dir = 8; name = "Engine Waste"; req_access = null; req_access_txt = "0"; req_one_access_txt = "10;24"},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/manifold/visible,/turf/simulated/floor/plating{icon_state = "platebot"; nitrogen = 0.01; oxygen = 0.01},/area/engine/engine_waste)
 "efp" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 4},/obj/machinery/meter{frequency = 1443; id = "engine_waste_filter_two"; name = "Engine Waste - Filter 2"},/turf/simulated/floor/plating,/area/engine/engine_room)
-"efq" = (/obj/machinery/atmospherics/omni/filter{on = 1; tag_east = 1; tag_north = 3; tag_south = 0; tag_west = 2},/turf/simulated/floor/plating,/area/engine/engine_room)
-"efr" = (/obj/machinery/atmospherics/omni/filter{on = 1; tag_east = 1; tag_north = 0; tag_south = 2; tag_west = 6},/turf/simulated/floor/plating,/area/engine/engine_room)
+"efq" = (/obj/machinery/atmospherics/omni/filter{on = 0; tag_east = 1; tag_north = 3; tag_south = 0; tag_west = 2},/turf/simulated/floor/plating,/area/engine/engine_room)
+"efr" = (/obj/machinery/atmospherics/omni/filter{on = 0; tag_east = 1; tag_north = 0; tag_south = 2; tag_west = 6},/turf/simulated/floor/plating,/area/engine/engine_room)
 "efs" = (/obj/machinery/atmospherics/pipe/simple/visible/yellow{dir = 10},/obj/machinery/meter{frequency = 1443; id = "engine_exhaust"; name = "Engine Exhaust"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engine_room)
 "eft" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{tag = "icon-intact (SOUTHEAST)"; icon_state = "intact"; dir = 6},/obj/machinery/meter{frequency = 1443; id = "engine_cooling"; name = "Engine Cooling"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engine_room)
 "efu" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/engine/engine_waste)