diff --git a/config/ftbquests/quests/chapters/ae2.snbt b/config/ftbquests/quests/chapters/ae2.snbt
index 57df4d544..643b12bd9 100644
--- a/config/ftbquests/quests/chapters/ae2.snbt
+++ b/config/ftbquests/quests/chapters/ae2.snbt
@@ -5,7 +5,7 @@
 	group: ""
 	icon: "ae2:controller"
 	id: "09BE9F51822EC180"
-	order_index: 6
+	order_index: 7
 	quest_links: [ ]
 	quests: [
 		{
@@ -900,7 +900,7 @@
 				item: "ae2:wireless_access_point"
 				type: "item"
 			}]
-			x: 4.0d
+			x: 3.0d
 			y: 11.0d
 		}
 		{
@@ -912,7 +912,7 @@
 				item: "ae2:wireless_booster"
 				type: "item"
 			}]
-			x: 4.0d
+			x: 3.0d
 			y: 8.0d
 		}
 		{
@@ -924,7 +924,7 @@
 				item: "ae2:wireless_terminal"
 				type: "item"
 			}]
-			x: 6.0d
+			x: 5.0d
 			y: 8.0d
 		}
 		{
@@ -940,7 +940,7 @@
 				}
 				type: "item"
 			}]
-			x: 8.0d
+			x: 7.0d
 			y: 7.0d
 		}
 		{
@@ -952,7 +952,7 @@
 				item: "ae2wtlib:wireless_pattern_encoding_terminal"
 				type: "item"
 			}]
-			x: 8.0d
+			x: 7.0d
 			y: 9.0d
 		}
 		{
@@ -969,7 +969,7 @@
 				item: "ae2wtlib:wireless_universal_terminal"
 				type: "item"
 			}]
-			x: 10.0d
+			x: 9.0d
 			y: 8.0d
 		}
 		{
@@ -981,7 +981,7 @@
 				item: "ae2wtlib:quantum_bridge_card"
 				type: "item"
 			}]
-			x: 6.0d
+			x: 5.0d
 			y: 10.0d
 		}
 		{
@@ -993,7 +993,7 @@
 				item: "ae2wtlib:magnet_card"
 				type: "item"
 			}]
-			x: 6.0d
+			x: 5.0d
 			y: 11.0d
 		}
 		{
@@ -1005,7 +1005,7 @@
 				item: "ae2wtlib:wireless_pattern_access_terminal"
 				type: "item"
 			}]
-			x: 8.0d
+			x: 7.0d
 			y: 8.0d
 		}
 		{
@@ -1017,7 +1017,7 @@
 				item: "ae2:item_cell_housing"
 				type: "item"
 			}]
-			x: -5.0d
+			x: -3.5d
 			y: 7.0d
 		}
 		{
@@ -1029,7 +1029,7 @@
 				item: "ae2:fluid_cell_housing"
 				type: "item"
 			}]
-			x: -5.0d
+			x: -3.5d
 			y: 9.0d
 		}
 		{
@@ -1045,7 +1045,7 @@
 				item: "ae2:cell_component_1k"
 				type: "item"
 			}]
-			x: -6.5d
+			x: -5.0d
 			y: 8.0d
 		}
 		{
@@ -1061,7 +1061,7 @@
 				item: "ae2:cell_component_4k"
 				type: "item"
 			}]
-			x: -7.5d
+			x: -6.0d
 			y: 8.0d
 		}
 		{
@@ -1077,7 +1077,7 @@
 				item: "ae2:cell_component_16k"
 				type: "item"
 			}]
-			x: -8.5d
+			x: -7.0d
 			y: 8.0d
 		}
 		{
@@ -1093,7 +1093,7 @@
 				item: "ae2:cell_component_64k"
 				type: "item"
 			}]
-			x: -9.5d
+			x: -8.0d
 			y: 8.0d
 		}
 		{
@@ -1109,7 +1109,7 @@
 				item: "ae2:cell_component_256k"
 				type: "item"
 			}]
-			x: -10.5d
+			x: -9.0d
 			y: 8.0d
 		}
 		{
@@ -1125,7 +1125,7 @@
 				}
 				type: "item"
 			}]
-			x: -10.5d
+			x: -9.0d
 			y: 6.5d
 		}
 		{
@@ -1141,7 +1141,7 @@
 				}
 				type: "item"
 			}]
-			x: -10.5d
+			x: -9.0d
 			y: 9.5d
 		}
 		{
@@ -1157,7 +1157,7 @@
 				}
 				type: "item"
 			}]
-			x: -11.0d
+			x: -9.5d
 			y: 5.5d
 		}
 		{
@@ -1173,7 +1173,7 @@
 				}
 				type: "item"
 			}]
-			x: -11.0d
+			x: -9.5d
 			y: 10.5d
 		}
 		{
@@ -1189,7 +1189,7 @@
 				}
 				type: "item"
 			}]
-			x: -9.5d
+			x: -8.0d
 			y: 6.5d
 		}
 		{
@@ -1205,7 +1205,7 @@
 				}
 				type: "item"
 			}]
-			x: -9.5d
+			x: -8.0d
 			y: 9.5d
 		}
 		{
@@ -1221,7 +1221,7 @@
 				}
 				type: "item"
 			}]
-			x: -10.0d
+			x: -8.5d
 			y: 5.5d
 		}
 		{
@@ -1237,7 +1237,7 @@
 				}
 				type: "item"
 			}]
-			x: -10.0d
+			x: -8.5d
 			y: 10.5d
 		}
 		{
@@ -1253,7 +1253,7 @@
 				}
 				type: "item"
 			}]
-			x: -8.5d
+			x: -7.0d
 			y: 9.5d
 		}
 		{
@@ -1269,7 +1269,7 @@
 				}
 				type: "item"
 			}]
-			x: -8.5d
+			x: -7.0d
 			y: 6.5d
 		}
 		{
@@ -1285,7 +1285,7 @@
 				}
 				type: "item"
 			}]
-			x: -9.0d
+			x: -7.5d
 			y: 5.5d
 		}
 		{
@@ -1301,7 +1301,7 @@
 				}
 				type: "item"
 			}]
-			x: -9.0d
+			x: -7.5d
 			y: 10.5d
 		}
 		{
@@ -1317,7 +1317,7 @@
 				}
 				type: "item"
 			}]
-			x: -7.5d
+			x: -6.0d
 			y: 6.5d
 		}
 		{
@@ -1333,7 +1333,7 @@
 				}
 				type: "item"
 			}]
-			x: -7.5d
+			x: -6.0d
 			y: 9.5d
 		}
 		{
@@ -1349,7 +1349,7 @@
 				}
 				type: "item"
 			}]
-			x: -8.0d
+			x: -6.5d
 			y: 5.5d
 		}
 		{
@@ -1365,7 +1365,7 @@
 				}
 				type: "item"
 			}]
-			x: -8.0d
+			x: -6.5d
 			y: 10.5d
 		}
 		{
@@ -1381,7 +1381,7 @@
 				}
 				type: "item"
 			}]
-			x: -6.5d
+			x: -5.0d
 			y: 6.5d
 		}
 		{
@@ -1397,7 +1397,7 @@
 				}
 				type: "item"
 			}]
-			x: -6.5d
+			x: -5.0d
 			y: 9.5d
 		}
 		{
@@ -1413,7 +1413,7 @@
 				}
 				type: "item"
 			}]
-			x: -7.0d
+			x: -5.5d
 			y: 5.5d
 		}
 		{
@@ -1429,7 +1429,7 @@
 				}
 				type: "item"
 			}]
-			x: -7.0d
+			x: -5.5d
 			y: 10.5d
 		}
 	]
diff --git a/config/ftbquests/quests/chapters/cc.snbt b/config/ftbquests/quests/chapters/cc.snbt
new file mode 100644
index 000000000..52ad364cf
--- /dev/null
+++ b/config/ftbquests/quests/chapters/cc.snbt
@@ -0,0 +1,213 @@
+{
+	default_hide_dependency_lines: false
+	default_quest_shape: ""
+	filename: "cc"
+	group: ""
+	icon: "computercraft:computer_advanced"
+	id: "1A6D6B70EC13DDC6"
+	order_index: 6
+	quest_links: [ ]
+	quests: [
+		{
+			dependencies: ["26394C1290D70AB6"]
+			description: ["To continue the quest line, you need to craft any of the computers."]
+			icon: "computercraft:computer_advanced"
+			id: "591C5E26EE7466F3"
+			shape: "gear"
+			size: 2.0d
+			tasks: [{
+				id: "6BC9F3064F29B986"
+				title: "CC: Tweaked"
+				type: "checkmark"
+			}]
+			x: 0.0d
+			y: 0.0d
+		}
+		{
+			dependencies: ["591C5E26EE7466F3"]
+			id: "0BFFB20573B2A9A5"
+			tasks: [{
+				id: "4A52931C6E78FFC2"
+				item: "computercraft:computer_normal"
+				type: "item"
+			}]
+			x: -2.5d
+			y: -3.0d
+		}
+		{
+			dependencies: ["591C5E26EE7466F3"]
+			id: "249A6189A9334B14"
+			tasks: [{
+				id: "28B5BBAAA33CDEDA"
+				item: "computercraft:computer_advanced"
+				type: "item"
+			}]
+			x: -2.5d
+			y: 3.0d
+		}
+		{
+			dependencies: ["249A6189A9334B14"]
+			id: "2A507BD15FBA08FC"
+			tasks: [{
+				id: "73DA9F99EF913F3D"
+				item: "computercraft:turtle_advanced"
+				type: "item"
+			}]
+			x: -1.5d
+			y: 4.5d
+		}
+		{
+			dependencies: ["0BFFB20573B2A9A5"]
+			id: "4C3A1901BA40FB24"
+			tasks: [{
+				id: "64B16F8F192CEE23"
+				item: "computercraft:turtle_normal"
+				type: "item"
+			}]
+			x: -1.5d
+			y: -4.5d
+		}
+		{
+			dependencies: [
+				"0BFFB20573B2A9A5"
+				"249A6189A9334B14"
+			]
+			dependency_requirement: "one_completed"
+			id: "5196983324E8F52A"
+			tasks: [{
+				id: "420333B377F27A78"
+				item: "computercraft:cable"
+				type: "item"
+			}]
+			x: -4.0d
+			y: 0.0d
+		}
+		{
+			dependencies: [
+				"0BFFB20573B2A9A5"
+				"249A6189A9334B14"
+			]
+			dependency_requirement: "one_completed"
+			icon: "computercraft:monitor_advanced"
+			id: "7FFDA4C59514AA98"
+			shape: "octagon"
+			size: 1.5d
+			tasks: [{
+				id: "7D070BAFC0F4226A"
+				type: "checkmark"
+			}]
+			title: "It's time to craft trinkets"
+			x: 6.0d
+			y: 0.0d
+		}
+		{
+			dependencies: ["7FFDA4C59514AA98"]
+			id: "7B500E0A921321E9"
+			shape: "circle"
+			tasks: [{
+				id: "42590471EA46FCE8"
+				item: "computercraft:monitor_normal"
+				type: "item"
+			}]
+			x: 5.5d
+			y: -3.0d
+		}
+		{
+			dependencies: ["7FFDA4C59514AA98"]
+			id: "4B88F658A752FA3F"
+			shape: "circle"
+			tasks: [{
+				id: "42CCFEF24A41C1FE"
+				item: "computercraft:monitor_advanced"
+				type: "item"
+			}]
+			x: 5.5d
+			y: 3.0d
+		}
+		{
+			dependencies: ["7FFDA4C59514AA98"]
+			id: "48C4D2DB2E7F6F59"
+			shape: "circle"
+			tasks: [{
+				id: "72C0320D738C604E"
+				item: "computercraft:wireless_modem_normal"
+				type: "item"
+			}]
+			x: 7.0d
+			y: -3.0d
+		}
+		{
+			dependencies: ["7FFDA4C59514AA98"]
+			id: "2A43647C3C5D9E83"
+			shape: "circle"
+			tasks: [{
+				id: "79AE74FA098E7DC3"
+				item: "computercraft:wireless_modem_advanced"
+				type: "item"
+			}]
+			x: 7.0d
+			y: 3.0d
+		}
+		{
+			dependencies: ["7FFDA4C59514AA98"]
+			id: "38F42B6D14F8DED1"
+			shape: "circle"
+			tasks: [{
+				id: "702BB2F0572F5E48"
+				item: "computercraft:wired_modem"
+				type: "item"
+			}]
+			x: 8.0d
+			y: -2.5d
+		}
+		{
+			dependencies: ["7FFDA4C59514AA98"]
+			id: "27577CB16820E75B"
+			shape: "circle"
+			tasks: [{
+				id: "267B8DB63952DF1A"
+				item: "computercraft:speaker"
+				type: "item"
+			}]
+			x: 8.0d
+			y: 2.5d
+		}
+		{
+			dependencies: ["7FFDA4C59514AA98"]
+			id: "3AE64484AB9F1048"
+			shape: "circle"
+			tasks: [{
+				id: "2B14E62B1C603EFD"
+				item: "computercraft:disk_drive"
+				type: "item"
+			}]
+			x: 9.0d
+			y: 1.5d
+		}
+		{
+			dependencies: ["7FFDA4C59514AA98"]
+			id: "77439E3A3EC781F8"
+			shape: "circle"
+			tasks: [{
+				id: "66B7614C462CE161"
+				item: "computercraft:printer"
+				type: "item"
+			}]
+			x: 9.0d
+			y: -1.5d
+		}
+		{
+			dependencies: ["7FFDA4C59514AA98"]
+			id: "3DFB9A8A2BE3E85B"
+			shape: "circle"
+			tasks: [{
+				id: "616A905A423A55B0"
+				item: "computercraft:disk_drive"
+				type: "item"
+			}]
+			x: 9.5d
+			y: 0.0d
+		}
+	]
+	title: "CC: Tweaked"
+}
diff --git a/config/ftbquests/quests/chapters/create.snbt b/config/ftbquests/quests/chapters/create.snbt
index d6a886a9e..7960af2c0 100644
--- a/config/ftbquests/quests/chapters/create.snbt
+++ b/config/ftbquests/quests/chapters/create.snbt
@@ -147,6 +147,7 @@
 		{
 			dependencies: ["6E1CD5151284199F"]
 			id: "78BE0A10CE7B4BBE"
+			shape: "rsquare"
 			tasks: [{
 				id: "4F22CB4EF49F2A9C"
 				item: "create:electron_tube"
@@ -241,6 +242,7 @@
 		{
 			dependencies: ["78BE0A10CE7B4BBE"]
 			id: "45EA7CA14EE67AA4"
+			shape: "rsquare"
 			tasks: [{
 				id: "7C4C5BE01A6E47DB"
 				item: "create:mechanical_crafter"
@@ -375,6 +377,7 @@
 		{
 			dependencies: ["7B74DB051202E97E"]
 			id: "2D95C927AA8A641D"
+			shape: "rsquare"
 			tasks: [{
 				id: "0151C8DAE056A8F3"
 				item: "create:precision_mechanism"
@@ -430,6 +433,18 @@
 			x: -1.0d
 			y: -3.0d
 		}
+		{
+			dependencies: ["6E1CD5151284199F"]
+			hide_dependency_lines: true
+			id: "560240B49B7BC7CA"
+			tasks: [{
+				id: "67AD16F72AE07381"
+				item: "create:belt_connector"
+				type: "item"
+			}]
+			x: 1.0d
+			y: -4.0d
+		}
 	]
 	title: "Create"
 }
diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
index 35eaf9df4..13191d9c8 100644
--- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
+++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
@@ -6,7 +6,7 @@
 	group: ""
 	icon: "gtceu:ev_electric_motor"
 	id: "7FB9F636D95820A3"
-	order_index: 7
+	order_index: 8
 	quest_links: [
 		{
 			id: "2E99A771FCA40E15"
@@ -1074,19 +1074,16 @@
 					title: "Uraninite Dust"
 					type: "item"
 				}
-				{
-					amount: 1000L
-					fluid: "gtceu:uranium_hexafluoride"
-					id: "59D6B7142C0174BA"
-					optional_task: true
-					title: "Uranium Hexafluoride"
-					type: "fluid"
-				}
 				{
 					id: "39E343FCB7B1646D"
 					item: "gtceu:uranium_dust"
 					type: "item"
 				}
+				{
+					id: "71CC4448F43C777A"
+					item: "gtceu:uranium_hexafluoride_bucket"
+					type: "item"
+				}
 			]
 			title: "Uranium Refinement"
 			x: 4.5d
@@ -1267,13 +1264,6 @@
 			size: 0.75d
 			subtitle: "An alternate rubber"
 			tasks: [
-				{
-					amount: 1296L
-					fluid: "gtceu:silicone_rubber"
-					id: "3C29253DA5DAF778"
-					optional_task: true
-					type: "fluid"
-				}
 				{
 					id: "3E2FBCED1C782E7C"
 					item: "gtceu:silicone_rubber_ingot"
@@ -1287,6 +1277,11 @@
 					title: "Silicone Rubber Plate"
 					type: "item"
 				}
+				{
+					id: "58EA93A671979FEC"
+					item: "gtceu:silicone_rubber_bucket"
+					type: "item"
+				}
 			]
 			title: "Silicone Rubber"
 			x: 1.125d
@@ -1533,53 +1528,39 @@
 			size: 0.66d
 			tasks: [
 				{
-					amount: 16000L
-					fluid: "gtceu:phenol"
-					id: "09C91BF9591202CC"
-					title: "Phenol"
-					type: "fluid"
+					id: "5EB2EB8D1629FC7F"
+					item: "gtceu:phenol_bucket"
+					type: "item"
 				}
 				{
-					amount: 64000L
-					fluid: "gtceu:benzene"
-					id: "2272D1322991506C"
-					title: "Benzene"
-					type: "fluid"
+					id: "1766C7D27D58CA7F"
+					item: "gtceu:benzene_bucket"
+					type: "item"
 				}
 				{
-					amount: 16000L
-					fluid: "gtceu:toluene"
-					id: "6B0F17B12A7E541A"
-					title: "Toluene"
-					type: "fluid"
+					id: "392237D560CAE74C"
+					item: "gtceu:toluene_bucket"
+					type: "item"
 				}
 				{
-					amount: 32000L
-					fluid: "gtceu:dimethylbenzene"
-					id: "0D90630744975DF9"
-					title: "Dimethylbenzene"
-					type: "fluid"
+					id: "2A7B747BB348181D"
+					item: "gtceu:dimethylbenzene_bucket"
+					type: "item"
 				}
 				{
-					amount: 16000L
-					fluid: "gtceu:acetic_acid"
-					id: "40A54366F789C104"
-					title: "Acetic Acid"
-					type: "fluid"
+					id: "158FF6EC9FF43862"
+					item: "gtceu:acetic_acid_bucket"
+					type: "item"
 				}
 				{
-					amount: 32000L
-					fluid: "gtceu:methanol"
-					id: "7064FF6DA67EFC0B"
-					title: "Methanol"
-					type: "fluid"
+					id: "4C5B5521CD219138"
+					item: "gtceu:methanol_bucket"
+					type: "item"
 				}
 				{
-					amount: 8000L
-					fluid: "gtceu:acetone"
-					id: "209CCB68CBB8E9CD"
-					title: "Acetone"
-					type: "fluid"
+					id: "39DFBE5FAB075669"
+					item: "gtceu:acetone_bucket"
+					type: "item"
 				}
 			]
 			title: "True Distillation: Organic"
diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt
index 1831ede25..5d57246de 100644
--- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt
+++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt
@@ -382,18 +382,16 @@
 					optional_task: true
 					type: "item"
 				}
-				{
-					amount: 1000L
-					fluid: "gtceu:sodium_potassium"
-					id: "2DF33EF0321AB809"
-					optional_task: true
-					type: "fluid"
-				}
 				{
 					id: "22E204ADB8257706"
 					item: "gtceu:hv_energy_input_hatch"
 					type: "item"
 				}
+				{
+					id: "0799251A5E99839C"
+					item: "gtceu:sodium_potassium_bucket"
+					type: "item"
+				}
 			]
 			title: "Upgrade your EBF II"
 			x: 4.5d
@@ -817,25 +815,21 @@
 			size: 0.75d
 			subtitle: "A.K.A - Teflon"
 			tasks: [
-				{
-					amount: 1000L
-					fluid: "gtceu:hydrofluoric_acid"
-					id: "39D0D1DEEFAD2830"
-					optional_task: true
-					type: "fluid"
-				}
-				{
-					amount: 1000L
-					fluid: "gtceu:chloroform"
-					id: "28B5614D97C82AB8"
-					optional_task: true
-					type: "fluid"
-				}
 				{
 					id: "62C0D8E62DC90BD5"
 					item: "gtceu:polytetrafluoroethylene_plate"
 					type: "item"
 				}
+				{
+					id: "54D65A0A939DAD54"
+					item: "gtceu:hydrofluoric_acid_bucket"
+					type: "item"
+				}
+				{
+					id: "3E6E6F21B34F86B4"
+					item: "gtceu:chloroform_bucket"
+					type: "item"
+				}
 			]
 			title: "Polytetrafluoroethylene"
 			x: 5.625d
@@ -862,10 +856,9 @@
 			shape: "rsquare"
 			size: 0.66d
 			tasks: [{
-				amount: 40000L
-				fluid: "gtceu:nitrobenzene"
-				id: "0BC043068EE4C69A"
-				type: "fluid"
+				id: "33CF24B0A19D2F25"
+				item: "gtceu:nitrobenzene_bucket"
+				type: "item"
 			}]
 			title: "Benzene Nitro"
 			x: 9.0d
@@ -946,13 +939,6 @@
 			id: "2B7B214EDE0B45A2"
 			size: 0.75d
 			tasks: [
-				{
-					amount: 1000L
-					fluid: "gtceu:toluene"
-					id: "1B1BAB5824FA20A9"
-					optional_task: true
-					type: "fluid"
-				}
 				{
 					id: "1CB85F57BA45252D"
 					item: "gtceu:gelled_toluene"
@@ -963,6 +949,11 @@
 					item: "minecraft:tnt"
 					type: "item"
 				}
+				{
+					id: "6DC25EED8E91BEC2"
+					item: "gtceu:toluene_bucket"
+					type: "item"
+				}
 			]
 			title: "TNT"
 			x: 7.875d
@@ -1101,10 +1092,9 @@
 			size: 0.75d
 			subtitle: "This won't eat your skin"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:nitric_acid"
-				id: "30DA5B5D735254AD"
-				type: "fluid"
+				id: "5F8F684990622DE1"
+				item: "gtceu:nitric_acid_bucket"
+				type: "item"
 			}]
 			title: "Nitric Acid"
 			x: 6.75d
@@ -1132,10 +1122,9 @@
 			size: 0.66d
 			subtitle: "This is to go further beyond"
 			tasks: [{
-				amount: 50000L
-				fluid: "gtceu:cetane_boosted_diesel"
-				id: "150FF5579CA17796"
-				type: "fluid"
+				id: "51D904AA29256F8D"
+				item: "gtceu:cetane_boosted_diesel_bucket"
+				type: "item"
 			}]
 			title: "Cetane-boosted Diesel"
 			x: 7.875d
diff --git a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt
index 8ecb315c3..8dcb4156d 100644
--- a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt
+++ b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt
@@ -5,7 +5,7 @@
 	group: ""
 	icon: "gtceu:iv_electric_motor"
 	id: "32EF20533F323E02"
-	order_index: 8
+	order_index: 9
 	quest_links: [{
 		id: "050247AED8C803F9"
 		linked_quest: "30A6EDDF25A5E5F8"
@@ -190,13 +190,6 @@
 			size: 0.75d
 			subtitle: "GTCEu's toughest polymer!"
 			tasks: [
-				{
-					amount: 1000L
-					fluid: "gtceu:polybenzimidazole"
-					id: "5971118ED25AC71A"
-					optional_task: true
-					type: "fluid"
-				}
 				{
 					id: "7C5D37940A0C8409"
 					item: "gtceu:polybenzimidazole_ingot"
@@ -208,6 +201,11 @@
 					item: "gtceu:polybenzimidazole_plate"
 					type: "item"
 				}
+				{
+					id: "428B6B36182382B7"
+					item: "gtceu:polybenzimidazole_bucket"
+					type: "item"
+				}
 			]
 			title: "Polybenzimidazole"
 			x: -0.75d
@@ -956,10 +954,9 @@
 			shape: "rsquare"
 			size: 0.66d
 			tasks: [{
-				amount: 6000L
-				fluid: "gtceu:rocket_fuel"
-				id: "040946A4E48F28E8"
-				type: "fluid"
+				id: "0882761E90120C3C"
+				item: "gtceu:rocket_fuel_bucket"
+				type: "item"
 			}]
 			title: "Rocket Fuel"
 			x: 6.0d
diff --git a/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt b/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
index 709cdfec8..49b7b277a 100644
--- a/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
+++ b/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
@@ -5,7 +5,7 @@
 	group: ""
 	icon: "gtceu:luv_electric_motor"
 	id: "262A03F6F4EC713C"
-	order_index: 9
+	order_index: 10
 	quest_links: [
 		{
 			id: "7F8B55C8510200AF"
@@ -130,10 +130,9 @@
 			size: 0.66d
 			subtitle: "Absolutely beneficial for the environment"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:pcb_coolant"
-				id: "32BCECCE276F913D"
-				type: "fluid"
+				id: "64646F49C863998B"
+				item: "gtceu:pcb_coolant_bucket"
+				type: "item"
 			}]
 			title: "Dielectric PCB Coolant"
 			x: 2.25d
@@ -409,10 +408,9 @@
 			size: 0.75d
 			subtitle: "Do not touch the acid"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:fluoroantimonic_acid"
-				id: "0495EEA395A1B5EC"
-				type: "fluid"
+				id: "1589DE9F6692BB6F"
+				item: "gtceu:fluoroantimonic_acid_bucket"
+				type: "item"
 			}]
 			title: "Naquadah Chain"
 			x: 1.125d
diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt
index 2937f4c40..7fa877d6d 100644
--- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt
+++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt
@@ -264,6 +264,7 @@
 				"3DE7A2B91CFF48F6"
 				"2F7617C0C4B330DE"
 			]
+			dependency_requirement: "one_completed"
 			description: [
 				"Covers are placed by right-clicking with Cover in hand on a face of a machine, and removed with a &5Crowbar&r (or by mining the machine, but that's way slower)."
 				""
@@ -662,23 +663,20 @@
 			icon: "gtceu:lv_battery_buffer_4x"
 			id: "6431381FBE07D6EF"
 			size: 0.75d
-			tasks: [
-				{
-					id: "23FCFCA69488AA2B"
-					item: "gtceu:lv_battery_buffer_4x"
-					type: "item"
+			tasks: [{
+				id: "3241F5B06FB7258A"
+				item: {
+					Count: 1b
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						display: {
+							Name: "{\"text\":\"Any Battery Buffer\"}"
+						}
+						"ftbfiltersystem:filter": "or(item(gtceu:lv_battery_buffer_4x)item(gtceu:lv_battery_buffer_8x)item(gtceu:lv_battery_buffer_16x))"
+					}
 				}
-				{
-					id: "2D59C65816F60CEF"
-					item: "gtceu:lv_battery_buffer_8x"
-					type: "item"
-				}
-				{
-					id: "679E89402D7ECE10"
-					item: "gtceu:lv_battery_buffer_16x"
-					type: "item"
-				}
-			]
+				type: "item"
+			}]
 			title: "Battery Buffer"
 			x: 6.75d
 			y: 3.375d
@@ -967,10 +965,9 @@
 					type: "item"
 				}
 				{
-					amount: 1296L
-					fluid: "gtceu:rubber"
-					id: "75DD10F659BA5406"
-					type: "fluid"
+					id: "7DA8B08CC879617F"
+					item: "gtceu:rubber_bucket"
+					type: "item"
 				}
 			]
 			title: "Basic Chemical Reactor"
@@ -1035,7 +1032,6 @@
 					type: "item"
 				}
 				{
-					count: 8L
 					id: "7EF3EDA1698AFB7F"
 					item: "gtceu:tin_rotor"
 					type: "item"
@@ -1175,7 +1171,16 @@
 			subtitle: "The Mixer mixes..."
 			tasks: [{
 				id: "4A0B4A206ED30212"
-				item: "gtceu:lv_mixer"
+				item: {
+					Count: 1b
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						display: {
+							Name: "{\"text\":\"Any Mixer\"}"
+						}
+						"ftbfiltersystem:filter": "or(item(gtceu:lv_kinetic_mixer)item(gtceu:lv_mixer))"
+					}
+				}
 				type: "item"
 			}]
 			title: "Basic Mixer"
@@ -1572,48 +1577,20 @@
 			id: "1F2359106FC95603"
 			shape: "rsquare"
 			size: 0.66d
-			tasks: [
-				{
-					id: "0A2A4C60994B0FE8"
-					item: "gtceu:lv_rock_crusher"
-					type: "item"
+			tasks: [{
+				id: "37396BE76A4F64C5"
+				item: {
+					Count: 1b
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						display: {
+							Name: "{\"text\":\"Any Rock Crusher\"}"
+						}
+						"ftbfiltersystem:filter": "or(item(gtceu:lv_rock_crusher)item(gtceu:mv_rock_crusher)item(gtceu:hv_rock_crusher)item(gtceu:ev_rock_crusher)item(gtceu:iv_rock_crusher)item(gtceu:luv_rock_crusher)item(gtceu:zpm_rock_crusher)item(gtceu:uv_rock_crusher))"
+					}
 				}
-				{
-					id: "335EA991E1B8C91F"
-					item: "gtceu:mv_rock_crusher"
-					type: "item"
-				}
-				{
-					id: "1AB3C8D744EABAA3"
-					item: "gtceu:hv_rock_crusher"
-					type: "item"
-				}
-				{
-					id: "558BDEA1E084DD84"
-					item: "gtceu:ev_rock_crusher"
-					type: "item"
-				}
-				{
-					id: "56F4B7D4AA38798A"
-					item: "gtceu:iv_rock_crusher"
-					type: "item"
-				}
-				{
-					id: "22C42CA726A1F45F"
-					item: "gtceu:luv_rock_crusher"
-					type: "item"
-				}
-				{
-					id: "17E26A869F5E9019"
-					item: "gtceu:zpm_rock_crusher"
-					type: "item"
-				}
-				{
-					id: "495C9E1656091F34"
-					item: "gtceu:uv_rock_crusher"
-					type: "item"
-				}
-			]
+				type: "item"
+			}]
 			title: "Cobble is Life"
 			x: 4.5d
 			y: 0.0d
@@ -1633,58 +1610,20 @@
 			id: "2DB259568F347C0E"
 			shape: "rsquare"
 			size: 0.66d
-			tasks: [
-				{
-					id: "66D61D09EE54B27B"
-					item: "gtceu:ulv_charger_4x"
-					type: "item"
+			tasks: [{
+				id: "11A5ECE835D2037C"
+				item: {
+					Count: 1b
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						display: {
+							Name: "{\"text\":\"Any Turbo Charger 4x\"}"
+						}
+						"ftbfiltersystem:filter": "or(item(gtceu:ulv_charger_4x)item(gtceu:lv_charger_4x)item(gtceu:mv_charger_4x)item(gtceu:hv_charger_4x)item(gtceu:ev_charger_4x)item(gtceu:iv_charger_4x)item(gtceu:luv_charger_4x)item(gtceu:zpm_charger_4x)item(gtceu:uv_charger_4x)item(gtceu:uhv_charger_4x))"
+					}
 				}
-				{
-					id: "61A83D76ED64541B"
-					item: "gtceu:lv_charger_4x"
-					type: "item"
-				}
-				{
-					id: "53F46FB26DAD3CB0"
-					item: "gtceu:mv_charger_4x"
-					type: "item"
-				}
-				{
-					id: "62572E97F72BD831"
-					item: "gtceu:hv_charger_4x"
-					type: "item"
-				}
-				{
-					id: "3FB57522BADB33B4"
-					item: "gtceu:ev_charger_4x"
-					type: "item"
-				}
-				{
-					id: "3A1B648C445D3C5A"
-					item: "gtceu:iv_charger_4x"
-					type: "item"
-				}
-				{
-					id: "719832D62AE242FE"
-					item: "gtceu:luv_charger_4x"
-					type: "item"
-				}
-				{
-					id: "1FC410D2E3DEB33B"
-					item: "gtceu:zpm_charger_4x"
-					type: "item"
-				}
-				{
-					id: "6474F0A518A20386"
-					item: "gtceu:uv_charger_4x"
-					type: "item"
-				}
-				{
-					id: "096A77845F50C0DE"
-					item: "gtceu:uhv_charger_4x"
-					type: "item"
-				}
-			]
+				type: "item"
+			}]
 			title: "Turbo Charger"
 			x: 5.625d
 			y: 0.0d
@@ -1705,28 +1644,20 @@
 			id: "3B26CA44EA955B07"
 			shape: "rsquare"
 			size: 0.66d
-			tasks: [
-				{
-					id: "5FE21AF40C603AD0"
-					item: "gtceu:lv_fisher"
-					type: "item"
+			tasks: [{
+				id: "54B46E0C5903092F"
+				item: {
+					Count: 1b
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						display: {
+							Name: "{\"text\":\"Any Fisher\"}"
+						}
+						"ftbfiltersystem:filter": "or(item(gtceu:lv_fisher)item(gtceu:mv_fisher)item(gtceu:hv_fisher)item(gtceu:ev_fisher))"
+					}
 				}
-				{
-					id: "73279793E571A6E0"
-					item: "gtceu:mv_fisher"
-					type: "item"
-				}
-				{
-					id: "385ED95E8F39CB6D"
-					item: "gtceu:hv_fisher"
-					type: "item"
-				}
-				{
-					id: "0C30563A771CF7F6"
-					item: "gtceu:ev_fisher"
-					type: "item"
-				}
-			]
+				type: "item"
+			}]
 			title: "Fishing 50"
 			x: 6.75d
 			y: 0.0d
diff --git a/config/ftbquests/quests/chapters/multiblock_dilemma.snbt b/config/ftbquests/quests/chapters/multiblock_dilemma.snbt
index 61fd4b249..261fd9e1f 100644
--- a/config/ftbquests/quests/chapters/multiblock_dilemma.snbt
+++ b/config/ftbquests/quests/chapters/multiblock_dilemma.snbt
@@ -5,7 +5,7 @@
 	group: ""
 	icon: "gtceu:electric_blast_furnace"
 	id: "41FEC6178ABF1998"
-	order_index: 12
+	order_index: 13
 	quest_links: [
 		{
 			id: "787AC5F1A89ABE41"
diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
index af928cca1..ed1bb5dc0 100644
--- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
+++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
@@ -76,10 +76,9 @@
 			size: 0.66d
 			subtitle: "Plants aren't industrial enough!"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:biomass"
-				id: "538F04658EF11F2B"
-				type: "fluid"
+				id: "74B1433E65EC86E4"
+				item: "gtceu:biomass_bucket"
+				type: "item"
 			}]
 			title: "Biomass"
 			x: 0.0d
@@ -1728,9 +1727,9 @@
 					id: "ftbfiltersystem:smart_filter"
 					tag: {
 						display: {
-							Name: "{\"text\":\"Multiple channel pipes\"}"
+							Name: "{\"text\":\"Any Quadruple or Nonuple Pipe\"}"
 						}
-						"ftbfiltersystem:filter": "or(item(gtceu:potin_quadruple_fluid_pipe)item(gtceu:potin_nonuple_fluid_pipe))"
+						"ftbfiltersystem:filter": "or(item_tag(forge:quadruple_fluid_pipes)item_tag(forge:nonuple_fluid_pipes))"
 					}
 				}
 				title: "Multiple Channel Potin Pipes, please"
diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt
index e8b1263cf..12e1057be 100644
--- a/config/ftbquests/quests/chapters/primitive_age.snbt
+++ b/config/ftbquests/quests/chapters/primitive_age.snbt
@@ -69,9 +69,9 @@
 		}
 		{
 			dependencies: ["76EF4D00586A8B74"]
-			description: ["Вместо обычных камушков, в мире вы можете встретить кусочки руды, обычно они указывают на то, что где-то под землей располагается жила с рудой по материалу сходной с кусочком руды найденном на поверхности, но пока у вас нет кирки, поэтому вам стоит собирать такие кусочки, ведь их можно расплавить в металл при помощи формочек и огненной ямы, о которой мы расскажем позже."]
+			description: ["Instead of ordinary pebbles, you can find pieces of ore in the world, they usually indicate that somewhere underground there is a vein with ore similar in material to a piece of ore found on the surface, but so far you do not have a pickaxe, so you should collect such pieces, because they can be melted into metal using molds and a fire pit, which we will talk about later."]
 			id: "40A930BEBFCFBF3B"
-			subtitle: "Ваш первый металл уже сейчас, по скидке"
+			subtitle: "Your first metal is already available, at a discount"
 			tasks: [
 				{
 					id: "45ADEA53258F0876"
@@ -242,7 +242,7 @@
 					type: "item"
 				}
 			]
-			title: "Камушки с рудой"
+			title: "Pebbles with ore"
 			x: -3.5d
 			y: -2.0d
 		}
@@ -1124,7 +1124,7 @@
 		}
 		{
 			dependencies: ["365F6F48E0BB2EFC"]
-			description: ["Молот: преимущественно используется только ради создания каменной наковальни и первых медных двойных слитков, но об этом будет информация дальше по квестам."]
+			description: ["Hammer: mainly used only to create a stone anvil and the first copper double ingots, but there will be information about this later in the quests."]
 			hide_dependency_lines: true
 			id: "120E5C0E43EC756B"
 			subtitle: "Сделайте лучше медный!"
@@ -1632,6 +1632,7 @@
 		}
 		{
 			dependencies: ["0EB682B44D83D12A"]
+			description: [""]
 			id: "2286E2D7A9178E13"
 			tasks: [{
 				count: 6L
@@ -1643,7 +1644,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:rock/raw)"
 					}
 				}
-				title: "Любой сырой камень"
+				title: "Any Raw Stone"
 				type: "item"
 			}]
 			x: 9.5d
@@ -1681,7 +1682,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:rock/smooth)"
 					}
 				}
-				title: "Любой полированный камень"
+				title: "Any Smooth Stone"
 				type: "item"
 			}]
 			x: 11.0d
@@ -1859,7 +1860,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:barrels)"
 					}
 				}
-				title: "Any #tfc:barrels"
+				title: "Any Barrels"
 				type: "item"
 			}]
 			x: 16.5d
@@ -1973,7 +1974,7 @@
 					}
 				}
 				match_nbt: false
-				title: "Медный или бронзовый топор"
+				title: "A copper or bronze axe"
 				type: "item"
 			}]
 			x: 12.0d
@@ -1985,13 +1986,18 @@
 				"3830E24B66F59E76"
 			]
 			dependency_requirement: "one_completed"
+			description: [
+				"To make a stone anvil, you have to click on the top of the stone with a hammer"
+				""
+				"(you need to use igneous Intrusive stone)"
+			]
 			id: "169485270E86A50C"
 			tasks: [{
 				icon: "tfc:rock/raw/andesite"
 				id: "028DBFDDC00B9949"
 				observe_type: 1
 				timer: 0L
-				title: "Сделайте каменную наковальню"
+				title: "Make Rock Anvil"
 				to_observe: "#tfc:rock_anvils"
 				type: "observation"
 			}]
@@ -2026,6 +2032,7 @@
 				"7A266A3E0A632D42"
 				"169485270E86A50C"
 			]
+			description: ["To make welding craft on an anvil, you need to take a hammer in your leading hand and press shift+rmb on the anvil"]
 			id: "5EBFCE37D727DFD0"
 			tasks: [{
 				count: 7L
@@ -2064,7 +2071,7 @@
 						"ftbfiltersystem:filter": "or(item(gtceu:bronze_ingot)item(gtceu:black_bronze_ingot)item(gtceu:bismuth_bronze_ingot))"
 					}
 				}
-				title: "Любой бронзовый слиток"
+				title: "Any bronze ingot"
 				type: "item"
 			}]
 			x: 18.5d
@@ -2215,7 +2222,7 @@
 						"ftbfiltersystem:filter": "or(item(gtceu:bismuth_bronze_double_ingot)item(gtceu:bronze_double_ingot)item(gtceu:black_bronze_double_ingot))"
 					}
 				}
-				title: "Двойные слитки из любой бронзы"
+				title: "Double ingots of any Bronze"
 				type: "item"
 			}]
 			x: 18.5d
@@ -2254,7 +2261,6 @@
 				id: "gtceu:bronze_dust"
 			}
 			id: "2DEEDED2F21E60B9"
-			subtitle: "Строгий середнячок"
 			tasks: [
 				{
 					id: "024533C5E4B89787"
@@ -2284,7 +2290,7 @@
 					type: "item"
 				}
 			]
-			title: "Ресурсы для обычной бронзы"
+			title: "Resources for ordinary bronze"
 			x: 18.5d
 			y: 14.0d
 		}
@@ -2429,7 +2435,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:dyes)"
 					}
 				}
-				title: "Any #tfc:dyes"
+				title: "Any Dyes"
 				type: "item"
 			}]
 			x: 14.0d
@@ -2449,7 +2455,7 @@
 				id: "gtceu:bismuth_bronze_dust"
 			}
 			id: "515141734CA1A002"
-			subtitle: "Дешевая и блестящяя"
+			subtitle: "Cheap and shiny"
 			tasks: [
 				{
 					id: "7EBB6EC50EE8CFA1"
@@ -2494,7 +2500,7 @@
 					type: "item"
 				}
 			]
-			title: "Ресурсы для висмутной бронзы"
+			title: "Resources for Bismuth bronze"
 			x: 18.5d
 			y: 15.0d
 		}
@@ -2512,7 +2518,7 @@
 				id: "gtceu:black_bronze_dust"
 			}
 			id: "69B4B677A27121CF"
-			subtitle: "Дорогая и черная"
+			subtitle: "Expensive and black"
 			tasks: [
 				{
 					id: "1294B28A98775920"
@@ -2554,7 +2560,7 @@
 					type: "item"
 				}
 			]
-			title: "Ресурсы для черной бронзы"
+			title: "Resources for Black Bronze"
 			x: 18.5d
 			y: 13.0d
 		}
@@ -2851,7 +2857,7 @@
 				id: "33278CA851060438"
 				observe_type: 1
 				timer: 0L
-				title: "Найдите дерево: Капок"
+				title: "Find the tree: Kapok"
 				to_observe: "tfc:kapok_logs"
 				type: "observation"
 			}]
@@ -2914,7 +2920,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:glass_panes)"
 					}
 				}
-				title: "Any #forge:glass_panes"
+				title: "Any Glass Panes"
 				type: "item"
 			}]
 			x: -4.0d
@@ -2933,7 +2939,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:ore_deposits)"
 					}
 				}
-				title: "Any #tfc:ore_deposits"
+				title: "Any Ore Deposits"
 				type: "item"
 			}]
 			x: -11.0d
@@ -2962,7 +2968,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:glass_bottles)"
 					}
 				}
-				title: "Any #tfc:glass_bottles"
+				title: "Any Glass Bottles"
 				type: "item"
 			}]
 			x: -7.5d
@@ -3035,7 +3041,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:lamps)"
 					}
 				}
-				title: "Any #tfc:lamps"
+				title: "Any Lamps"
 				type: "item"
 			}]
 			x: -9.0d
@@ -3115,7 +3121,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(forge:double_sheets/any_bronze)"
 					}
 				}
-				title: "Any #forge:double_sheets/any_bronze"
+				title: "Any Bronze Double Plates"
 				type: "item"
 			}]
 			x: 20.5d
@@ -3652,7 +3658,7 @@
 					type: "item"
 				}
 			]
-			title: "Материалы для розового золота"
+			title: "Materials for Rose Gold"
 			x: 30.0d
 			y: 13.0d
 		}
@@ -3699,7 +3705,7 @@
 					type: "item"
 				}
 			]
-			title: "Материалы для латуни"
+			title: "Materials for Brass"
 			x: 31.0d
 			y: 13.0d
 		}
@@ -3746,7 +3752,7 @@
 					type: "item"
 				}
 			]
-			title: "Материалы для серебра стерлинга"
+			title: "Materials for Sterling Silver"
 			x: 30.5d
 			y: 19.5d
 		}
@@ -3790,7 +3796,7 @@
 					}
 				}
 				match_nbt: false
-				title: "Any #tfc:tuyeres"
+				title: "Any Tuyeres"
 				type: "item"
 			}]
 			x: 22.5d
@@ -3809,7 +3815,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:support_beams)"
 					}
 				}
-				title: "Любые опоры"
+				title: "Any Support"
 				type: "item"
 			}]
 			x: 13.0d
@@ -3827,7 +3833,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:looms)"
 					}
 				}
-				title: "Любой ткацкий станок"
+				title: "Any Loom"
 				type: "item"
 			}]
 			x: 13.0d
@@ -4001,7 +4007,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:prepared_hides)"
 					}
 				}
-				title: "Любая приготовленная шкура"
+				title: "Any Prepared Hide"
 				type: "item"
 			}]
 			x: 6.5d
@@ -4022,7 +4028,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:scraped_hides)"
 					}
 				}
-				title: "Любая обскобленная шкура"
+				title: "Any Scraped Hide"
 				type: "item"
 			}]
 			x: 5.0d
@@ -4043,7 +4049,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:soaked_hides)"
 					}
 				}
-				title: "Any #tfc:soaked_hides"
+				title: "Any Soaked Hides"
 				type: "item"
 			}]
 			x: 5.0d
@@ -4066,7 +4072,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:raw_hides)"
 					}
 				}
-				title: "Any #tfc:raw_hides"
+				title: "Any Raw Hides"
 				type: "item"
 			}]
 			x: 3.5d
@@ -4085,7 +4091,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfc:sheepskin_hides)"
 					}
 				}
-				title: "Any #tfc:sheepskin_hides"
+				title: "Any Sheepskin Hides"
 				type: "item"
 			}]
 			x: 8.0d
@@ -4478,7 +4484,7 @@
 						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(minecraft:beds)"
 					}
 				}
-				title: "Any #minecraft:beds"
+				title: "Any Beds"
 				type: "item"
 			}]
 			x: 10.0d
diff --git a/config/ftbquests/quests/chapters/progression.snbt b/config/ftbquests/quests/chapters/progression.snbt
index eac1dd627..1349393cc 100644
--- a/config/ftbquests/quests/chapters/progression.snbt
+++ b/config/ftbquests/quests/chapters/progression.snbt
@@ -12,7 +12,7 @@
 		}
 	}
 	id: "28EBC0FF82EFD94B"
-	order_index: 13
+	order_index: 14
 	quest_links: [
 		{
 			id: "2BB2FC2D9D2F2E57"
diff --git a/config/ftbquests/quests/chapters/steam_age.snbt b/config/ftbquests/quests/chapters/steam_age.snbt
index dc3f882b3..7bedeadca 100644
--- a/config/ftbquests/quests/chapters/steam_age.snbt
+++ b/config/ftbquests/quests/chapters/steam_age.snbt
@@ -158,7 +158,7 @@
 					type: "item"
 				}
 			]
-			title: "Malding"
+			title: "Molding"
 			x: 2.5d
 			y: -3.0d
 		}
diff --git a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt b/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt
index 64fbf141e..2f44306c8 100644
--- a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt
+++ b/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt
@@ -5,7 +5,7 @@
 	group: ""
 	icon: "gtceu:uv_electric_motor"
 	id: "2E730D6F5A7C2E83"
-	order_index: 11
+	order_index: 12
 	quest_links: [
 		{
 			id: "5232A33368566616"
diff --git a/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt b/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt
index d45f992df..7296fcd64 100644
--- a/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt
+++ b/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt
@@ -5,7 +5,7 @@
 	group: ""
 	icon: "gtceu:zpm_electric_motor"
 	id: "0945247E83444D90"
-	order_index: 10
+	order_index: 11
 	quest_links: [
 		{
 			id: "6BE70146903B5CBD"
@@ -333,10 +333,9 @@
 			size: 0.75d
 			subtitle: "The final processing line, at last!"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:sterilized_growth_medium"
-				id: "090D7595FCB21B63"
-				type: "fluid"
+				id: "4BDCAD1628C054CE"
+				item: "gtceu:sterilized_growth_medium_bucket"
+				type: "item"
 			}]
 			title: "Sterilized Growth Medium"
 			x: -0.375d