diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 72493bfba6f..200b21d441d 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -225,28 +225,38 @@ to destroy them and players will be able to make replacements.
 	req_components = list(
 							/obj/item/weapon/vending_refill/boozeomat = 3)
 
-	var/list/names_paths = list(/obj/machinery/vending/boozeomat = "Booze-O-Mat",
-							/obj/machinery/vending/coffee = "Solar's Best Hot Drinks",
-							/obj/machinery/vending/snack = "Getmore Chocolate Corp",
-							/obj/machinery/vending/cola = "Robust Softdrinks",
-							/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
-							/obj/machinery/vending/autodrobe = "AutoDrobe",
-							/obj/machinery/vending/hatdispenser = "Hatlord 9000",
-							/obj/machinery/vending/suitdispenser = "Suitlord 9000",
-							/obj/machinery/vending/shoedispenser = "Shoelord 9000",
-							/obj/machinery/vending/clothing = "ClothesMate",
-							/obj/machinery/vending/crittercare = "CritterCare")
+	var/list/names_paths = list("Booze-O-Mat" = /obj/machinery/vending/boozeomat,
+							"Solar's Best Hot Drinks" = /obj/machinery/vending/coffee,
+							"Getmore Chocolate Corp" = /obj/machinery/vending/snack,
+							"Robust Softdrinks" = /obj/machinery/vending/cola,
+							"ShadyCigs Deluxe" = /obj/machinery/vending/cigarette,
+							"AutoDrobe" = /obj/machinery/vending/autodrobe,
+							"Hatlord 9000" = /obj/machinery/vending/hatdispenser,
+							"Suitlord 9000" = /obj/machinery/vending/suitdispenser,
+							"Shoelord 9000" = /obj/machinery/vending/shoedispenser,
+							"ClothesMate" = /obj/machinery/vending/clothing,
+							"CritterCare" = /obj/machinery/vending/crittercare)
 
 /obj/item/weapon/circuitboard/vendor/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/screwdriver))
-		set_type(pick(names_paths), user)
+		set_type(null, user)
 
 
 /obj/item/weapon/circuitboard/vendor/proc/set_type(typepath, mob/user)
-		build_path = typepath
-		name = "circuit board ([names_paths[build_path]] Vendor)"
-		to_chat(user, "<span class='notice'>You set the board to [names_paths[build_path]].</span>")
-		req_components = list(text2path("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]") = 3)
+	var/new_name = "Booze-O-Mat Vendor"
+	if(!typepath)
+		new_name = input("Circuit Setting", "What would you change the board setting to?") in names_paths
+		typepath = names_paths[new_name]
+	else
+		for(var/name in names_paths)
+			if(names_paths[name] == typepath)
+				new_name = name
+				break
+	build_path = typepath
+	name = "circuit board ([new_name])"
+	req_components = list(text2path("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]") = 3)
+	if(user)
+		to_chat(user, "<span class='notice'>You set the board to [new_name].</span>")
 
 /obj/item/weapon/circuitboard/smes
 	name = "circuit board (SMES)"
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 25a50a5bfe1..467d1032d06 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -78,7 +78,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 
 	else if(istype(W, /obj/item/weapon/match))
 		var/obj/item/weapon/match/M = W
-		if(M.lit)
+		if(M.lit == 1)
 			light("<span class='notice'>[user] lights their [name] with their [W].</span>")
 
 	else if(istype(W, /obj/item/weapon/melee/energy/sword/saber))
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index e8df519fe43..237dd9ac46b 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -80,7 +80,7 @@
 /obj/item/weapon/reagent_containers/wash(mob/user, atom/source)
 	if(is_open_container())
 		if(reagents.total_volume >= volume)
-			to_chat(user, "span class='warning'>\The [src] is full.</span>")
+			to_chat(user, "<span class='warning'>\The [src] is full.</span>")
 			return
 		else
 			reagents.add_reagent("water", min(volume - reagents.total_volume, amount_per_transfer_from_this))
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 234b23800e6..06dab3dbfc8 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -646,4 +646,14 @@
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 50, MAT_GLASS = 50)
 	build_path = /obj/item/weapon/circuitboard/logic_gate
-	category = list("initial", "Electronics")
\ No newline at end of file
+	category = list("initial", "Electronics")
+
+/datum/design/vendor
+	name = "Machine Board (Vendor)"
+	desc = "The circuit board for a Vendor."
+	id = "vendor"
+	req_tech = list("programming" = 1)
+	build_type = AUTOLATHE
+	materials = list(MAT_GLASS = 750, MAT_METAL = 250)
+	build_path = /obj/item/weapon/circuitboard/vendor
+	category = list("initial", "Electronics")
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index e2a89b38bec..afb1e09b40f 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -442,16 +442,6 @@
 	build_path = /obj/item/weapon/circuitboard/programmable
 	category = list("Misc. Machinery")
 
-/datum/design/vendor
-	name = "Machine Board (Vendor)"
-	desc = "The circuit board for a Vendor."
-	id = "vendor"
-	req_tech = list("programming" = 1)
-	build_type = IMPRINTER
-	materials = list(MAT_GLASS = 1000, "sacid" = 20)
-	build_path = /obj/item/weapon/circuitboard/vendor
-	category = list("Misc. Machinery")
-
 /datum/design/pod
 	name = "Machine Board (Mass Driver and Pod Doors Control)"
 	desc = "Allows for the construction of circuit boards used to build a Mass Driver and Pod Doors Control."