diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c
index 792f74bb7..38a604e9c 100644
--- a/polymer/eduke32/source/actors.c
+++ b/polymer/eduke32/source/actors.c
@@ -2977,16 +2977,11 @@ ACTOR_STATIC void G_MoveWeapons(void)
 
             A_GetZLimits(i);
 
-            switch (DYNAMICTILEMAP(s->picnum))
+            if (s->picnum == RPG && actor[i].picnum != BOSS2 && s->xrepeat >= 10 &&
+                    sector[s->sectnum].lotag != ST_2_UNDERWATER)
             {
-            case RPG__STATIC:
-                if (DYNAMICTILEMAP(s->picnum) == RPG__STATIC && actor[i].picnum != BOSS2 &&
-                    s->xrepeat >= 10 && sector[s->sectnum].lotag != ST_2_UNDERWATER)
-                {
-                    j = A_Spawn(i,SMALLSMOKE);
-                    sprite[j].z += (1<<8);
-                }
-                break;
+                j = A_Spawn(i,SMALLSMOKE);
+                sprite[j].z += (1<<8);
             }
 
             {
@@ -3069,7 +3064,8 @@ ACTOR_STATIC void G_MoveWeapons(void)
                 {
                     j &= (MAXWALLS-1);
 
-                    if (s->picnum != RPG && s->picnum != FREEZEBLAST && s->picnum != SPIT && (wall[j].overpicnum == MIRROR || wall[j].picnum == MIRROR))
+                    if (s->picnum != RPG && s->picnum != FREEZEBLAST && s->picnum != SPIT &&
+                            (wall[j].overpicnum == MIRROR || wall[j].picnum == MIRROR))
                     {
                         Proj_BounceOffWall(s, j);
                         s->owner = i;
@@ -3143,7 +3139,6 @@ ACTOR_STATIC void G_MoveWeapons(void)
                                 sprite[k].cstat |= 8;
                                 sprite[k].z += (48<<8);
                             }
-
                         }
 
                         if (s->xrepeat >= 10)
@@ -3174,7 +3169,6 @@ ACTOR_STATIC void G_MoveWeapons(void)
                                 sprite[k].cstat |= 8;
                                 sprite[k].z += (72<<8);
                             }
-
                         }
                     }
                 }
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 9078a1286..e61ffabc6 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -7346,7 +7346,7 @@ FOUNDCHEAT:
 
                         if (k != CHEAT_COMEGETSOME)
                         {
-                            P_DoQuote(QUOTE_CHEAT_GODMODE_ON,g_player[myconnectindex].ps);
+                            P_DoQuote(QUOTE_CHEAT_GODMODE_ON, g_player[myconnectindex].ps);
                         }
                         else
                         {
@@ -7355,21 +7355,22 @@ FOUNDCHEAT:
                             S_PlaySound(DUKE_GETWEAPON2);
                             P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
                             G_CheatGetInv();
+
                             for (weapon = PISTOL_WEAPON; weapon < MAX_WEAPONS; weapon++)
                                 g_player[myconnectindex].ps->gotweapon |= (1<<weapon);
 
-                            for (weapon = PISTOL_WEAPON; weapon < (MAX_WEAPONS); weapon++)
+                            for (weapon = PISTOL_WEAPON; weapon < MAX_WEAPONS; weapon++)
                                 P_AddAmmo(weapon, g_player[myconnectindex].ps, g_player[myconnectindex].ps->max_ammo_amount[weapon]);
+
                             g_player[myconnectindex].ps->got_access = 7;
                         }
-
                     }
                     else
                     {
                         sprite[pi].extra = g_player[myconnectindex].ps->max_player_health;
                         actor[pi].extra = -1;
                         g_player[myconnectindex].ps->last_extra = g_player[myconnectindex].ps->max_player_health;
-                        P_DoQuote(QUOTE_CHEAT_GODMODE_OFF,g_player[myconnectindex].ps);
+                        P_DoQuote(QUOTE_CHEAT_GODMODE_OFF, g_player[myconnectindex].ps);
                     }
 
                     sprite[pi].extra = g_player[myconnectindex].ps->max_player_health;
diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index a2b9e2968..69908160c 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -4770,7 +4770,9 @@ void P_ProcessInput(int32_t snum)
                             P_QuickKill(p);
                         else if (p->falling_counter > 9)
                         {
+                            // Falling damage.
                             s->extra -= p->falling_counter-(krand()&3);
+
                             if (s->extra <= 0)
                             {
                                 A_PlaySound(SQUISHED,p->i);