diff --git a/war/src/main/java/bukkit/tommytony/war/WarEntityListener.java b/war/src/main/java/bukkit/tommytony/war/WarEntityListener.java
index eb5fa5b..d5f6086 100644
--- a/war/src/main/java/bukkit/tommytony/war/WarEntityListener.java
+++ b/war/src/main/java/bukkit/tommytony/war/WarEntityListener.java
@@ -151,12 +151,6 @@ public class WarEntityListener extends EntityListener {
 					}
 					defenderWarzone.handleDeath(d);
 					
-
-					if (War.war.isSpoutServer()) {
-						// make sure score is updated
-						War.war.getSpoutMessenger().updateStats(defenderWarzone);
-					}
-					
 					event.setCancelled(true);
 				}
 			} else if (attackerTeam != null && defenderTeam != null && attackerTeam == defenderTeam && attackerWarzone == defenderWarzone && attacker.getEntityId() != defender.getEntityId()) {
@@ -196,7 +190,7 @@ public class WarEntityListener extends EntityListener {
 			Warzone defenderWarzone = Warzone.getZoneByPlayerName(d.getName());
 			if (d != null && defenderWarzone != null && event.getDamage() >= d.getHealth()) {
 				String deathMessage = "";
-				String defenderString = Team.getTeamByPlayerName(d.getName()).getKind().getColor() + d.getDisplayName();
+				String defenderString = Team.getTeamByPlayerName(d.getName()).getKind().getColor() + d.getName();
 				
 				if (event.getDamager() instanceof CraftTNTPrimed) {
 					deathMessage = defenderString + ChatColor.WHITE + " exploded";
@@ -360,7 +354,7 @@ public class WarEntityListener extends EntityListener {
 				} else if (event.getCause() == DamageCause.FALL) {
 					cause = " fell to an untimely death";
 				}
-				deathMessage = Team.getTeamByPlayerName(player.getName()).getKind().getColor() + player.getDisplayName() + ChatColor.WHITE + cause;
+				deathMessage = Team.getTeamByPlayerName(player.getName()).getKind().getColor() + player.getName() + ChatColor.WHITE + cause;
 				for (Team team : zone.getTeams()) {
 					team.teamcast(deathMessage);
 				}
diff --git a/war/src/main/java/com/tommytony/war/Team.java b/war/src/main/java/com/tommytony/war/Team.java
index 6992e0c..04cece7 100644
--- a/war/src/main/java/com/tommytony/war/Team.java
+++ b/war/src/main/java/com/tommytony/war/Team.java
@@ -323,6 +323,10 @@ public class Team {
 
 			SignHelper.setToSign(War.war, signBlock, (byte) signData, lines);
 		}
+		
+		if (War.war.isSpoutServer()) {
+			War.war.getSpoutMessenger().updateStats(this.warzone);
+		}
 	}
 
 	private void setBlock(int x, int y, int z, TeamKind kind) {
diff --git a/war/src/main/java/com/tommytony/war/Warzone.java b/war/src/main/java/com/tommytony/war/Warzone.java
index 33dd7f4..d50e04e 100644
--- a/war/src/main/java/com/tommytony/war/Warzone.java
+++ b/war/src/main/java/com/tommytony/war/Warzone.java
@@ -726,8 +726,8 @@ public class Warzone {
 							SpoutPlayer sp = SpoutManager.getPlayer(p);
 							if (sp.isSpoutCraftEnabled()) {
 				                sp.sendNotification(
-				                		SpoutMessenger.cleanForNotification("Round over! " + ChatColor.WHITE + "Team " + playerTeam.getKind().getColor() + playerTeam.getName()),
-				                		SpoutMessenger.cleanForNotification("had no more lives."),
+				                		SpoutMessenger.cleanForNotification("Round over! " + playerTeam.getKind().getColor() + playerTeam.getName()),
+				                		SpoutMessenger.cleanForNotification("ran out of lives."),
 				                		playerTeam.getKind().getMaterial(),
 				                		playerTeam.getKind().getData(),
 				                		5000);
diff --git a/war/src/main/java/com/tommytony/war/spout/SpoutMessenger.java b/war/src/main/java/com/tommytony/war/spout/SpoutMessenger.java
index a715898..2217ba7 100644
--- a/war/src/main/java/com/tommytony/war/spout/SpoutMessenger.java
+++ b/war/src/main/java/com/tommytony/war/spout/SpoutMessenger.java
@@ -137,14 +137,13 @@ public class SpoutMessenger {
 	        int lineCounter = 1;
 			for (Team t : zone.getTeams()) {
 				// team name
-				String teamStr = t.getName() + "-" + t.getPlayers().size() + "/" + t.getTeamConfig().resolveInt(TeamConfig.TEAMSIZE);
+				String teamStr = t.getName() + " (" + t.getPlayers().size() + "/" + t.getTeamConfig().resolveInt(TeamConfig.TEAMSIZE) + ")";
 				line = new GenericLabel(teamStr);
 				if (t.getPlayers().size() == 0) {
-					line.setText(teamStr.replace("-", " "));
 					line.setTextColor(new Color(100,100,100));
 				}
 				else {
-					line.setText(t.getKind().getColor() + teamStr.replace("-", " " + ChatColor.WHITE));
+					line.setText(t.getKind().getColor() + teamStr.replace("(", ChatColor.GRAY + "(" + ChatColor.WHITE).replace(")", ChatColor.GRAY + ")" + ChatColor.WHITE));
 				}
 				line.setTooltip("Warzone: " + zone.getName()).setAnchor(WidgetAnchor.TOP_LEFT);
 		        line.setAlign(WidgetAnchor.TOP_LEFT).setX(2).setY(4 + lineCounter * 8).setWidth(GenericLabel.getStringWidth(line.getText())).setHeight(GenericLabel.getStringHeight(line.getText()));
@@ -246,7 +245,7 @@ public class SpoutMessenger {
 			
 			drawStats(player, statsLines);
 			
-			if (messages.size() > 0) {
+			if (messages != null && messages.size() > 0) {
 				int rank = 0;			
 				Warzone zone = Warzone.getZoneByPlayerName(playerName);			
 				int verticalOffset = statsOffset + 4;