diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index dd9781c889f..e68543d509f 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -18,10 +18,17 @@
 		if(!body.original_name)
 			body.original_name = real_name
 		original_name = body.original_name
-		name = body.original_name
+		//name = body.original_name		//original
+		name = body.name
+		real_name = body.real_name
+
 		if(!name)
 			name = capitalize(pick(first_names_male) + " " + capitalize(pick(last_names)))
 			real_name = name
+
+		if( original_name != real_name )
+			name = name + " (died as [src.real_name])"
+
 		if(!safety)
 			corpse = body
 			verbs += /mob/dead/observer/proc/reenter_corpse
@@ -77,9 +84,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		verbs -= /mob/proc/ghost
 		if (ghost.client)
 			ghost.client.eye = ghost
-		if(issimpleanimal(src))
-			ghost.name  = ghost.name + " ([src.real_name])"
-			ghost.real_name  = ghost.real_name + " ([src.real_name])"
+		/*if(issimpleanimal(src))
+			ghost.name = src.name + " ([src.real_name])"
+			ghost.voice_name = src.name + " ([src.real_name])"*/
 	return
 
 /mob/proc/adminghostize()
@@ -180,7 +187,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		//move player into mouse
 		//the mouse ai will deactivate itself
 		client.mob = target_mouse
-		target_mouse.real_name = src.name
+		target_mouse.original_name = src.original_name
+		target_mouse.voice_name = src.real_name
 
 		//reset admin verbs
 		if(client && client.holder && client.holder.state == 2)
@@ -191,6 +199,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 		//update allowed verbs
 		target_mouse.verbs += /mob/proc/ghost
+		target_mouse.verbs -= /mob/verb/observe
 		target_mouse.verbs -= /client/verb/toggle_ghost_ears
 		target_mouse.verbs -= /client/verb/toggle_ghost_sight
 
diff --git a/code/modules/mob/simple_animal/mouse.dm b/code/modules/mob/simple_animal/mouse.dm
index 47efd59d3f6..2c020f3c714 100644
--- a/code/modules/mob/simple_animal/mouse.dm
+++ b/code/modules/mob/simple_animal/mouse.dm
@@ -1,5 +1,6 @@
 /mob/living/simple_animal/mouse
 	name = "mouse"
+	real_name = "mouse"
 	desc = "It's a small, disease-ridden rodent."
 	icon_state = "mouse_gray"
 	icon_living = "mouse_gray"
@@ -45,7 +46,7 @@
 	icon_state = "mouse_[color]"
 	icon_living = "mouse_[color]"
 	icon_dead = "mouse_[color]_dead"
-	desc = "It's a small [color] rodent, often seen hiding in maintenance areas."
+	desc = "It's a small [color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
 
 /mob/living/simple_animal/mouse/proc/splat()
 	src.health = 0
diff --git a/code/modules/mob/simple_animal/simple_animal.dm b/code/modules/mob/simple_animal/simple_animal.dm
index 16998d8a9c8..adf5fd58107 100644
--- a/code/modules/mob/simple_animal/simple_animal.dm
+++ b/code/modules/mob/simple_animal/simple_animal.dm
@@ -27,7 +27,7 @@
 
 	//Temperature effect
 	var/minbodytemp = 270
-	var/maxbodytemp = 305
+	var/maxbodytemp = 325
 	var/heat_damage_per_tick = 3	//amount of damage applied if animal's body temperature is higher than maxbodytemp
 	var/cold_damage_per_tick = 2	//same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp
 
diff --git a/code/modules/mob/simple_animal/simple_animal_misc.dm b/code/modules/mob/simple_animal/simple_animal_misc.dm
index 3e96eda4a9d..5db3ebe690c 100644
--- a/code/modules/mob/simple_animal/simple_animal_misc.dm
+++ b/code/modules/mob/simple_animal/simple_animal_misc.dm
@@ -1,9 +1,4 @@
 
-/mob/living/simple_animal/New()
-	..()
-	verbs -= /mob/verb/observe
-	real_name = src.name
-
 /mob/living/simple_animal/Login()
 	if(src && src.client)
 		src.client.screen = null
@@ -32,7 +27,7 @@
 			return "<b>[src]</b> [emote], \"[text]\""
 	return "says, \"[text]\"";
 
-//swhen talking, simple_animals can only understand each other
+//when talking, simple_animals can only understand each other
 /mob/living/simple_animal/say(var/message)
 	for(var/mob/M in view(src,7))
 		if(istype(M, src.type) || M.universal_speak)
@@ -199,6 +194,7 @@
 	stat = DEAD
 	density = 0
 	src << "\red You have died!"
+	verbs -= /mob/living/simple_animal/say
 	return
 
 /mob/living/simple_animal/ex_act(severity)