diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 704081437e..e1e6ecd23f 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -68,7 +68,7 @@
 	item_state = "candlebox5"
 	throwforce = 2
 	slot_flags = SLOT_BELT
-	max_storage_space = ITEMSIZE_COST_SMALL * 5
+	max_storage_space = ITEMSIZE_COST_TINY * 5	//CHOMPEdit
 	starts_with = list(/obj/item/weapon/flame/candle = 5)
 
 /obj/item/weapon/storage/fancy/whitecandle_box
@@ -80,7 +80,7 @@
 	item_state = "whitecandlebox5"
 	throwforce = 2
 	slot_flags = SLOT_BELT
-	max_storage_space = ITEMSIZE_COST_SMALL * 5
+	max_storage_space = ITEMSIZE_COST_TINY * 5	//CHOMPEdit
 	starts_with = list(/obj/item/weapon/flame/candle/white = 5)
 
 /obj/item/weapon/storage/fancy/blackcandle_box
@@ -92,7 +92,7 @@
 	item_state = "blackcandlebox5"
 	throwforce = 2
 	slot_flags = SLOT_BELT
-	max_storage_space = ITEMSIZE_COST_SMALL * 5
+	max_storage_space = ITEMSIZE_COST_TINY * 5	//CHOMPEdit
 	starts_with = list(/obj/item/weapon/flame/candle/black = 5)
 
 
diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm
index 5d2baa08a8..d43c144e4b 100644
--- a/code/modules/client/preference_setup/vore/07_traits.dm
+++ b/code/modules/client/preference_setup/vore/07_traits.dm
@@ -184,9 +184,12 @@
 		return TOPIC_REFRESH
 
 	else if(href_list["clicked_pos_trait"])
+		var/traitpath = text2path(href_list["clicked_pos_trait"])	//CHOMPEdit
 		var/datum/trait/trait = text2path(href_list["clicked_pos_trait"])
 		var/choice = alert("Remove [initial(trait.name)] and regain [initial(trait.cost)] points?","Remove Trait","Remove","Cancel")
 		if(choice == "Remove")
+			if(traitpath == /datum/trait/linguist)					//CHOMPEdit
+				pref.num_languages = 0								//CHOMPEdit
 			pref.pos_traits -= trait
 		return TOPIC_REFRESH
 
@@ -287,7 +290,8 @@
 				alert("You cannot take this trait and [conflict] at the same time. \
 				Please remove that trait, or pick another trait to add.","Error")
 				return TOPIC_REFRESH
-
+			if(path==/datum/trait/linguist)	//CHOMPEdit
+				pref.num_languages = 12		//CHOMPEdit
 			mylist += path
 			return TOPIC_REFRESH
 
diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index 5f4685da95..fbeaf29f05 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -77,12 +77,16 @@
 	update_lighting()
 
 /obj/item/integrated_circuit/output/light/proc/update_lighting()
-	if(light_toggled)
-		if(assembly)
-			assembly.set_light(l_range = light_brightness, l_power = light_brightness, l_color = light_rgb)
-	else
-		if(assembly)
-			assembly.set_light(0)
+	//CHOMPEdit Begin
+	if(assembly)
+		var/atom/light_source = assembly
+		if(istype(assembly,/obj/item/device/electronic_assembly/clothing))
+			light_source = assembly.loc
+		if(light_toggled)
+			light_source.set_light(l_range = light_brightness, l_power = light_brightness, l_color = light_rgb)
+		else
+			light_source.set_light(0)
+	//CHOMPEdit End
 	power_draw_idle = light_toggled ? light_brightness * light_brightness : 0 // Should be the same draw as regular lights.
 
 /obj/item/integrated_circuit/output/light/power_fail() // Turns off the flashlight if there's no power left.
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative_ch.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative_ch.dm
index ac04d2be3c..86146bf761 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative_ch.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative_ch.dm
@@ -71,9 +71,10 @@
 				H.loneliness_stage -= 4
 			return
 		// Check for company.
-		for(var/mob/living/M in viewers(H))
+		for(var/mob/living/M in viewers(get_turf(H)))
 			if(check_mob_company(H,M))
 				return
+		//Check to see if there's anyone in our belly
 		if(H.vore_organs)
 			for(var/obj/belly/B in H.vore_organs)
 				for(var/mob/living/content in B.contents)
diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm
index 0594e2abb3..739539f40e 100644
--- a/code/modules/projectiles/guns/magnetic/bore.dm
+++ b/code/modules/projectiles/guns/magnetic/bore.dm
@@ -150,7 +150,7 @@
 			return
 
 		var/can_hold_val = 0
-		while(can_hold_val < round(max_mat_storage / 2000))
+		while(can_hold_val < M.amount)	//CHOMPEdit
 			if(mat_storage + 2000 <= max_mat_storage && do_after(user,1.5 SECONDS))
 				can_hold_val ++
 				mat_storage += 2000