diff --git a/scripts/TWM2/Bosses/LordYvex.cs b/scripts/TWM2/Bosses/LordYvex.cs
index 03297fa..788e5be 100644
--- a/scripts/TWM2/Bosses/LordYvex.cs
+++ b/scripts/TWM2/Bosses/LordYvex.cs
@@ -629,9 +629,10 @@ function YvexAttacks(%yvex) {
    if(!isObject(%yvex) || %yvex.getState() $= "dead") {
       return;
    }
-   %closestClient = ZombieLookForTarget(%zombie);
-   %closestDistance = getWord(%closestClient,1);
+   %closestClient = ZombieLookForTarget(%yvex);
+   //%closestDistance = getWord(%closestClient,1);
    %closestClient = getWord(%closestClient,0).Player;
+   %closestDistance = vectorDist(%yvex.getPosition(), %closestClient.getPosition());
    
    if(%closestClient) {
       if(%closestDistance <= 150) {
@@ -885,7 +886,7 @@ function Yvexnightmareloop(%zombie,%viewer) {
 }
 
 function KillerPulse::onCollision(%data,%projectile,%targetObject,%modifier,%position,%normal) {
-   if (%targetObject.getClassName() $= "Player" && %targetObject.isBoss) {
+   if (%targetObject.getClassName() $= "Player" && !%targetObject.isBoss) {
       messageall('msgkillcurse', "\c5"@getTaggedString(%targetObject.client.name)@" Took a fatal Hit from "@$TWM2::ZombieName[7]@"'s Dark Energy");
       %targetObject.throwWeapon();
       %targetObject.clearinventory();
diff --git a/scripts/TWM2/Systems/WeaponChallenges.cs b/scripts/TWM2/Systems/WeaponChallenges.cs
index 51855cb..08175dc 100644
--- a/scripts/TWM2/Systems/WeaponChallenges.cs
+++ b/scripts/TWM2/Systems/WeaponChallenges.cs
@@ -158,7 +158,7 @@ function GenerateCompletedChallegnesMenu(%client, %tag, %index) {
             %Image = %db.getName().image;
             if(%Image.HasChallenges) {
                if(DoMedalCheck(%client, %image) == 1 && CanUseRankedWeapon(%image, %client) == 1) {
-                  messageClient( %client, 'SetLineHud', "", %tag, %index, "<a:gamelink\tCompletedSub\t"@%Image@"\t1>"@%Image.GunName@"</a>");
+                  messageClient( %client, 'SetLineHud', "", %tag, %index, "<a:gamelink\tWeaponUpgradesSub\t"@%Image@"\t1>"@%Image.GunName@"</a>");
                   %index++;
                }
                else {
diff --git a/scripts/projectiles.cs b/scripts/projectiles.cs
index ad91d45..269d354 100644
--- a/scripts/projectiles.cs
+++ b/scripts/projectiles.cs
@@ -17,8 +17,14 @@
 //
 function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal) {
    if(isObject(%targetObject)) { // Console spam fix - ToS. z0ddm0d
-      if(!(%targetObject.getType() & ($TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType)) && (%targetObject.getDataBlock().getClassName() $= "PlayerData")) {
-         %damLoc = firstWord(%targetObject.getDamageLocation(%position));
+      if(!(%targetObject.getType() & ($TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType)) 
+		  && (%targetObject.getType() & ($TypeMasks::PlayerObjectType | $TypeMasks::VehicleObjectType))) {
+		 if(%targetObject.getType() & $TypeMasks::PlayerObjectType) {
+            %damLoc = firstWord(%targetObject.getDamageLocation(%position));
+		 }
+		 else {
+		    %damLoc = "";
+		 }
          %test = TWM2Damage(%projectile, %targetObject, %data.directDamage, %data.directDamageType, %damLoc, "projectile");
          if(%test == 0) {
             return;