diff --git a/code/__DEFINES/statistic.dm b/code/__DEFINES/statistic.dm
index 99955161..68fbc2af 100644
--- a/code/__DEFINES/statistic.dm
+++ b/code/__DEFINES/statistic.dm
@@ -35,7 +35,7 @@ GLOBAL_LIST_INIT_TYPED(balance_formulas, /datum/autobalance_formula_row, setup_f
 #define STATISTIC_TYPE_JOB				"Role"
 #define STATISTIC_TYPE_WEAPON			"Weapon"
 
-#define STATISTICS_DEATH_LIST_LEN 20
+#define STATISTICS_DEATH_LIST_LEN		20
 
 #define STATISTICS_FF_SHOT_HIT			"FF Shot Hit"
 #define STATISTICS_SHOT_HIT				"Shot Hit"
@@ -112,7 +112,7 @@ GLOBAL_LIST_INIT_TYPED(balance_formulas, /datum/autobalance_formula_row, setup_f
 #define STATISTICS_DESTRUCTION_WINDOWS	"Windows Destroyed"
 
 
-#define STATISTIC_ALL					 STATISTIC_XENO_ALL + STATISTIC_ASSIST_ALL + STATISTIC_MISC_ALL + STATISTIC_MEDICINE_ALL + STATISTIC_DAMAGE_ALL + STATISTIC_DAMAGE_FF_ALL + STATISTIC_KDA_ALL + STATISTIC_KDA_FF_ALL + STATISTIC_ESCAPE_ALL + STATISTIC_ENGINEERING_ALL + STATISTIC_SURGERY_ALL + STATISTIC_ATTACK_ALL
+#define STATISTIC_ALL					STATISTIC_XENO_ALL + STATISTIC_ASSIST_ALL + STATISTIC_MISC_ALL + STATISTIC_MEDICINE_ALL + STATISTIC_DAMAGE_ALL + STATISTIC_DAMAGE_FF_ALL + STATISTIC_KDA_ALL + STATISTIC_KDA_FF_ALL + STATISTIC_ESCAPE_ALL + STATISTIC_ENGINEERING_ALL + STATISTIC_SURGERY_ALL + STATISTIC_ATTACK_ALL
 
 #define STATISTIC_XENO_ALL				list(STATISTICS_ABILITES, STATISTICS_FACEHUGGE, STATISTIC_XENO_STRUCTURES_BUILD)
 
diff --git a/code/datums/factions/autobalance_payload.dm b/code/datums/factions/autobalance_payload.dm
index d81ef456..7eb9e87a 100644
--- a/code/datums/factions/autobalance_payload.dm
+++ b/code/datums/factions/autobalance_payload.dm
@@ -25,9 +25,8 @@
 			average_pop[balance_row.active]++
 			last_pop[balance_row.active]++
 
-	new_esteminated_power += last_pop[1] - average_pop[1] * 100
-	new_esteminated_power += last_pop[2] - average_pop[2] * 100
-	new_esteminated_power += last_pop[3] - round_start_pop[3] * average_pop[3]
+	for(var/i = 1; i <= length(round_start_pop); i++)
+		new_esteminated_power += (last_pop[i] - average_pop[i] / average_fires - round_start_pop[i]) * 100
 
 	esteminated_power = new_esteminated_power
 	weight = new_weight
@@ -313,7 +312,7 @@
 		if("death")
 			active = 1
 		if("revive")
-			if(client.mob.client)
+			if(client.mob?.client)
 				active = 3
 			else
 				active = 2
diff --git a/code/game/objects/shrapnel.dm b/code/game/objects/shrapnel.dm
index 5f307655..e118ac81 100644
--- a/code/game/objects/shrapnel.dm
+++ b/code/game/objects/shrapnel.dm
@@ -1,11 +1,9 @@
 
 /proc/create_shrapnel(turf/epicenter, shrapnel_number = 10, shrapnel_direction, shrapnel_spread = 45, datum/ammo/shrapnel_type = /datum/ammo/bullet/shrapnel, datum/cause_data/cause_data, ignore_source_mob = FALSE, on_hit_coefficient = 0.15)
-
 	epicenter = get_turf(epicenter)
 
 	var/initial_angle = 0
 	var/angle_increment = 0
-
 	if(shrapnel_direction)
 		initial_angle = dir2angle(shrapnel_direction) - shrapnel_spread
 		angle_increment = shrapnel_spread*2/shrapnel_number