diff --git a/code/game/dna.dm b/code/game/dna.dm
index 9b3e6e960c..7c012019af 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -691,27 +691,32 @@
 			var/mob/occupant = src.connected.occupant
 			dat = "<font color='blue'><B>Occupant Statistics:</B></FONT><BR>" //Blah obvious
 			if (occupant) //is there REALLY someone in there?
-				if (!istype(occupant,/mob/living/carbon/human))
-					sleep(1)
-				var/t1
-				switch(occupant.stat) // obvious, see what their status is
-					if(0)
-						t1 = "Conscious"
-					if(1)
-						t1 = "Unconscious"
-					else
-						t1 = "*dead*"
-				dat += text("[]\tHealth %: [] ([])</FONT><BR>", (occupant.health > 50 ? "<font color='blue'>" : "<font color='red'>"), occupant.health, t1)
-				dat += text("<font color='green'>Radiation Level: []%</FONT><BR><BR>", occupant.radiation)
-				dat += text("Unique Enzymes : <font color='blue'>[]</FONT><BR>", uppertext(occupant.dna.unique_enzymes))
-				dat += text("Unique Identifier: <font color='blue'>[]</FONT><BR>", occupant.dna.uni_identity)
-				dat += text("Structural Enzymes: <font color='blue'>[]</FONT><BR><BR>", occupant.dna.struc_enzymes)
-				dat += text("<A href='?src=\ref[];unimenu=1'>Modify Unique Identifier</A><BR>", src)
-				dat += text("<A href='?src=\ref[];strucmenu=1'>Modify Structural Enzymes</A><BR><BR>", src)
-				dat += text("<A href='?src=\ref[];buffermenu=1'>View/Edit/Transfer Buffer</A><BR><BR>", src)
-				dat += text("<A href='?src=\ref[];genpulse=1'>Pulse Radiation</A><BR>", src)
-				dat += text("<A href='?src=\ref[];radset=1'>Radiation Emitter Settings</A><BR><BR>", src)
-				dat += text("<A href='?src=\ref[];rejuv=1'>Inject Rejuvenators</A><BR><BR>", src)
+				if(occupant.mutations & HUSK)
+					dat += "The occupant's DNA structure is of an unknown configuration, please insert a subject with a standard DNA structure.<BR><BR>" //NOPE. -Pete
+					dat += text("<A href='?src=\ref[];buffermenu=1'>View/Edit/Transfer Buffer</A><BR><BR>", src)
+					dat += text("<A href='?src=\ref[];radset=1'>Radiation Emitter Settings</A><BR><BR>", src)
+				else
+					if (!istype(occupant,/mob/living/carbon/human))
+						sleep(1)
+					var/t1
+					switch(occupant.stat) // obvious, see what their status is
+						if(0)
+							t1 = "Conscious"
+						if(1)
+							t1 = "Unconscious"
+						else
+							t1 = "*dead*"
+					dat += text("[]\tHealth %: [] ([])</FONT><BR>", (occupant.health > 50 ? "<font color='blue'>" : "<font color='red'>"), occupant.health, t1)
+					dat += text("<font color='green'>Radiation Level: []%</FONT><BR><BR>", occupant.radiation)
+					dat += text("Unique Enzymes : <font color='blue'>[]</FONT><BR>", uppertext(occupant.dna.unique_enzymes))
+					dat += text("Unique Identifier: <font color='blue'>[]</FONT><BR>", occupant.dna.uni_identity)
+					dat += text("Structural Enzymes: <font color='blue'>[]</FONT><BR><BR>", occupant.dna.struc_enzymes)
+					dat += text("<A href='?src=\ref[];unimenu=1'>Modify Unique Identifier</A><BR>", src)
+					dat += text("<A href='?src=\ref[];strucmenu=1'>Modify Structural Enzymes</A><BR><BR>", src)
+					dat += text("<A href='?src=\ref[];buffermenu=1'>View/Edit/Transfer Buffer</A><BR><BR>", src)
+					dat += text("<A href='?src=\ref[];genpulse=1'>Pulse Radiation</A><BR>", src)
+					dat += text("<A href='?src=\ref[];radset=1'>Radiation Emitter Settings</A><BR><BR>", src)
+					dat += text("<A href='?src=\ref[];rejuv=1'>Inject Rejuvenators</A><BR><BR>", src)
 			else
 				dat += "The scanner is empty.<BR><BR>"
 				dat += text("<A href='?src=\ref[];buffermenu=1'>View/Edit/Transfer Buffer</A><BR><BR>", src)
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index f01665210e..0a57dec0de 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -106,7 +106,8 @@
 				"\blue [user] has added one of [O] to \the [src].", \
 				"\blue You add one of [O] to \the [src].")
 		else
-			user.before_take_item(O)
+		//	user.before_take_item(O)	//This just causes problems so far as I can tell. -Pete
+			user.drop_item()
 			O.loc = src
 			user.visible_message( \
 				"\blue [user] has added \the [O] to \the [src].", \
diff --git a/code/game/objects/stacks/glass.dm b/code/game/objects/stacks/glass.dm
index ca5b0f1e05..04dd4284ce 100644
--- a/code/game/objects/stacks/glass.dm
+++ b/code/game/objects/stacks/glass.dm
@@ -139,14 +139,14 @@ SHARDS
 	src.icon_state = pick("large", "medium", "small")
 	switch(src.icon_state)
 		if("small")
-			src.pixel_x = rand(1, 18)
-			src.pixel_y = rand(1, 18)
+			src.pixel_x = rand(-12, 12)
+			src.pixel_y = rand(-12, 12)
 		if("medium")
-			src.pixel_x = rand(1, 16)
-			src.pixel_y = rand(1, 16)
+			src.pixel_x = rand(-8, 8)
+			src.pixel_y = rand(-8, 8)
 		if("large")
-			src.pixel_x = rand(1, 10)
-			src.pixel_y = rand(1, 5)
+			src.pixel_x = rand(-5, 5)
+			src.pixel_y = rand(-5, 5)
 		else
 	return
 
diff --git a/icons/obj/shards.dmi b/icons/obj/shards.dmi
index f6dc588e7d..5ae1402c36 100644
Binary files a/icons/obj/shards.dmi and b/icons/obj/shards.dmi differ