diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 6b4dcda2c46..51f56d9d122 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -1,6 +1,6 @@
 //Returns the world time in english
-proc/worldtime2text()
-	return "[round(world.time / 36000)+12]:[(world.time / 600 % 60) < 10 ? add_zero(world.time / 600 % 60, 1) : world.time / 600 % 60]"
+proc/worldtime2text(time = world.time)
+	return "[round(time / 36000)+12]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]"
 
 proc/time_stamp()
 	return time2text(world.timeofday, "hh:mm:ss")
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 69bce4a4019..a11401c6680 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -719,7 +719,7 @@ note dizziness decrements automatically in the mob's Life() proc.
 				stat(null,"MasterController-ERROR")
 
 
-	if(spell_list.len)
+	if(spell_list && spell_list.len)
 		for(var/obj/effect/proc_holder/spell/S in spell_list)
 			switch(S.charge_type)
 				if("recharge")
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 52f4b1df861..77f966baf4c 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -96,7 +96,7 @@
 	if(status & ORGAN_BROKEN && prob(40) && brute)
 		owner.emote("scream")	//getting hit on broken hand hurts
 	if(used_weapon)
-		add_autopsy_data(used_weapon, brute + burn)
+		add_autopsy_data("[used_weapon]", brute + burn)
 
 	var/can_cut = (prob(brute*2) || sharp) && !(status & ORGAN_ROBOT)
 	// If the limbs can break, make sure we don't exceed the maximum damage a limb can take before breaking
diff --git a/code/modules/organs/wound.dm b/code/modules/organs/wound.dm
index 90909a3f62d..1d1f61ec918 100644
--- a/code/modules/organs/wound.dm
+++ b/code/modules/organs/wound.dm
@@ -145,7 +145,7 @@
 
 	proc/bleeding()
 		// internal wounds don't bleed in the sense of this function
-		return (!(bandaged||clamped) && (damage_type == BRUISE && damage >= 20 || damage_type == CUT) && current_stage <= max_bleeding_stage && !src.internal)
+		return (!(bandaged||clamped) && (damage_type == BRUISE && damage >= 20 || damage_type == CUT && damage >= 10) && current_stage <= max_bleeding_stage && !src.internal)
 
 /** CUTS **/
 /datum/wound/cut/small
diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm
index 8d988d43a32..5b90ba6a793 100644
--- a/code/modules/research/xenoarchaeology/finds/finds.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds.dm
@@ -520,7 +520,7 @@
 		new_item.name = name
 		new_item.desc = src.desc
 
-		if(talkative)
+		if(talkative && istype(new_item,/obj/item/weapon))
 			new_item.listening_to_players = 1
 			if(prob(25))
 				new_item.speaking_to_players = 1
diff --git a/config/game_options.txt b/config/game_options.txt
index 915612c7418..98fcad7f74b 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -19,7 +19,7 @@ ORGAN_HEALTH_MULTIPLIER 100
 
 ## multiplier which influences how fast organs regenerate naturally
 ## 100 means normal, 50 means half
-ORGAN_REGENERATION_MULTIPLIER 200
+ORGAN_REGENERATION_MULTIPLIER 20
 
 ### REVIVAL ###
 
diff --git a/html/changelog.html b/html/changelog.html
index 93e16139fb9..0cfb0f046a2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -58,6 +58,16 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit though. Thanks. -->
 
 <div class="commit sansserif">
+	<h2 class="date">26.06.2013</h2>
+	<h3 class="author">Segrain updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Autopsy scanner properly displays time of wound infliction and death.</li>
+		<li class="bugfix">Autopsy scanner properly displays wounds by projectile weapons.</li>
+	</ul>
+</div>
+
+<div class="commit sansserif">
+<<<<<<< HEAD
 	<h2 class="date">23.06.2013</h2>
 	<h3 class="author">Segrain updated:</h3>
 	<ul class="changes bgimages16">
@@ -73,6 +83,13 @@ should be listed in the changelog upon commit though. Thanks. -->
 		<li class="tweak">Some maintenance doors within RnD and Medbay have had their accesses changed. Maintenance doors in the joint areas (leading to the research shuttle, virology, and xenobiology) are now zero access. Which means anyone in those joints can enter the maintenance tunnels. This was done to add additional evacuation locations during radiation storms. Additional maintenance doors were added to the tunnels in these areas to prevent docs and scientists from running about.</li>
 		<li class="tweak">Starboard emergency storage isn't gone now, it's simply located in the escape wing.</li>
 		<li class="experiment">An engineering training room has been added to engineering. This location was previously where surgery was located. If you are new to engineering or need to brush up on your skills, please use this area for testing.</li>
+=======
+	<h2 class="date">26.06.2013</h2>
+	<h3 class="author">Segrain updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Autopsy scanner properly displays time of wound infliction and death.</li>
+		<li class="bugfix">Autopsy scanner properly displays wounds by projectile weapons.</li>
+>>>>>>> f1e3621ec6228115a8bf0fc1c12995064b2e176f
 	</ul>
 </div>