diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua
index 3fe8a18..9fa286b 100644
--- a/elepower_machines/crafting.lua
+++ b/elepower_machines/crafting.lua
@@ -195,26 +195,31 @@ for name in pairs(minetest.registered_nodes) do
 	end
 end
 
-elepm.register_craft({
-	type   = "compress",
-	recipe = { "elepower_dynamics:viridisium_block 9" },
-	output = "elepower_dynamics:xycrone_lump",
-	time   = 20,
-})
+local compressor_recipes = {
+	{
+		recipe = { "elepower_dynamics:viridisium_block 9" },
+		output = "elepower_dynamics:xycrone_lump",
+		time   = 20,
+	},
+	{
+		recipe = { "default:mese_crystal_fragment 9" },
+		output = "default:mese_crystal",
+	},
+	{
+		recipe = { "default:mese_crystal 9" },
+		output = "default:mese",
+	}
+}
 
-elepm.register_craft({
-	type   = "compress",
-	recipe = { "default:mese_crystal_fragment 9" },
-	output = "default:mese_crystal",
-	time   = 1,
-})
-
-elepm.register_craft({
-	type   = "compress",
-	recipe = { "default:mese_crystal 9" },
-	output = "default:mese",
-	time   = 1,
-})
+-- Register compressor recipes
+for _,i in pairs(compressor_recipes) do
+	elepm.register_craft({
+		type   = "compress",
+		recipe = i.recipe,
+		output = i.output,
+		time   = i.time or 1
+	})
+end
 
 -------------
 -- Sawmill --
diff --git a/elepower_machines/machines/electrolyzer.lua b/elepower_machines/machines/electrolyzer.lua
index b79d115..9b82656 100644
--- a/elepower_machines/machines/electrolyzer.lua
+++ b/elepower_machines/machines/electrolyzer.lua
@@ -165,6 +165,8 @@ ele.register_machine("elepower_machines:electrolyzer", {
 	},
 	groups = {fluid_container = 1, cracky = 1, ele_user = 1},
 	on_timer = electrolyzer_timer,
+	ele_usage = 128,
+	ele_inrush = 128,
 	fluid_buffers = {
 		input = {
 			accepts = {"default:water_source", "elepower_nuclear:heavy_water_source",
diff --git a/elepower_machines/machines/generator.lua b/elepower_machines/machines/generator.lua
index 35c11ce..1d4b74e 100644
--- a/elepower_machines/machines/generator.lua
+++ b/elepower_machines/machines/generator.lua
@@ -7,6 +7,7 @@ elepm.register_fuel_generator("elepower_machines:generator", {
 	description = "Coal-fired Generator",
 	ele_active_node = true,
 	ele_capacity = 6400,
+	ele_usage = 16,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
 		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_generator.png",
diff --git a/elepower_machines/machines/grindstone.lua b/elepower_machines/machines/grindstone.lua
index 7da7c54..ea08b9a 100644
--- a/elepower_machines/machines/grindstone.lua
+++ b/elepower_machines/machines/grindstone.lua
@@ -1,4 +1,6 @@
 
+local SPEED = 3
+
 local function get_formspec(item_percent)
 	return "size[8,8.5]"..
 		default.gui_bg..
@@ -169,7 +171,7 @@ minetest.register_node("elepower_machines:crank", {
 		local sttm  = gmeta:get_int("src_time_max")
 
 		if sttm > 0 then
-			gmeta:set_int("src_time", stime + 5)
+			gmeta:set_int("src_time", stime + SPEED)
 
 			local t = minetest.get_node_timer(gpos)
 			if not t:is_started() then
diff --git a/elepower_machines/machines/solderer.lua b/elepower_machines/machines/solderer.lua
index d12821f..5986840 100644
--- a/elepower_machines/machines/solderer.lua
+++ b/elepower_machines/machines/solderer.lua
@@ -12,6 +12,6 @@ elepm.register_crafter("elepower_machines:solderer", {
 		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_solderer.png",
 	},
 	groups = {oddly_breakable_by_hand = 1, cracky = 2},
-	ele_capacity = 28000,
-	ele_usage    = 128,
+	ele_usage = 128,
+	ele_inrush = 128,
 })
diff --git a/elepower_machines/machines/storage.lua b/elepower_machines/machines/storage.lua
index a05569a..3d223f0 100644
--- a/elepower_machines/machines/storage.lua
+++ b/elepower_machines/machines/storage.lua
@@ -6,6 +6,7 @@
 elepm.register_storage("elepower_machines:power_cell", {
 	description = "Power Cell",
 	ele_capacity = 16000,
+	ele_inrush = 128,
 	tiles = {
 		"elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png",
 		"elepower_machine_side.png", "elepower_machine_side.png", "elepower_power_cell.png",
diff --git a/elepower_nuclear/worldgen.lua b/elepower_nuclear/worldgen.lua
index 824ecb7..f8ea204 100644
--- a/elepower_nuclear/worldgen.lua
+++ b/elepower_nuclear/worldgen.lua
@@ -9,7 +9,7 @@ minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "elepower_nuclear:stone_with_uranium",
 	wherein        = "default:stone",
-	clust_scarcity = 15 * 15 * 15,
+	clust_scarcity = 16 * 16 * 16,
 	clust_num_ores = 5,
 	clust_size     = 3,
 	y_max          = 846,
@@ -20,7 +20,7 @@ minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "elepower_nuclear:stone_with_uranium",
 	wherein        = "default:stone",
-	clust_scarcity = 14 * 14 * 14,
+	clust_scarcity = 16 * 16 * 16,
 	clust_num_ores = 5,
 	clust_size     = 3,
 	y_max          = -248,
@@ -31,8 +31,8 @@ minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "elepower_nuclear:stone_with_uranium",
 	wherein        = "default:stone",
-	clust_scarcity = 10 * 10 * 10,
-	clust_num_ores = 8,
+	clust_scarcity = 16 * 16 * 16,
+	clust_num_ores = 5,
 	clust_size     = 3,
 	y_max          = -1248,
 	y_min          = -1846,