diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar
index a57b72b..05e4215 100644
Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ
diff --git a/src/sig/plugin/TwosideKeeper/CustomDamage.java b/src/sig/plugin/TwosideKeeper/CustomDamage.java
index 0e94f26..380f08f 100644
--- a/src/sig/plugin/TwosideKeeper/CustomDamage.java
+++ b/src/sig/plugin/TwosideKeeper/CustomDamage.java
@@ -426,14 +426,14 @@ public class CustomDamage {
 				}
 				
 				for (LivingEntity ent : hitlist) {
+					if (applyDeathMark) {
+						GenericFunctions.ApplyDeathMark(ent);
+					}
 					if (!ent.equals(target)) {
 						//hitlist.get(i).damage(dmg);
 						//GenericFunctions.DealDamageToMob(CalculateDamageReduction(dmg,target,damager), hitlist.get(i), shooter, weapon, "AoE Damage");
 						ApplyDamage(0,damager,ent,weapon,"AoE Damage",setFlag(flags,NOAOE));
 					};
-					if (applyDeathMark) {
-						GenericFunctions.ApplyDeathMark(ent);
-					}
 				}
 				
 				final List<LivingEntity> finallist = hitlist;
@@ -2121,7 +2121,9 @@ public class CustomDamage {
 		{
 			if (shooter instanceof Player) {
 				Player p = (Player)shooter;
-				p.playSound(p.getLocation(), Sound.ENTITY_SHULKER_TELEPORT, 1f, 3.65f);
+				if (PlayerMode.getPlayerMode(p)==PlayerMode.SLAYER) {
+					p.playSound(p.getLocation(), Sound.ENTITY_SHULKER_TELEPORT, 1f, 3.65f);
+				}
 			}
 			return true;
 		} else {
diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/PlayerMode.java b/src/sig/plugin/TwosideKeeper/HelperStructures/PlayerMode.java
index 9c98eb7..e2d2f2c 100644
--- a/src/sig/plugin/TwosideKeeper/HelperStructures/PlayerMode.java
+++ b/src/sig/plugin/TwosideKeeper/HelperStructures/PlayerMode.java
@@ -116,7 +116,11 @@ public enum PlayerMode {
 	}
 
 	public static boolean needsUpdating(PlayerStructure pd) {
-		return pd.lastmodeupdate+UPDATE_GRACE_PERIOD<=TwosideKeeper.getServerTickTime();
+		if (pd!=null) { 
+			return pd.lastmodeupdate+UPDATE_GRACE_PERIOD<=TwosideKeeper.getServerTickTime();
+		} else {
+			return false;
+		}
 	}
 
 	public static boolean isRanger(Player p) {
diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
index 207bce7..c5ea4bf 100644
--- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
+++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java
@@ -2624,7 +2624,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
 				}
 				if (reset) {
 					pd.last_deathmark = getServerTickTime()-GenericFunctions.GetModifiedCooldown(TwosideKeeper.DEATHMARK_COOLDOWN,player)+20;
-					aPlugin.API.sendCooldownPacket(player, player.getEquipment().getItemInMainHand(), 20);
+					aPlugin.API.sendCooldownPacket(player, player.getEquipment().getItemInMainHand(), 10);
 				}
 			}
 		}