diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index af05c8bac..dd94c693b 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -489,14 +489,28 @@ void M32_ResetFakeRORTiles(void)
 
 void M32_DrawRoomsAndMasks(void)
 {
+    static int srchwall = -1;
+
     VM_OnEvent(EVENT_PREDRAW3DSCREEN, -1);
 
     yax_preparedrawrooms();
     drawrooms(pos.x,pos.y,pos.z,ang,horiz,cursectnum);
     yax_drawrooms(CallExtAnalyzeSprites, cursectnum, 0, 0);
 
+    const int osearchwall=searchwall, osearchstat=searchstat;
+    if (srchwall >= 0)
+    {
+        // a.m32 states 'tduprot' and 'tduplin' need searchstat to check for
+        // whether we've hit a sprite, but these would be only set after the
+        // drawmasks(). Hence this hackish workaround.
+        searchstat = 3;
+        searchwall = srchwall;
+    }
     CallExtAnalyzeSprites(0,0,0,0);
+    searchwall = osearchwall, searchstat=osearchstat;
+
     drawmasks();
+    srchwall = (searchstat == 3) ? searchwall : -1;
     M32_ResetFakeRORTiles();
 
 #ifdef POLYMER
diff --git a/polymer/eduke32/package/sdk/samples/a.m32 b/polymer/eduke32/package/sdk/samples/a.m32
index 229fe3f67..a2ba248a5 100644
--- a/polymer/eduke32/package/sdk/samples/a.m32
+++ b/polymer/eduke32/package/sdk/samples/a.m32
@@ -1121,7 +1121,7 @@ defstate respawnpreview
     ife showrespawn_always 0
     {
         ifaimingsprite ife sprite[searchwall].picnum RESPAWN nullop
-        else break
+        else return
     }
 
     set onumtspr spritesortcnt
diff --git a/polymer/eduke32/package/sdk/samples/m32script_ex.map b/polymer/eduke32/package/sdk/samples/m32script_ex.map
index 87e571ee1..eb4dac189 100644
Binary files a/polymer/eduke32/package/sdk/samples/m32script_ex.map and b/polymer/eduke32/package/sdk/samples/m32script_ex.map differ
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 113f70b92..75592a09e 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -5021,7 +5021,7 @@ static void Keys3d(void)
                 {
                     if (ASSERT_AIMING)
                     {
-                        if (AIMING_AT_SPRITE && (show2dsprite[searchwall>>3]&(1<<(searchwall&7))))
+                        if (!eitherSHIFT && AIMING_AT_SPRITE && (show2dsprite[searchwall>>3]&(1<<(searchwall&7))))
                         {
                             for (i=0; i<highlightcnt; i++)
                                 if (highlight[i]&16384)
diff --git a/polymer/eduke32/source/lunatic/doc/lunacon.txt b/polymer/eduke32/source/lunatic/doc/lunacon.txt
index 7510f70bb..1373e9bb4 100644
--- a/polymer/eduke32/source/lunatic/doc/lunacon.txt
+++ b/polymer/eduke32/source/lunatic/doc/lunacon.txt
@@ -33,7 +33,7 @@ correctness in a broad sense, which encompasses multiple issues.
 * On the run-time side, most checking is done by Lunatic. For example, indexing
   actor gamevars with out-of-bounds values produces an error that gets
   permanently displayed on the screen. Like with Lua code, the
-  link:lunatic.html/#error[error] entry in the log then contains a traceback
+  link:lunatic.html#error[error] entry in the log then contains a traceback
   annotated with line numbers, making it possible for the CON coder to pinpoint
   its location and context.
 
@@ -313,7 +313,7 @@ Behavior on error
 As LunaCON is implemented by translating all given CON code to a Lunatic
 module, it is the Lunatic runtime that checks for proper use of its services at
 execution time and takes care of error handling and reporting. In Lua, an error
-link:lunatic.html/#nlcf[transfers control] to the end of the innermost
+link:lunatic.html#nlcf[transfers control] to the end of the innermost
 ``protected'' call of a Lua chunk.
 
 This is in contrast to C-CON, which for some errors would print a message to
diff --git a/polymer/eduke32/source/m32exec.c b/polymer/eduke32/source/m32exec.c
index 3977e6dcc..14f12c3ba 100644
--- a/polymer/eduke32/source/m32exec.c
+++ b/polymer/eduke32/source/m32exec.c
@@ -366,6 +366,7 @@ skip_check:
             return 1;
         case CON_BREAK:
             vm.flags |= VMFLAG_BREAK;
+            // XXX: may not be cleared subsequently?
         case CON_ENDS:
             return 1;