diff --git a/Document.txt b/Document.txt
index 03a6628..5ec1159 100644
--- a/Document.txt
+++ b/Document.txt
@@ -65,7 +65,7 @@ User_NoRifleDrop: Marines will never drop their rifles when killed.
 User_RetreatAttempts: The amount of times the marine tries to run out of sight of his target, when he needs to reload.
 - Default is 10. -1 makes the marine reload in the open, without trying to get behind cover at all.
 User_AlertRange: The distance around which a marine will alert other marines on his side of a target.
-- Default is 256 map units. -1 disables alerting entirely for this marine, but still allows them to hear the alerts of other marines.
+- Default is 384 map units. -1 disables alerting entirely for this marine, but still allows them to hear the alerts of other marines.
 User_EnemyAlertHearingRange: The distance around which a marine can hear the alerts of other, enemy marines.
 - Default is 1024 map units. -1 disables hearing enemy alerts entirely, but the marine can still be alerted by other marines on his side.
 User_MeleeChance: The chance of the marine to try changing position after smacking something once.
diff --git a/MAPINFO b/MAPINFO
index 5e4fab0..bca0a3c 100644
--- a/MAPINFO
+++ b/MAPINFO
@@ -4,9 +4,4 @@ DoomEdNums
 	8574 = TurretMarine
 	8575 = VanillaRifle
 	8576 = SmartMarineMGTurret
-}
-
-GameInfo
-{
-	//AddEventHandlers = "SmartMarineTauntHandler"
 }
\ No newline at end of file
diff --git a/ZScript.zsc b/ZScript.zsc
index 145bb6d..23f09b2 100644
--- a/ZScript.zsc
+++ b/ZScript.zsc
@@ -125,7 +125,7 @@ Class SmartMarine : Actor
 	
 	Override Bool OkayToSwitchTarget(Actor Other)
 	{
-		If (Other.bIsMonster && IsHostile(Other) && Other.Health > 0) {SM_AlertNearbyMarines(User_AlertRange,True);}
+		If ((Other.bIsMonster || Other.Player) && IsHostile(Other) && Other.Health > 0) {SM_AlertNearbyMarines(User_AlertRange,True);}
 		Return Super.OkayToSwitchTarget(Other);
 	}
 	
@@ -404,7 +404,8 @@ Class SmartMarine : Actor
 		DecideAttack: //Decide if you should use a turret, throw a grenade, or just shoot.
 			TNT1 A 0 SM_TurretUseDecision();
 			TNT1 A 0 A_JumpIf (GrenadeAttackDecision(),"ThrowGrenade"); //The code for GrenadeAttackDecision is in MarineFunctions.zsc.
-			Goto RifleBurst;
+			TNT1 A 0 A_JumpIf (!SM_CantHitTarget(True),"RifleBurst"); //Make sure nothing is getting in the way of the rifle hitscans.
+			Goto ChangePosition;
 		RifleSmack:
 			MARA A 3 A_JumpIf (SM_FindNearbyGrenade(),"RunAway");
 			MARM A 3;
diff --git a/credits.txt b/credits.txt
index ef29847..42143b7 100644
--- a/credits.txt
+++ b/credits.txt
@@ -14,7 +14,6 @@ Rifle melee sprites made by TG5.
 Grenade air blast sprites by Gorman Freebmane.
 Grenade sprites made by inkoalawetrust.
 Alternate marine death sprites made by DavidG/ItsNatureToDie.
-Rocket launcher marine sprites made by Vader, edited by Sergeant_Mark_IV, then edited again by TG5.
 Machine gun turret sprites made by Sergeant_Mark_IV, redrawn by TG5.
 
 ======|Other graphics|======