diff --git a/source/src/command.cpp b/source/src/command.cpp
index e96b9824..d3544250 100644
--- a/source/src/command.cpp
+++ b/source/src/command.cpp
@@ -674,6 +674,12 @@ int notequal(int a, int b) { return (int)(a!=b); } COMMANDN(!=, notequal, ARG_2E
 int lt(int a, int b)    { return (int)(a<b); }  COMMANDN(<, lt, ARG_2EXP);
 int gt(int a, int b)    { return (int)(a>b); }  COMMANDN(>, gt, ARG_2EXP);
 
+void anda (char *a, char *b) { intret(execute(a)!=0 && execute(b)!=0); }
+void ora  (char *a, char *b) { intret(execute(a)!=0 || execute(b)!=0); }
+
+COMMANDN(&&, anda, "ss");
+COMMANDN(||, ora, "ss");
+
 int strcmpa(char *a, char *b) { return strcmp(a,b)==0; }  COMMANDN(strcmp, strcmpa, ARG_2EST);
 
 int rndn(int a)    { return a>0 ? rnd(a) : 0; }  COMMANDN(rnd, rndn, ARG_1EXP);
diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp
index 47f03be9..8989e544 100644
--- a/source/src/rendergl.cpp
+++ b/source/src/rendergl.cpp
@@ -1064,10 +1064,16 @@ void drawstencilshadows()
 
         if(dbgtiles)
         {
-            memcpy(shadowtiles, debugtiles, sizeof(debugtiles));
             glDisable(GL_STENCIL_TEST);
-            glColor3f(0.5f, 0.5f, 1);
+            glColor3f(0.5f, 1, 0.5f);
+            memcpy(shadowtiles, debugtiles, sizeof(debugtiles));
             rendershadowtiles();
+            glColor3f(0, 0, 1);
+            glDisable(GL_BLEND);
+            glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+            memcpy(shadowtiles, debugtiles, sizeof(debugtiles));
+            rendershadowtiles();
+            glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
         }
 
         glMatrixMode(GL_PROJECTION);