diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index c95aaf65bc5..28ca1fd0814 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -219,8 +219,8 @@
 				if ((stat & BROKEN) || malfhack)
 					user.visible_message(\
 						"\red [user.name] has broken the power control board inside [src.name]!",\
-						"You broke the charred power control board and remove remains.",
-						"You hear crack")
+						"You broke the charred power control board and remove the remains.",
+						"You hear a crack!")
 					//ticker.mode:apcs-- //XSI said no and I agreed. -rastaf0
 				else
 					user.visible_message(\
@@ -274,7 +274,7 @@
 					return
 				updateicon()
 		else if(emagged || malfhack)
-			user << "The interface is broken"
+			user << "The interface is broken."
 		else
 			wiresexposed = !wiresexposed
 			user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
@@ -315,7 +315,7 @@
 					user << "You fail to [ locked ? "unlock" : "lock"] the APC interface."
 	else if (istype(W, /obj/item/weapon/cable_coil) && !terminal && opened && has_electronics!=2)
 		if (src.loc:intact)
-			user << "\red You must remove the floor plating first."
+			user << "\red You must remove the floor plating in front of the APC first."
 			return
 		var/obj/item/weapon/cable_coil/C = W
 		if(C.amount < 10)
@@ -339,7 +339,7 @@
 			terminal.connect_to_network()
 	else if (istype(W, /obj/item/weapon/wirecutters) && terminal && opened && has_electronics!=2)
 		if (src.loc:intact)
-			user << "\red You must remove the floor plating first."
+			user << "\red You must remove the floor plating in front of the APC first."
 			return
 		user << "You begin to cut cables..."
 		playsound(src.loc, 'Deconstruct.ogg', 50, 1)
@@ -378,7 +378,7 @@
 					new /obj/item/stack/sheet/metal(loc)
 					user.visible_message(\
 						"\red [src] has been cut apart by [user.name] with the weldingtool.",\
-						"You disassembled brocken APC frame.",\
+						"You disassembled the broken APC frame.",\
 						"\red You hear welding.")
 				else
 					new /obj/item/apc_frame(loc)
@@ -394,13 +394,13 @@
 		if (opened==2)
 			opened = 1
 		user.visible_message(\
-			"\red [user.name] has replaced the damaged APC frontal panel with new one.",\
-			"You replace the damaged APC frontal panel with new one.")
+			"\red [user.name] has replaced the damaged APC frontal panel with a new one.",\
+			"You replace the damaged APC frontal panel with a new one.")
 		del(W)
 		updateicon()
 	else if (istype(W, /obj/item/apc_frame) && opened && ((stat & BROKEN) || malfhack))
 		if (has_electronics)
-			user << "You cannot repair this heavy damaged APC until broken electronics stills inside."
+			user << "You cannot repair this APC until you remove the electronics still inside."
 			return
 		user << "You begin to replace the damaged APC frame..."
 		if(do_after(user, 50))
diff --git a/html/changelog.html b/html/changelog.html
index ab9d1a0d9bc..45c2582e979 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -54,6 +54,22 @@ Stuff which is in development and not yet visible to players or just code relate
 (ie. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit tho. Thanks. -->
 
+<b><font color='blue'>3 December 2011</font><b>
+<ul>
+  <li><b>Petethegoat updated:</b>
+  <ul>
+    <li>Fixed all known vending machine issues.</li>
+    <li>Fixed a minor visual bug with emagged lockers.</li>
+    <li>Clarified some of the APC construction/deconstruction messages.</li>
+  </ul>
+  </li>
+  <li><b>Numbers updated:</b>
+  <ul>
+    <li>Potency variations tipped in favour of bigger changes over smaller periods of time.</li>
+  </ul>
+  </li>
+</ul>
+
 <b><font color='blue'>30 November 2011</font><b>
 <ul>
   <li><b><a href='#' id='vinylscratch_link' onclick="changeText('vinylscratch_tag','Lasty', 'vinylscratch_link')"><span id='vinylscratch_tag'>Vinyl Scratch</span></a> updated:</b>
@@ -70,7 +86,6 @@ should be listed in the changelog upon commit tho. Thanks. -->
   <ul>
     <li>Changeling husks are now borgable again (though not clonable) and genome requirements were lowered</li>
     <li>De-revved revolutionaries had their message clarified a bit. You remember the person who flashed you, and so can out ONE revhead</li>
-    <li>Janitors buggy trashbag replaced with a standard storage item with twenty slots (though it can only hold tiny items)</li>
     <li>Light tubes/bulbs can now be created in the autolathe. Recycle those broken lights!</li>
   </ul>
   </li>
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index a451a7b7e3a..6613b68e398 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ
diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi
index 0862939d247..e77570de6ad 100644
Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ