diff --git a/code/modules/holiday/halloween/bartholomew.dm b/code/modules/holiday/halloween/bartholomew.dm
index 4911082049..aa119dca84 100644
--- a/code/modules/holiday/halloween/bartholomew.dm
+++ b/code/modules/holiday/halloween/bartholomew.dm
@@ -77,7 +77,6 @@
 	/obj/item/clothing/head/welding = 1,
 	/obj/item/clothing/mask/gas = 10,
 	/obj/item/clothing/suit/hazardvest = 1,
-	/obj/item/clothing/under/rank/vice = 1,
 	/obj/item/clothing/suit/hooded/flashsuit = 1,
 	/obj/item/assembly/prox_sensor = 4,
 	/obj/item/assembly/timer = 3,
@@ -95,22 +94,20 @@
 	/obj/item/stack/sheet/metal = 1,
 	/obj/item/stack/sheet/mineral/plasma = 1,
 	/obj/item/stack/sheet/rglass = 1,
-	/obj/item/clothing/head/cone = 1,
-    /obj/item/coin = 2,
-	/obj/item/crowbar = 3,
-	/obj/item/crowbar/red = 1,
+    /obj/item/coin = 1,
+	/obj/item/crowbar = 4,
 	/obj/item/extinguisher = 3,
 	/obj/item/hand_labeler = 1,
-	/obj/item/paper = 4,
-	/obj/item/pen = 3,
+	/obj/item/paper = 6,
+	/obj/item/pen = 5,
 	/obj/item/reagent_containers/spray/pestspray = 1,
 	/obj/item/reagent_containers/rag = 3,
 	/obj/item/stock_parts/cell = 3,
 	/obj/item/storage/belt/utility = 2,
 	/obj/item/storage/box = 4,
-	/obj/item/storage/box/cups = 1,
+	/obj/item/reagent_containers/food/drinks/sillycup = 1,
 	/obj/item/storage/box/donkpockets = 1,
-	/obj/item/storage/box/lights/mixed = 3,
+	/obj/item/storage/box/lights/mixed = 1,
 	/obj/item/storage/box/hug/medical = 1,
 	/obj/item/storage/fancy/cigarettes = 1,
 	/obj/item/storage/toolbox = 1,
@@ -121,8 +118,6 @@
 	/obj/item/wirecutters = 2,
 	/obj/item/wrench = 4,
 	/obj/item/weaponcrafting/receiver = 1,
-	/obj/item/clothing/head/cone = 2,
-	/obj/item/grenade/smokebomb = 1,
 	/obj/item/geiger_counter = 3,
 	/obj/item/reagent_containers/food/snacks/grown/citrus/orange = 5,
 	/obj/item/assembly/infra = 1,
@@ -131,13 +126,13 @@
 	/obj/item/assembly/mousetrap = 5,
 	/obj/item/reagent_containers/syringe = 5,
 	/obj/item/clothing/gloves = 8,
-	/obj/item/clothing/shoes/laceup = 1,
-	/obj/item/storage/secure/briefcase = 3,
-	/obj/item/storage/toolbox/artistic = 2,
-	/obj/item/toy/eightball = 1,
+	/obj/item/storage/toolbox = 2,
 	/obj/item/reagent_containers/pill = 2,
-	/obj/item/reagent_containers/food/snacks/cannedpeaches/maint = 1,
-	/obj/item/clothing/shoes = 8)
+	/obj/item/clothing/shoes = 8,
+    /obj/item/clothing/head = 3,
+    /obj/item/reagent_containers/food/snacks = 3,
+    /obj/item/reagent_containers/syringe/dart = 2,
+    /obj/item/reagent_containers/food/drinks/soda_cans = 5)
     if(length >= 5)
         return TRUE
     //var/metalist = pickweight(GLOB.maintenance_loot)
diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm
index 4cb83baf4b..ed9254c295 100644
--- a/code/modules/holiday/halloween/jacqueen.dm
+++ b/code/modules/holiday/halloween/jacqueen.dm
@@ -106,20 +106,25 @@
 	for(var/obj/machinery/holopad/hp in world)
 		hp_list += hp
 
-	var/nono_areas = list("AI Chamber", "AI Satellite Antechamber", "AI Satellite Foyer")
+	var/nono_areas = list("AI ")
 
-	for(var/i = 0, i <= 5, i+=1) //Attempts a jump 6 times.
+	for(var/i = 0, i <= 6, i+=1) //Attempts a jump 6 times.
 		var/obj/machinery/holopad/hp = pick(hp_list)
 		if(forceMove(pick(hp.loc)))
 
+			var/jacq_please_no = FALSE
 			for(var/no_area in nono_areas)
 				var/turf/L1 = hp.loc
 				if(!L1) //Incase the area isn't a turf (i.e. in a locker)
 					continue
 				var/area/L2 = L1.loc
 				if(L2)
-					if(no_area == L2.name)
-						continue
+					if(findtext(L2.name, no_area))
+						jacq_please_no = TRUE
+
+			if(jacq_please_no)
+				i-=1
+				continue
 
 			//Try to go to populated areas
 			var/list/seen = viewers(8, get_turf(src))
@@ -128,9 +133,6 @@
 					if(z == cached_z)
 						return TRUE
 
-			if(z == cached_z)//same z level please, if no humans
-				return TRUE
-
 
 	return FALSE