diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 55d5f7426f0..3d700a5082f 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -1273,9 +1273,9 @@
 	possible_transfer_amounts = null
 	flags = FPRINT
 	var/mode = 1
-	var/charge_cost = 100
+	var/charge_cost = 50
 	var/charge_tick = 0
-	var/recharge_time = 10 //Time it takes for shots to recharge (in seconds)
+	var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
 
 	New()
 		..()
@@ -1296,13 +1296,13 @@
 			if(R && R.cell)
 				if(mode == 1 && reagents.total_volume < 30) 	//Don't recharge reagents and drain power if the storage is full.
 					R.cell.use(charge_cost) 					//Take power from borg...
-					reagents.add_reagent("tricordrazine",10)	//And fill hypo with reagent.
+					reagents.add_reagent("tricordrazine",5)		//And fill hypo with reagent.
 				if(mode == 2 && reagents.total_volume < 30)
 					R.cell.use(charge_cost)
-					reagents.add_reagent("inaprovaline", 10)
+					reagents.add_reagent("inaprovaline", 5)
 				if(mode == 3 && reagents.total_volume < 30)
 					R.cell.use(charge_cost)
-					reagents.add_reagent("spaceacillin", 10)
+					reagents.add_reagent("spaceacillin", 5)
 		//update_icon()
 		return 1
 
@@ -1326,16 +1326,19 @@
 	playsound(src.loc, 'pop.ogg', 50, 0)		//Change the mode
 	if(mode == 1)
 		mode = 2
+		charge_tick = 0 //Prevents wasted chems/cell charge if you're cycling through modes.
 		reagents.clear_reagents() //Flushes whatever was in the storage previously, so you don't get chems all mixed up.
 		user << "\blue Synthesizer is now producing 'Inaprovaline'."
 		return
 	if(mode == 2)
 		mode = 3
+		charge_tick = 0
 		reagents.clear_reagents()
 		user << "\blue Synthesizer is now producing 'Spaceacillin'."
 		return
 	if(mode == 3)
 		mode = 1
+		charge_tick = 0
 		reagents.clear_reagents()
 		user << "\blue Synthesizer is now producing 'Tricordrazine'."
 		return
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 733d13b5a78..039888914d8 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -59,12 +59,12 @@
 		..()
 		src.modules += new /obj/item/borg/sight/hud/med(src)
 		src.modules += new /obj/item/device/healthanalyzer(src)
-		src.modules += new /obj/item/weapon/reagent_containers/borghypo
+		src.modules += new /obj/item/weapon/reagent_containers/borghypo(src)
 		src.modules += new /obj/item/weapon/reagent_containers/glass/large(src)
 		src.modules += new /obj/item/weapon/reagent_containers/robodropper(src)
-		src.modules += new /obj/item/weapon/reagent_containers/syringe
-		src.modules += new /obj/item/weapon/extinguisher/mini
-		src.emag = new /obj/item/weapon/circular_saw
+		src.modules += new /obj/item/weapon/reagent_containers/syringe(src)
+		src.modules += new /obj/item/weapon/extinguisher/mini(src)
+		src.emag = new /obj/item/weapon/circular_saw(src)
 		return
 
 
@@ -142,8 +142,8 @@
 	New()
 		..()
 		src.modules += new /obj/item/weapon/soap/nanotrasen(src)
-		src.modules += new /obj/item/weapon/trashbag
-		src.modules += new/obj/item/weapon/mop
+		src.modules += new /obj/item/weapon/trashbag(src)
+		src.modules += new/obj/item/weapon/mop(src)
 		src.emag = new /obj/item/weapon/cleaner(src)
 
 		var/datum/reagents/R = new/datum/reagents(1000)