diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index cad6765ee..ca11c5ba1 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,10 @@
+December 18, 2008
+- Decal changes as per Xaser's suggestions: Smaller decal for PhoenixFX2,
+  CrossbowFX2 and MaceFX4 were missing decals, and HornRodFX2 gets a whole
+  new decal.
+- Fixed: bfgscrc2.png had some holes in the middle that did not look so good.
+  (From previously being handled through WinTex, maybe?)
+
 December 17, 2008
 - Fixed: Thing_ProjectileIntercept broke slightly when converted to the new
   vector math routines (almost two years ago!) because the original code
diff --git a/src/s_sound.cpp b/src/s_sound.cpp
index 120ed3d3d..6943d2ab9 100644
--- a/src/s_sound.cpp
+++ b/src/s_sound.cpp
@@ -664,7 +664,7 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector,
 			break;
 
 		case SOURCE_Actor:
-			assert(actor != NULL);
+//			assert(actor != NULL);
 			if (actor != NULL)
 			{
 				x = actor->x;
@@ -715,14 +715,11 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector,
 	if (vel != NULL)
 	{
 		// Only actors maintain velocity information.
-		if (type == SOURCE_Actor)
+		if (type == SOURCE_Actor && actor != NULL)
 		{
-			if (actor != NULL)
-			{
-				vel->X = FIXED2FLOAT(actor->momx) * TICRATE;
-				vel->Y = FIXED2FLOAT(actor->momz) * TICRATE;
-				vel->Z = FIXED2FLOAT(actor->momy) * TICRATE;
-			}
+			vel->X = FIXED2FLOAT(actor->momx) * TICRATE;
+			vel->Y = FIXED2FLOAT(actor->momz) * TICRATE;
+			vel->Z = FIXED2FLOAT(actor->momy) * TICRATE;
 		}
 		else
 		{
diff --git a/wadsrc/static/decaldef.txt b/wadsrc/static/decaldef.txt
index 46d031e02..2bacce720 100644
--- a/wadsrc/static/decaldef.txt
+++ b/wadsrc/static/decaldef.txt
@@ -772,6 +772,30 @@ decal CrossbowScorch2
 	randomflipy
 }
 
+/***** Phoenix Rod, flamethrower mode **************************************/
+
+decal PhoenixThrowerScorch
+{
+	pic CBALSCR1
+	shade "00 00 00"
+	x-scale 0.4
+	y-scale 0.4
+	randomflipx
+	randomflipy
+}
+
+/***** "Horn Rod", rain maker projectile ***********************************/
+
+decal HornyRainMaker
+{
+	pic TWIRL
+	shade "00 00 00"
+	x-scale 0.7
+	y-scale 0.7
+	randomflipx
+	randomflipy
+}
+
 /***** Centaur Scorches ****************************************************/
 
 decal CentaurScorch
@@ -990,15 +1014,17 @@ generator GoldWand			RailScorchLower
 generator GoldWandPowered		RailScorchLower
 generator GoldWandFX1			HImpScorch
 generator CrossbowFX1			CrossbowScorch
+generator CrossbowFX2			CrossbowScorch
 generator CrossbowFX3			CrossbowScorch2
 generator MaceFX1			BaronScorch
+generator MaceFX4			BFGScorch
 generator Blaster			RailScorchLower
 generator BlasterFX1			HImpScorch
 generator Ripper			HImpScorch
 generator HornRodFX1			PlasmaScorchLower
-generator HornRodFX2			PlasmaScorchLower
+generator HornRodFX2			HornyRainMaker
 generator PhoenixFX1			Scorch
-generator PhoenixFX2			Scorch
+generator PhoenixFX2			PhoenixThrowerScorch
 
 generator CStaffMissile			DoomImpScorch
 generator HammerMissile			Scorch
diff --git a/wadsrc/static/graphics/bfgscrc2.png b/wadsrc/static/graphics/bfgscrc2.png
index 1f8dcf9cd..fab62b873 100644
Binary files a/wadsrc/static/graphics/bfgscrc2.png and b/wadsrc/static/graphics/bfgscrc2.png differ
diff --git a/wadsrc/static/graphics/twirl.png b/wadsrc/static/graphics/twirl.png
new file mode 100644
index 000000000..7caa0968f
Binary files /dev/null and b/wadsrc/static/graphics/twirl.png differ