diff --git a/polymer/eduke32/build/include/m32script.h b/polymer/eduke32/build/include/m32script.h
index bcc06ecf4..62ba98ecb 100644
--- a/polymer/eduke32/build/include/m32script.h
+++ b/polymer/eduke32/build/include/m32script.h
@@ -169,11 +169,6 @@ extern uint32_t m32_drawlinepat;
 
 extern int32_t g_iReturnVar;
 extern int32_t m32_sortvar1, m32_sortvar2;
-extern int32_t g_iReturnVarID;
-extern int32_t g_iLoTagID;          // var ID of "LOTAG"
-extern int32_t g_iHiTagID;          // var ID of "HITAG"
-extern int32_t g_iTextureID;        // var ID of "TEXTURE"
-extern int32_t g_iThisActorID;        // var ID of "I"     ///"THISACTOR"
 
 //extern int32_t g_numRealPalettes;
 //extern int32_t g_scriptDebug;
@@ -182,7 +177,7 @@ extern int32_t g_numQuoteRedefinitions;
 
 extern hashtable_t h_gamevars;
 extern hashtable_t h_arrays;
-extern hashtable_t h_keywords;
+//extern hashtable_t h_keywords;
 extern hashtable_t h_gamefuncs;
 
 
@@ -232,4 +227,23 @@ extern int32_t numsprites;
 extern int32_t zoom;
 extern int32_t halfxdim16, midydim16;
 
+
+#define M32_FLAG_NEGATE (MAXGAMEVARS<<1)
+#define M32_FLAG_ARRAY (MAXGAMEVARS<<2)
+#define M32_FLAG_SPECIAL (MAXGAMEVARS<<3)
+
+// IDs of special vars
+#define M32_SPRITE_VAR_ID 0
+#define M32_SECTOR_VAR_ID 1
+#define M32_WALL_VAR_ID 2
+#define M32_TSPRITE_VAR_ID 3
+
+#define M32_THISACTOR_VAR_ID 4
+#define M32_RETURN_VAR_ID 5
+#define M32_LOTAG_VAR_ID 6
+#define M32_HITAG_VAR_ID 7
+#define M32_TEXTURE_VAR_ID 8
+
+#define M32_PRINTERROR(Text, ...) OSD_Printf(OSD_ERROR "Line %d, %s: " Text "\n", g_errorLineNum, keyw[g_tw], ## __VA_ARGS__)
+
 #endif
diff --git a/polymer/eduke32/build/src/config.c b/polymer/eduke32/build/src/config.c
index fbbe95b81..33a9d38c7 100644
--- a/polymer/eduke32/build/src/config.c
+++ b/polymer/eduke32/build/src/config.c
@@ -244,9 +244,10 @@ int32_t loadsetup(const char *fn)
         graphicsmode = min(max(Batoi(val),0),2);
 
     if (readconfig(fp, "ambiencetoggle", val, VL) > 0) AmbienceToggle = Batoi(val);
-
     if (readconfig(fp, "parlock", val, VL) > 0) ParentalLock = Batoi(val);
 
+    if (readconfig(fp, "osdtryscript", val, VL) > 0) m32_osd_tryscript = Batoi(val);
+
     for (i=0; i<256; i++)
         remap[i]=i;
 
@@ -399,7 +400,12 @@ int32_t writesetup(const char *fn)
              "graphicsmode = %d\n\n"
              "; Ambient sounds in 3D mode (0:off, 1:on)\n"
              "ambiencetoggle = %d\n"
-             "parlock = %d\n\n"
+             "parlock = %d\n"
+             "\n"
+             "; Try executing m32script on invalid command in the OSD? This makes\n"
+             "; typing m32script commands into the OSD directly possible.\n"
+             "osdtryscript = %d\n"
+             "\n"
 #if 1
              "; Key Settings\n"
              ";  Here's a map of all the keyboard scan codes: NOTE: values are listed in hex!\n"
@@ -470,6 +476,7 @@ int32_t writesetup(const char *fn)
              option[3], msens, unrealedlook, pk_uedaccel, quickmapcycling,
              revertCTRL,scrollamount,pk_turnaccel,pk_turndecel,autosave,
              showheightindicators,graphicsmode,AmbienceToggle,ParentalLock,
+             !!m32_osd_tryscript,
 #if 1
              keys[0], keys[1], keys[2], keys[3], keys[4], keys[5],
              keys[6], keys[7], keys[8], keys[9], keys[10], keys[11],
diff --git a/polymer/eduke32/build/src/osd.c b/polymer/eduke32/build/src/osd.c
index f7d80e3ac..f4ade505f 100644
--- a/polymer/eduke32/build/src/osd.c
+++ b/polymer/eduke32/build/src/osd.c
@@ -124,6 +124,9 @@ static cvar_t *cvars = NULL;
 static uint32_t osdnumcvars = 0;
 static hashtable_t h_cvars      = { MAXSYMBOLS<<1, NULL };
 
+int32_t m32_osd_tryscript=0;  // whether to try executing m32script on unkown command in the osd
+extern void M32RunScript(const char *s);
+
 int32_t OSD_RegisterCvar(const cvar_t *cvar)
 {
     const char *cp;
@@ -1653,8 +1656,14 @@ int32_t OSD_Dispatch(const char *cmd)
 
         if ((symb = findexactsymbol(wp)) == NULL)
         {
-            if (wp[0] != '/' || wp[1] != '/') // cheap hack for comments in cfgs
+            if ((wp[0] != '/' || wp[1] != '/') && !m32_osd_tryscript) // cheap hack for comments in cfgs
+            {
                 OSD_Printf(OSDTEXT_RED "\"%s\" is not a valid command or cvar\n", wp);
+            }
+            else if (m32_osd_tryscript)
+            {
+                M32RunScript(cmd);
+            }
             Bfree(workbuf);
             return -1;
         }
diff --git a/polymer/eduke32/m32script_ex.map b/polymer/eduke32/m32script_ex.map
index babb2c915..4f50ae3ef 100755
Binary files a/polymer/eduke32/m32script_ex.map and b/polymer/eduke32/m32script_ex.map differ
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 4dedc28df..0ad4c689e 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -4616,7 +4616,7 @@ static void Keys3d(void)
                 {
                     if (ASSERT_AIMING)
                     {
-                        AIMED_CF_SEL(shade) += tsign;
+                        AIMED_CF_SEL(shade) += tsign*(1+3*eitherCTRL);
                         message("%s %d shade %d", Typestr[searchstat], i, AIMED_CF_SEL(shade));
                     }
                 }
@@ -7310,6 +7310,7 @@ static int32_t osdcmd_noclip(const osdfuncparm_t *parm)
 {
     UNREFERENCED_PARAMETER(parm);
     noclip = !noclip;
+    OSD_Printf("Clipping %s\n", noclip?"disabled":"enabled");
 
     return OSDCMD_OK;
 }
@@ -7410,6 +7411,11 @@ static int32_t osdcmd_vars_pk(const osdfuncparm_t *parm)
             pk_uedaccel = pk_uedaccel>5 ? 5:pk_uedaccel;
         }
     }
+    else if (!Bstrcasecmp(parm->name, "osd_tryscript"))
+    {
+        m32_osd_tryscript = !m32_osd_tryscript;
+        OSD_Printf("Try M32 script execution on invalid OSD command: %s\n", m32_osd_tryscript?"on":"off");
+    }
     return OSDCMD_OK;
 }
 
@@ -7498,30 +7504,30 @@ static int32_t osdcmd_do(const osdfuncparm_t *parm)
 {
     intptr_t tscrofs;
     char *tp;
-    int32_t i, j, slen;
+    int32_t i, j, slen, ofs;
     int32_t onumconstants=g_numSavedConstants;
 
-    if (parm->numparms < 1)
+    if (parm->numparms==0)
         return OSDCMD_SHOWHELP;
 
     tscrofs = (g_scriptPtr-script);
 
-    slen = Bstrlen(parm->raw+2);
+    ofs = 2*(parm->numparms>0);  // true if "do" command
+    slen = Bstrlen(parm->raw+ofs);
     tp = Bmalloc(slen+2);
-    if (!tp)
-    {
-        initprintf("OUT OF MEMORY!\n");
-        return OSDCMD_OK;
-    }
+    if (!tp) goto OUTOFMEM;
+    Bmemcpy(tp, parm->raw+ofs, slen);
 
-    Bmemcpy(tp, parm->raw+2, slen);
+    // needed so that subsequent commands won't execute old stuff.
     tp[slen] = '\n';
     tp[slen+1] = '\0';
 
     g_didDefineSomething = 0;
 
     C_Compile(tp, 0);
-    Bfree(tp);
+
+    if (parm->numparms>=0)
+        Bfree(tp);
 
     if (g_numCompilerErrors)
     {
@@ -7547,12 +7553,24 @@ static int32_t osdcmd_do(const osdfuncparm_t *parm)
     }
 
     return OSDCMD_OK;
+OUTOFMEM:
+    OSD_Printf("OUT OF MEMORY!\n");
+    return OSDCMD_OK;
+}
+
+void M32RunScript(const char *s)
+{
+    osdfuncparm_t parm;
+
+    parm.numparms = -1;
+    parm.raw = s;
+
+    osdcmd_do(&parm);
 }
 
 static int32_t osdcmd_endisableevent(const osdfuncparm_t *parm)
 {
     int32_t i, j, enable;
-    char buf[64] = "EVENT_";
 
     if (!label) return OSDCMD_OK;
 
@@ -7569,28 +7587,44 @@ static int32_t osdcmd_endisableevent(const osdfuncparm_t *parm)
 
     if (parm->numparms == 1)
     {
-        if (!Bstrcasecmp(parm->parms[0], "all"))
+        if (!Bstrcasecmp(parm->parms[0], "all") || !Bstrcasecmp(parm->parms[0], "a"))
         {
             for (i=0; i<MAXEVENTS; i++)
                 aEventEnabled[i] = enable?1:0;
+            OSD_Printf("Enabled all events.\n");
             return OSDCMD_OK;
         }
     }
 
     for (i=0; i<parm->numparms; i++)
     {
+        char buf[64] = "EVENT_", buf2[64];
+
         if (isdigit(parm->parms[i][0]))
+        {
             j = atoi(parm->parms[i]);
+            Bsprintf(buf2, "event %d", j);
+        }
         else if (!Bstrncmp(parm->parms[i], "EVENT_", 6))
+        {
             j = hash_find(&h_labels, parm->parms[i]);
+            Bstrncpy(buf2, parm->parms[i], sizeof(buf2));
+            buf2[sizeof(buf2)-1] = '\0';
+        }
         else
         {
             Bstrncat(buf, parm->parms[i], sizeof(buf)-6-1);
             j = hash_find(&h_labels, buf);
+            Bmemcpy(buf2, buf, sizeof(buf2));
         }
 
         if (j>=0 && j<MAXEVENTS)
+        {
             aEventEnabled[j] = enable?1:0;
+            OSD_Printf("%sabled %s.\n", enable?"En":"Dis", buf2);
+        }
+        else
+            OSD_Printf("Invalid event %s.\n", buf2);
     }
     return OSDCMD_OK;
 }
@@ -7629,6 +7663,7 @@ static int32_t registerosdcommands(void)
     OSD_RegisterFunction("scriptinfo", "scriptinfo: shows information about compiled M32 script", osdcmd_scriptinfo);
     OSD_RegisterFunction("enableevent", "enableevent <all|EVENT_...|(event number)>", osdcmd_endisableevent);
     OSD_RegisterFunction("disableevent", "disableevent <all|EVENT_...|(event number)>", osdcmd_endisableevent);
+    OSD_RegisterFunction("osd_tryscript", "osd_tryscript: Toggles execution of M32 script on invalid OSD command", osdcmd_vars_pk);
 //    OSD_RegisterFunction("disasm", "disasm [s|e] <state or event number>", osdcmd_disasm);
     return 0;
 }
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 75804e7ee..f53a6ebc4 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -198,6 +198,8 @@ uint32_t g_frameDelay = 0;
 extern char forcegl;
 #endif
 
+void M32RunScript(const char *s) {};  // needed for linking since it's referenced from build/src/osd.c
+
 int32_t kopen4loadfrommod(char *filename, char searchfirst)
 {
     static char fn[BMAX_PATH];
@@ -11776,6 +11778,9 @@ MAIN_LOOP_RESTART:
     }
     else G_UpdateScreenArea();
 
+//    G_GameExit(" "); ///
+
+//    ud.auto_run = ud.config.RunMode;
     ud.showweapons = ud.config.ShowOpponentWeapons;
     g_player[myconnectindex].ps->aim_mode = ud.mouseaiming;
     g_player[myconnectindex].ps->auto_aim = ud.config.AutoAim;
diff --git a/polymer/eduke32/source/m32def.c b/polymer/eduke32/source/m32def.c
index 509af7718..65e3b13b6 100644
--- a/polymer/eduke32/source/m32def.c
+++ b/polymer/eduke32/source/m32def.c
@@ -84,16 +84,6 @@ static char tlabel[MAXLABELLEN];
 
 int32_t g_iReturnVar=0;
 int32_t m32_sortvar1, m32_sortvar2;
-int32_t g_iReturnVarID=-1;      // var ID of "RETURN"
-int32_t g_iLoTagID=-1;          // var ID of "LOTAG"
-int32_t g_iHiTagID=-1;          // var ID of "HITAG"
-int32_t g_iTextureID=-1;        // var ID of "TEXTURE"
-
-int32_t g_iThisActorID=-1;        // var ID of "I"  ///"THISACTOR"
-
-int32_t g_iSpriteVarID=-1;
-int32_t g_iSectorVarID=-1;
-int32_t g_iWallVarID=-1;
 
 char *ScriptQuotes[MAXQUOTES+1], *ScriptQuoteRedefinitions[MAXQUOTES+1];
 int32_t g_numQuoteRedefinitions = 0;
@@ -113,18 +103,17 @@ int32_t g_gameArrayCount=0, g_systemArrayCount=0;
 
 void C_ReportError(int32_t iError);
 
-
 enum ScriptLabel_t
 {
     LABEL_ANY    = -1,
     LABEL_DEFINE = 1,
-    LABEL_EVENT  = 2,
+    LABEL_EVENT  = 2
 };
 
 static const char *LabelTypeText[] =
 {
     "define",
-    "event",
+    "event"
 };
 
 static const char *C_GetLabelType(int32_t type)
@@ -516,13 +505,14 @@ const tokenmap_t iter_tokens[] =
 hashtable_t h_gamevars = { MAXGAMEVARS>>1, NULL };
 hashtable_t h_arrays   = { MAXGAMEARRAYS>>1, NULL };
 hashtable_t h_labels   = { 11262>>1, NULL };
-hashtable_t h_states   = { 1264>>1, NULL };
-hashtable_t h_keywords    = { CON_END>>1, NULL };
-hashtable_t iterH    = { ITER_END, NULL };
 
-hashtable_t sectorH  = { SECTOR_END>>1, NULL };
-hashtable_t wallH    = { WALL_END>>1, NULL };
-hashtable_t spriteH  = { SPRITE_END>>1, NULL };
+static hashtable_t h_states   = { 1264>>1, NULL };
+static hashtable_t h_keywords = { CON_END>>1, NULL };
+static hashtable_t h_iter    = { ITER_END, NULL };
+
+static hashtable_t h_sector  = { SECTOR_END>>1, NULL };
+static hashtable_t h_wall    = { WALL_END>>1, NULL };
+static hashtable_t h_sprite  = { SPRITE_END>>1, NULL };
 
 
 static void C_InitHashes()
@@ -540,23 +530,23 @@ static void C_InitHashes()
     for (i=0; i<NUMALTKEYWORDS; i++)
         hash_add(&h_keywords, altkeyw[i].token, altkeyw[i].val);
 
-    hash_init(&sectorH);
+    hash_init(&h_sector);
     for (i=0; SectorLabels[i].lId >=0; i++)
-        hash_add(&sectorH,SectorLabels[i].name,i);
-    hash_add(&sectorH,"filler",SECTOR_ALIGNTO);
+        hash_add(&h_sector,SectorLabels[i].name,i);
+    hash_add(&h_sector,"filler", SECTOR_ALIGNTO);
 
-    hash_init(&wallH);
+    hash_init(&h_wall);
     for (i=0; WallLabels[i].lId >=0; i++)
-        hash_add(&wallH,WallLabels[i].name,i);
+        hash_add(&h_wall,WallLabels[i].name,i);
 
-    hash_init(&spriteH);
+    hash_init(&h_sprite);
     for (i=0; SpriteLabels[i].lId >=0; i++)
-        hash_add(&spriteH,SpriteLabels[i].name,i);
-    hash_add(&spriteH,"filler",SPRITE_DETAIL);
+        hash_add(&h_sprite,SpriteLabels[i].name,i);
+    hash_add(&h_sprite,"filler", SPRITE_DETAIL);
 
-    hash_init(&iterH);
+    hash_init(&h_iter);
     for (i=0; iter_tokens[i].val >=0; i++)
-        hash_add(&iterH, iter_tokens[i].token, iter_tokens[i].val);
+        hash_add(&h_iter, iter_tokens[i].token, iter_tokens[i].val);
 }
 
 static int32_t C_SetScriptSize(int32_t size)
@@ -573,16 +563,16 @@ static int32_t C_SetScriptSize(int32_t size)
 
     //initprintf("offset: %d\n",(unsigned)(g_scriptPtr-script));
     g_scriptSize = size;
-    initprintf("Resizing code buffer to %d*%d bytes\n",g_scriptSize, sizeof(instype));
+    initprintf("Resizing code buffer to %d*%d bytes\n", g_scriptSize, sizeof(instype));
 
     newscript = (instype *)Brealloc(script, g_scriptSize * sizeof(instype));
 
     if (newscript == NULL)
     {
         C_ReportError(-1);
-        initprintf("%s:%d: out of memory: Aborted (%ud)\n",g_szScriptFileName,g_lineNumber,(unsigned)(g_scriptPtr-script));
-        initprintf(tempbuf);
+        initprintf("%s:%d: out of memory: Aborted (%ud)\n", g_szScriptFileName, g_lineNumber, (unsigned)(g_scriptPtr-script));
         g_numCompilerErrors++;
+//        initprintf(tempbuf);
         return 1;
     }
 
@@ -606,31 +596,36 @@ static int32_t C_SetScriptSize(int32_t size)
     return 0;
 }
 
+static inline int32_t ispecial(char c)
+{
+    return c==' ' || c=='\t' || c=='\n' || c=='\r' || c=='(' || c==')' || c==',' || c==';';
+}
+
+static inline int32_t isaltok(char c)
+{
+    return isalnum(c) || c == '#' || c == '{' || c == '}' || c == '/' || c == '\\' ||
+                         c == '*' || c == '-' || c == '_' || c == '.';
+}
+
 static int32_t C_SkipComments(void)
 {
     char c = *textptr;
 
     do
     {
-        if (c == ' ' || c == '\t' || c == '\r')
-            textptr++;
-        else if (c == '\n')
+        if (ispecial(c))
         {
-            g_lineNumber++;
             textptr++;
+            g_lineNumber += (c=='\n');
         }
         else if (c == '/' && textptr[1] == '/')
         {
-//            if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug > 1)
-//                initprintf("%s:%d: debug: got comment.\n",g_szScriptFileName,g_lineNumber);
-
-            while (*textptr != 0x0a && *textptr != 0x0d && *textptr != 0)
+            while (*textptr && *textptr != 0x0a && *textptr != 0x0d)
                 textptr++;
         }
         else if (c == '/' && textptr[1] == '*')
         {
-//            if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug > 1)
-//                initprintf("%s:%d: debug: got start of comment block.\n",g_szScriptFileName,g_lineNumber);
+            textptr += 2;
 
             while (*textptr && !(textptr[0] == '*' && textptr[1] == '/'))
             {
@@ -639,23 +634,18 @@ static int32_t C_SkipComments(void)
                 textptr++;
             }
 
-//            if ((!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug > 1) && (textptr[0] == '*' && textptr[1] == '/'))
-//                initprintf("%s:%d: debug: got end of comment block.\n",g_szScriptFileName,g_lineNumber);
-
             if (!*textptr)
             {
-//                if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug)
-//                    initprintf("%s:%d: debug: EOF in comment!\n",g_szScriptFileName,g_lineNumber);
-                C_ReportError(-1);
-                initprintf("%s:%d: error: found `/*' with no `*/'.\n",g_szScriptFileName,g_lineNumber);
+                C_CUSTOMERROR("found `/*' with no `*/'.");
                 cs.numBraces = 0;
                 cs.currentStateIdx = -1;
-                g_numCompilerErrors++;
                 break;
             }
-            else textptr += 2;
+
+            textptr += 2;
         }
-        else break;
+        else
+            break;
     }
     while ((c = *textptr));
 
@@ -665,30 +655,14 @@ static int32_t C_SkipComments(void)
     return 0;
 }
 
-static inline int32_t ispecial(const char c)
-{
-    if (c == ' ' || c == 0x0d || c == '(' || c == ')' ||
-            c == ',' || c == ';' || (c == 0x0a /*&& ++g_lineNumber*/))
-        return 1;
-
-    return 0;
-}
-
-static inline int32_t isaltok(const char c)
-{
-    return (isalnum(c) || c == '#' || c == '{' || c == '}' || c == '/' || c == '\\' ||
-            c == '*' || c == '-' || c == '_' || c == '.');
-}
-
 static inline int32_t C_GetLabelNameID(const memberlabel_t *pLabel, hashtable_t *tH, const char *psz)
 {
     // find the label psz in the table pLabel.
     // returns the ID for the label, or -1
 
-    int32_t l=-1;
-
-    l = hash_findcase(tH,psz);
-    if (l>=0) l=pLabel[l].lId;
+    int32_t l = hash_findcase(tH, psz);
+    if (l>=0)
+        l = pLabel[l].lId;
 
     return l;
 }
@@ -699,16 +673,23 @@ static void C_GetNextLabelName(void)
 
     C_SkipComments();
 
-    while (isalnum(*textptr) == 0)
+    if (*textptr == 0)
     {
-        if (*textptr == 0x0a) g_lineNumber++;
+        C_CUSTOMERROR("unexpected EOF where label was expected.");
+        return;
+    }
+
+    while (!isalnum(*textptr))
+    {
+        g_lineNumber += (*textptr == 0x0a);
+
         textptr++;
-        if (*textptr == 0)
+        if (!*textptr)
             return;
     }
 
     i = 0;
-    while (!ispecial(*textptr) && *textptr!='['&& *textptr!=']' && *textptr!='\t' && *textptr!='\n' && *textptr!='\r')
+    while (!ispecial(*textptr) && *textptr!='['&& *textptr!=']')
     {
         if (i < MAXLABELLEN-1)
             tlabel[i++] = *(textptr++);
@@ -728,6 +709,7 @@ static int32_t C_CopyLabel(void)
         label = Brealloc(label, 2*label_allocsize*MAXLABELLEN*sizeof(char));
         labelval = Brealloc(labelval, 2*label_allocsize*sizeof(labelval[0]));
         labeltype = Brealloc(labeltype, 2*label_allocsize*sizeof(labeltype[0]));
+
         if (label==NULL || labelval==NULL || labeltype==NULL)
         {
             label_allocsize = 0;
@@ -748,12 +730,15 @@ static int32_t C_GetKeyword(void)
 
     C_SkipComments();
 
+    if (*textptr == 0)
+        return -1;
+
     temptextptr = textptr;
 
-    while (isaltok(*temptextptr) == 0)
+    while (!isaltok(*temptextptr))
     {
         temptextptr++;
-        if (*temptextptr == 0)
+        if (!*temptextptr)
             return 0;
     }
 
@@ -761,6 +746,7 @@ static int32_t C_GetKeyword(void)
     while (isaltok(*temptextptr))
         tempbuf[i++] = *(temptextptr++);
     tempbuf[i] = 0;
+
     return hash_find(&h_keywords, tempbuf);
 }
 
@@ -770,11 +756,16 @@ static int32_t C_GetNextKeyword(void)  //Returns its code #
 
     C_SkipComments();
 
-    while (isaltok(*textptr) == 0)
+    if (*textptr == 0)
+        return -1;
+
+    while (!isaltok(*textptr))
     {
-        if (*textptr == 0x0a) g_lineNumber++;
-        if (*textptr == 0)
+        g_lineNumber += (*textptr == 0x0a);
+
+        if (!*textptr)
             return -1;
+
         textptr++;
     }
 
@@ -796,7 +787,8 @@ static int32_t C_GetNextKeyword(void)  //Returns its code #
     {
         if (i == CON_LEFTBRACE || i == CON_RIGHTBRACE || i == CON_NULLOP)
             *g_scriptPtr = i + (IFELSE_MAGIC<<12);
-        else *g_scriptPtr = i + (g_lineNumber<<12);
+        else
+            *g_scriptPtr = i + (g_lineNumber<<12);
 
         textptr += l;
         g_scriptPtr++;
@@ -810,16 +802,18 @@ static int32_t C_GetNextKeyword(void)  //Returns its code #
 
     if (tempbuf[0] == '{' && tempbuf[1] != 0)
     {
-        C_ReportError(-1);
-        initprintf("%s:%d: error: expected whitespace between `{' and `%s'.\n",g_szScriptFileName,g_lineNumber,tempbuf+1);
+        C_CUSTOMERROR("expected whitespace between `{' and `%s'", tempbuf+1);
     }
     else if (tempbuf[0] == '}' && tempbuf[1] != 0)
     {
-        C_ReportError(-1);
-        initprintf("%s:%d: error: expected whitespace between `}' and `%s'.\n",g_szScriptFileName,g_lineNumber,tempbuf+1);
+        C_CUSTOMERROR("expected whitespace between `}' and `%s'", tempbuf+1);
     }
-    else C_ReportError(ERROR_EXPECTEDKEYWORD);
-    g_numCompilerErrors++;
+    else
+    {
+        C_ReportError(ERROR_EXPECTEDKEYWORD);
+        g_numCompilerErrors++;
+    }
+
     return -1;
 }
 
@@ -832,11 +826,17 @@ static void C_GetNextVarType(int32_t type)
 
     C_SkipComments();
 
+    if (*textptr == 0)
+    {
+        C_CUSTOMERROR("unexpected EOF where variable was expected.");
+        return;
+    }
+
     g_wasConstant = 0;
 
     // constant where gamevar expected
     if ((type==0 || type==GAMEVAR_SPECIAL) && !cs.labelsOnly &&
-            (isdigit(*textptr) || ((*textptr == '-') && isdigit(*(textptr+1)))))
+            (isdigit(textptr[0]) || (textptr[0]=='-' && isdigit(textptr[1]))))
     {
 //        if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug)
 //            initprintf("%s:%d: debug: accepted constant %d in place of gamevar.\n",g_szScriptFileName,g_lineNumber,atol(textptr));
@@ -847,11 +847,7 @@ static void C_GetNextVarType(int32_t type)
             num = atoi(textptr);
 
         if (type==GAMEVAR_SPECIAL && (num<0 || num>=65536))
-        {
-            C_ReportError(-1);
-            initprintf("%s:%d: error: array index %d out of bounds. (max: 65535)\n",g_szScriptFileName,g_lineNumber, num);
-            g_numCompilerErrors++;
-        }
+            C_CUSTOMERROR("array index %d out of bounds. (max: 65535)",  num);
 
         if (g_numCompilerErrors==0 && type!=GAMEVAR_SPECIAL && num != (int16_t)num)
         {
@@ -884,42 +880,47 @@ static void C_GetNextVarType(int32_t type)
 
         if (type!=GAMEVAR_SPECIAL)
             g_wasConstant = 1;
+
         *g_scriptPtr++ = MAXGAMEVARS | (num<<16) | indirect;
 
-        while (!ispecial(*textptr) && *textptr != ']') textptr++;
+        while (!ispecial(*textptr) && *textptr != ']')
+            textptr++;
 
         return;
     }
-    else if (*textptr == '-' && *(textptr+1)!='.' /* && !isdigit(*(textptr+1))*/)
+    else if (textptr[0]=='-' && textptr[1] != '.') //  && !isdigit(*(textptr+1))
     {
         if (type==0)
         {
 //            if (!(g_numCompilerErrors || g_numCompilerWarnings) && g_scriptDebug)
 //                initprintf("%s:%d: debug: flagging gamevar as negative.\n",g_szScriptFileName,g_lineNumber,atol(textptr));
-            flags = (MAXGAMEVARS<<1);
+            flags = M32_FLAG_NEGATE;
         }
         else
         {
-            g_numCompilerErrors++;
-            C_ReportError(ERROR_SYNTAXERROR);
+            C_CUSTOMERROR("error: syntax error. Tried negating written-to variable.");
             C_GetNextLabelName();
             return;
         }
     }
-    else if (type!=GAMEVAR_SPECIAL && (*textptr == '.' || (*textptr == '-' && *(textptr+1)=='.')))
+    else if (type != GAMEVAR_SPECIAL &&
+                 (textptr[0]=='.' || (textptr[0]=='-' && textptr[1]=='.')))
     {
-        int32_t lLabelID = -1, aridx=g_iThisActorID;
+        int32_t lLabelID = -1, aridx = M32_THISACTOR_VAR_ID;
+
+        flags |= M32_FLAG_SPECIAL;
 
-        flags |= (MAXGAMEVARS<<3);
         if (*textptr=='-')
         {
-            flags |= (MAXGAMEVARS<<1);
+            flags |= M32_FLAG_NEGATE;
             textptr++;
         }
         textptr++;
+
         /// now pointing at 'xxx'
+
         C_GetNextLabelName();
-        lLabelID = C_GetLabelNameID(SpriteLabels, &spriteH, Bstrtolower(tlabel));
+        lLabelID = C_GetLabelNameID(SpriteLabels, &h_sprite, Bstrtolower(tlabel));
 
         if (lLabelID == -1)
         {
@@ -928,8 +929,9 @@ static void C_GetNextVarType(int32_t type)
             return;
         }
 
-        id = g_iSpriteVarID;
-        *g_scriptPtr++ = (aridx<<16 | id | (lLabelID<<2) | flags);
+        id = M32_SPRITE_VAR_ID;
+        *g_scriptPtr++ = ((aridx<<16) | id | (lLabelID<<2) | flags);
+
         return;
     }
 
@@ -947,7 +949,7 @@ static void C_GetNextVarType(int32_t type)
         int32_t lLabelID = -1, aridx;
 
         textptr++;
-        flags |= (MAXGAMEVARS<<2);
+        flags |= M32_FLAG_ARRAY;
 
         if (type & GAMEVAR_SPECIAL)
         {
@@ -969,12 +971,13 @@ static void C_GetNextVarType(int32_t type)
                 C_ReportError(ERROR_NOTAGAMEARRAY);
                 return;
             }
-            flags &= ~(MAXGAMEVARS<<2); // not an array
-            flags |= (MAXGAMEVARS<<3);
+
+            flags &= ~M32_FLAG_ARRAY; // not an array
+            flags |= M32_FLAG_SPECIAL;
         }
         else
         {
-            if ((aGameArrays[id].dwFlags & GAMEARRAY_READONLY) && type&GAMEVAR_READONLY)
+            if ((aGameArrays[id].dwFlags & GAMEARRAY_READONLY) && (type&GAMEVAR_READONLY))
             {
                 C_ReportError(ERROR_ARRAYREADONLY);
                 g_numCompilerErrors++;
@@ -1004,28 +1007,32 @@ static void C_GetNextVarType(int32_t type)
 //            return;
 //        }
 
-        if (flags & (MAXGAMEVARS<<3))
+        if (flags & M32_FLAG_SPECIAL)
         {
             while (*textptr && *textptr != 0x0a && *textptr != '.')
                 textptr++;
 
             if (*textptr != '.')
             {
-                g_numCompilerErrors++;
-                C_ReportError(ERROR_SYNTAXERROR);
+                static const char *types[4] = {"sprite","sector","wall","tsprite"};
+                C_CUSTOMERROR("error: syntax error. Expected `.<label>' after `%s[...]'", types[id&3]);
                 return;
             }
             textptr++;
+
             /// now pointing at 'xxx'
+
             C_GetNextLabelName();
+
             /*initprintf("found xxx label of '%s'\n",   label+(g_numLabels*MAXLABELLEN));*/
-            if (id == g_iSpriteVarID || id==3)
-                lLabelID = C_GetLabelNameID(SpriteLabels, &spriteH, Bstrtolower(tlabel));
-            else if (id == g_iSectorVarID)
-                lLabelID = C_GetLabelNameID(SectorLabels, &sectorH, Bstrtolower(tlabel));
-            else if (id == g_iWallVarID)
-                lLabelID = C_GetLabelNameID(WallLabels, &wallH, Bstrtolower(tlabel));
+            if (id==M32_SPRITE_VAR_ID || id==M32_TSPRITE_VAR_ID)
+                lLabelID = C_GetLabelNameID(SpriteLabels, &h_sprite, Bstrtolower(tlabel));
+            else if (id==M32_SECTOR_VAR_ID)
+                lLabelID = C_GetLabelNameID(SectorLabels, &h_sector, Bstrtolower(tlabel));
+            else if (id==M32_WALL_VAR_ID)
+                lLabelID = C_GetLabelNameID(WallLabels, &h_wall, Bstrtolower(tlabel));
             //printf("LabelID is %d\n",lLabelID);
+
             if (lLabelID == -1)
             {
                 g_numCompilerErrors++;
@@ -1038,7 +1045,7 @@ static void C_GetNextVarType(int32_t type)
             else  // simple gamevar
                 *g_scriptPtr++ = (aridx<<16 | id | (lLabelID<<2) | flags);
         }
-        else // if (flags & (MAXGAMEVARS<<2))
+        else // if (flags & M32_FLAG_ARRAY)
         {
             if ((aridx & 0x0000FFFF) == MAXGAMEVARS)  // constant
                 *g_scriptPtr++ = (aridx | id | flags);
@@ -1064,9 +1071,7 @@ static void C_GetNextVarType(int32_t type)
 
                 if (type==GAMEVAR_SPECIAL && (num<0 || num>=65536))
                 {
-                    C_ReportError(-1);
-                    initprintf("%s:%d: error: label %s=%d not suitable as array index. (max: 65535)\n",g_szScriptFileName,g_lineNumber, label+(id*MAXLABELLEN), num);
-                    g_numCompilerErrors++;
+                    C_CUSTOMERROR("label %s=%d not suitable as array index. (max: 65535)", label+(id*MAXLABELLEN), num);
                 }
                 else if (num != (int16_t)num)
                 {
@@ -1076,10 +1081,12 @@ static void C_GetNextVarType(int32_t type)
 
                 if (type!=GAMEVAR_SPECIAL)
                     g_wasConstant = 1;
+
                 *g_scriptPtr++ = MAXGAMEVARS | (num<<16) | indirect;
                 return;
             }
         }
+
         g_numCompilerErrors++;
         C_ReportError(ERROR_NOTAGAMEVAR);
         textptr++;
@@ -1104,7 +1111,10 @@ static void C_GetNextVarType(int32_t type)
     *g_scriptPtr++ = (id|flags);
 }
 
-#define C_GetNextVar() C_GetNextVarType(0)
+static inline void C_GetNextVar()
+{
+    C_GetNextVarType(0);
+}
 
 static inline void C_GetManyVarsType(int32_t type, int32_t num)
 {
@@ -1113,7 +1123,10 @@ static inline void C_GetManyVarsType(int32_t type, int32_t num)
         C_GetNextVarType(type);
 }
 
-#define C_GetManyVars(num) C_GetManyVarsType(0,num)
+static inline void C_GetManyVars(int32_t num)
+{
+    C_GetManyVarsType(0,num);
+}
 
 static int32_t C_GetNextValue(int32_t type)
 {
@@ -1121,11 +1134,19 @@ static int32_t C_GetNextValue(int32_t type)
 
     C_SkipComments();
 
-    while (isaltok(*textptr) == 0)
+    if (*textptr == 0)
     {
-        if (*textptr == 0x0a) g_lineNumber++;
+        C_CUSTOMERROR("unexpected EOF where value was expected.");
+        return -1;
+    }
+
+    while (!isaltok(*textptr))
+    {
+        g_lineNumber += (*textptr == 0x0a);
+
         textptr++;
-        if (*textptr == 0)
+
+        if (!*textptr)
             return -1; // eof
     }
 
@@ -1166,14 +1187,14 @@ static int32_t C_GetNextValue(int32_t type)
 
         *(g_scriptPtr++) = 0;
         textptr += l;
+
         el = (char *)C_GetLabelType(type);
         gl = (char *)C_GetLabelType(labeltype[i]);
-        C_ReportError(-1);
-        initprintf("%s:%d: error: expected %s, found %s.\n",g_szScriptFileName,g_lineNumber,el,gl);
+        C_CUSTOMERROR("expected %s, found %s.", el, gl);
 //        initprintf("i=%d, %s!!! lt:%d t:%d\n", i, label+(i*MAXLABELLEN), labeltype[i], type);
-        g_numCompilerErrors++;
         Bfree(el);
         Bfree(gl);
+
         return -1;  // valid label name, but wrong type
     }
 
@@ -1181,8 +1202,10 @@ static int32_t C_GetNextValue(int32_t type)
     {
         C_ReportError(ERROR_PARAMUNDEFINED);
         g_numCompilerErrors++;
+
         *g_scriptPtr = 0;
         g_scriptPtr++;
+
         textptr += l;
         return -1; // error!
     }
@@ -1200,9 +1223,7 @@ static int32_t C_GetNextValue(int32_t type)
         if (textptr[0] == '0' && textptr[1] == 'x') break; // kill the warning for hex
         if (!isdigit(textptr[i--]))
         {
-            C_ReportError(-1);
-            initprintf("%s:%d: warning: invalid character `%c' in definition!\n",g_szScriptFileName,g_lineNumber,textptr[i+1]);
-            g_numCompilerWarnings++;
+            C_CUSTOMWARNING("invalid character `%c' in definition!", textptr[i+1]);
             break;
         }
     }
@@ -1252,10 +1273,7 @@ static int32_t C_CheckMalformedBranch(ofstype lastScriptOfs)
     case CON_ELSE:
         g_scriptPtr = script + lastScriptOfs;
         cs.ifElseAborted = 1;
-        C_ReportError(-1);
-        g_numCompilerWarnings++;
-        initprintf("%s:%d: warning: malformed `%s' branch\n", g_szScriptFileName, g_lineNumber,
-                   keyw[*(g_scriptPtr) & 0xFFF]);
+        C_CUSTOMWARNING("malformed `%s' branch", keyw[*g_scriptPtr & 0xFFF]);
         return 1;
     }
     return 0;
@@ -1275,12 +1293,9 @@ static int32_t C_CheckEmptyBranch(int32_t tw, ofstype lastScriptOfs)
 
     if (cs.ifElseAborted)
     {
-        C_ReportError(-1);
-        g_numCompilerWarnings++;
         g_scriptPtr = script + lastScriptOfs;
-        initprintf("%s:%d: warning: empty `%s' branch\n",g_szScriptFileName,g_lineNumber,
-                   keyw[*(g_scriptPtr) & 0xFFF]);
-        *(g_scriptPtr) = (CON_NULLOP + (IFELSE_MAGIC<<12));
+        C_CUSTOMWARNING("empty `%s' branch", keyw[*g_scriptPtr & 0xFFF]);
+        *g_scriptPtr = (CON_NULLOP + (IFELSE_MAGIC<<12));
         return 1;
     }
     return 0;
@@ -1324,11 +1339,11 @@ static int32_t C_ParseCommand(void)
     const char *temptextptr;
     instype *tempscrptr = NULL;
 
-    if (quitevent)
-    {
+///    if (quitevent)
+///    {
 ///        initprintf("Aborted.\n");
 ///        return 1;
-    }
+///    }
 
     if (g_numCompilerErrors >= ABORTERRCNT || (*textptr == '\0') || (*(textptr+1) == '\0'))
         return 1;
@@ -1355,9 +1370,7 @@ static int32_t C_ParseCommand(void)
     case CON_NULLOP:
         if (C_GetKeyword() != CON_ELSE)
         {
-            C_ReportError(-1);
-            g_numCompilerWarnings++;
-            initprintf("%s:%d: warning: `nullop' found without `else'\n",g_szScriptFileName,g_lineNumber);
+            C_CUSTOMWARNING("`nullop' found without `else'");
             g_scriptPtr--;
             cs.ifElseAborted = 1;
         }
@@ -1415,9 +1428,11 @@ static int32_t C_ParseCommand(void)
         g_scriptPtr--;
         while (!isaltok(*textptr))
         {
-            if (*textptr == 0x0a) g_lineNumber++;
+            g_lineNumber += (*textptr == 0x0a);
+
             textptr++;
-            if (*textptr == 0) break;
+            if (!*textptr)
+                break;
         }
 
         j = 0;
@@ -1554,9 +1569,7 @@ static int32_t C_ParseCommand(void)
     case CON_ENDS:
         if (cs.currentStateIdx < 0)
         {
-            C_ReportError(-1);
-            initprintf("%s:%d: error: found `ends' without open `state'.\n",g_szScriptFileName,g_lineNumber);
-            g_numCompilerErrors++;
+            C_CUSTOMERROR("found `ends' without open `state'.");
             return 1; //+
         }
         else
@@ -1566,11 +1579,12 @@ static int32_t C_ParseCommand(void)
                 C_ReportError(ERROR_OPENBRACKET);
                 g_numCompilerErrors++;
             }
-            if (cs.numBraces < 0)
+            else if (cs.numBraces < 0)
             {
                 C_ReportError(ERROR_CLOSEBRACKET);
                 g_numCompilerErrors++;
             }
+
             if (cs.checkingSwitch > 0)
             {
                 C_ReportError(ERROR_NOENDSWITCH);
@@ -1578,6 +1592,7 @@ static int32_t C_ParseCommand(void)
 
                 cs.checkingSwitch = 0; // can't be checking anymore...
             }
+
             if (g_numCompilerErrors)
             {
                 g_scriptPtr = script+cs.currentStateOfs;
@@ -1706,6 +1721,7 @@ static int32_t C_ParseCommand(void)
             C_ReportError(ERROR_ISAKEYWORD);
             return 1;
         }
+
         if (hash_find(&h_gamevars, tlabel)>=0)
         {
             g_numCompilerWarnings++;
@@ -1721,9 +1737,7 @@ static int32_t C_ParseCommand(void)
             return 0;
         }
 
-        C_ReportError(-1);
-        initprintf("%s:%d: error: state `%s' not found.\n",g_szScriptFileName,g_lineNumber,tlabel);
-        g_numCompilerErrors++;
+        C_CUSTOMERROR("state `%s' not found.", tlabel);
         g_scriptPtr++;
         return 0;
 
@@ -1769,9 +1783,7 @@ static int32_t C_ParseCommand(void)
     case CON_ENDEVENT:
         if (cs.parsingEventOfs < 0)
         {
-            C_ReportError(-1);
-            initprintf("%s:%d: error: found `endevent' without open `onevent'.\n",g_szScriptFileName,g_lineNumber);
-            g_numCompilerErrors++;
+            C_CUSTOMERROR("found `endevent' without open `onevent'.");
             return 1;
         }
         if (cs.numBraces > 0)
@@ -1789,7 +1801,7 @@ static int32_t C_ParseCommand(void)
             g_scriptPtr = script+cs.parsingEventOfs;
             cs.parsingEventOfs = -1;
             cs.currentEvent = -1;
-            Bsprintf(g_szCurrentBlockName,"(none)");
+            Bsprintf(g_szCurrentBlockName, "(none)");
             return 0;
         }
 
@@ -1903,9 +1915,7 @@ static int32_t C_ParseCommand(void)
             g_scriptPtr--;
             tscrptr = g_scriptPtr;
 
-            g_numCompilerWarnings++;
-            C_ReportError(-1);
-            initprintf("%s:%d: warning: found `else' with no `if'.\n",g_szScriptFileName,g_lineNumber);
+            C_CUSTOMWARNING("found `else' with no `if'.");
 
             if (C_GetKeyword() == CON_LEFTBRACE)
             {
@@ -2030,9 +2040,7 @@ repeatcase:
         g_scriptPtr--; // don't save in code
         if (cs.checkingSwitch < 1)
         {
-            g_numCompilerErrors++;
-            C_ReportError(-1);
-            initprintf("%s:%d: error: found `case' statement when not in switch\n", g_szScriptFileName, g_lineNumber);
+            C_CUSTOMERROR("found `case' statement when not in switch");
             return 1;
         }
 
@@ -2089,43 +2097,40 @@ repeatcase:
         g_scriptPtr--;    // don't save
         if (cs.checkingSwitch < 1)
         {
-            g_numCompilerErrors++;
-            C_ReportError(-1);
-            initprintf("%s:%d: error: found `default' statement when not in switch\n",g_szScriptFileName,g_lineNumber);
+            C_CUSTOMERROR("found `default' statement when not in switch");
             return 1;
         }
         if (cs.caseScriptPtr && cs.caseScriptPtr[0]!=0)
         {
-            // duplicate default statement
-            g_numCompilerErrors++;
-            C_ReportError(-1);
-            initprintf("%s:%d: error: multiple `default' statements found in switch\n",g_szScriptFileName,g_lineNumber);
+            C_CUSTOMERROR("multiple `default' statements found in switch");
         }
+
         if (cs.caseScriptPtr)
             cs.caseScriptPtr[0] = (ofstype)(g_scriptPtr-cs.caseCodePtr);   // save offset from cases' code
         //Bsprintf(g_szBuf,"default: '%.22s'",textptr); AddLog(g_szBuf);
+
         while (C_ParseCommand() == 0)
         {
             //Bsprintf(g_szBuf,"defaultParse: '%.22s'",textptr); AddLog(g_szBuf);
             ;
         }
+
         break;
 
     case CON_ENDSWITCH:
         //AddLog("End Switch");
         cs.checkingSwitch--;
+
         if (cs.checkingSwitch < 0)
-        {
-            g_numCompilerErrors++;
-            C_ReportError(-1);
-            initprintf("%s:%d: error: found `endswitch' without matching `switch'\n",g_szScriptFileName,g_lineNumber);
-        }
+            C_CUSTOMERROR("found `endswitch' without matching `switch'");
+
         return 1;      // end of block
 //        break;
 
     case CON_GETCURRADDRESS:
         C_GetNextVarType(GAMEVAR_READONLY);
         return 0;
+
     case CON_JUMP:
         C_GetNextVar();
         return 0;
@@ -2139,9 +2144,9 @@ repeatcase:
 
         cs.numBraces++;
 
-        do
-            done = C_ParseCommand();
-        while (done == 0);
+        do done = C_ParseCommand();
+        while (!done);
+
         return 0;
 
     case CON_RIGHTBRACE:
@@ -2156,7 +2161,8 @@ repeatcase:
 
             if (C_GetKeyword() != CON_ELSE && (*(g_scriptPtr-2)&0xFFF) != CON_ELSE)
                 cs.ifElseAborted = 1;
-            else cs.ifElseAborted = 0;
+            else
+                cs.ifElseAborted = 0;
 
             j = C_GetKeyword();
 
@@ -2171,9 +2177,7 @@ repeatcase:
             if (cs.checkingSwitch)
                 C_ReportError(ERROR_NOENDSWITCH);
 
-            C_ReportError(-1);
-            initprintf("%s:%d: error: found more `}' than `{'.\n",g_szScriptFileName,g_lineNumber);
-            g_numCompilerErrors++;
+            C_CUSTOMERROR("found more `}' than `{'.");
         }
         if (cs.checkingIfElse && j != CON_ELSE)
             cs.checkingIfElse--;
@@ -2202,10 +2206,9 @@ repeatcase:
         }
 
         // now get name of .xxx
-        while ((*textptr != '['))
-        {
+        while (*textptr != '[')
             textptr++;
-        }
+
         if (*textptr == '[')
             textptr++;
 
@@ -2213,33 +2216,33 @@ repeatcase:
         cs.labelsOnly = 1;
         C_GetNextVar();
         cs.labelsOnly = 0;
+
         // now get name of .xxx
         while (*textptr != '.')
         {
-            if (*textptr == 0xa)
-                break;
-            if (!*textptr)
+            if (!*textptr || *textptr == 0xa)
                 break;
 
             textptr++;
         }
+
         if (*textptr!='.')
         {
-            g_numCompilerErrors++;
-            C_ReportError(ERROR_SYNTAXERROR);
+            C_CUSTOMERROR("error: syntax error. Expected `.<label>' after `%s[...]'", keyw[tw]);
             return 0;
         }
         textptr++;
+
         /// now pointing at 'xxx'
         C_GetNextLabelName();
         //printf("found xxx label of '%s'\n",   label+(g_numLabels*MAXLABELLEN));
 
         if (tw==CON_GETSECTOR || tw==CON_SETSECTOR)
-            lLabelID = C_GetLabelNameID(SectorLabels, &sectorH, Bstrtolower(tlabel));
+            lLabelID = C_GetLabelNameID(SectorLabels, &h_sector, Bstrtolower(tlabel));
         else if (tw==CON_GETWALL || tw==CON_SETWALL)
-            lLabelID = C_GetLabelNameID(WallLabels, &wallH, Bstrtolower(tlabel));
+            lLabelID = C_GetLabelNameID(WallLabels, &h_wall, Bstrtolower(tlabel));
         else // if (tw==CON_GETSPRITE || tw==CON_SETSPRITE || tw==CON_GETTSPR || tw==CON_SETTSPR)
-            lLabelID = C_GetLabelNameID(SpriteLabels, &spriteH, Bstrtolower(tlabel));
+            lLabelID = C_GetLabelNameID(SpriteLabels, &h_sprite, Bstrtolower(tlabel));
 
         if (lLabelID == -1)
         {
@@ -2268,9 +2271,8 @@ repeatcase:
 
         if (isdigit(*textptr) || (*textptr == '-'))
         {
+            C_CUSTOMERROR("error: syntax error. Expected identifier after `gamevar'");
             C_GetNextLabelName();
-            g_numCompilerErrors++;
-            C_ReportError(ERROR_SYNTAXERROR);
             C_GetNextValue(LABEL_DEFINE);
             C_GetNextValue(LABEL_DEFINE);
             g_scriptPtr -= 3; // we complete the process anyways just to skip past the fucked up section
@@ -2310,9 +2312,8 @@ repeatcase:
     case CON_GAMEARRAY:
         if (isdigit(*textptr) || (*textptr == '-'))
         {
+            C_CUSTOMERROR("error: syntax error. Expected identifier after `gamearray'");
             C_GetNextLabelName();
-            g_numCompilerErrors++;
-            C_ReportError(ERROR_SYNTAXERROR);
             C_GetNextValue(LABEL_DEFINE);
             C_GetNextValue(LABEL_DEFINE);
             g_scriptPtr -= 2; // we complete the process anyways just to skip past the fucked up section
@@ -2353,7 +2354,8 @@ repeatcase:
             g_numCompilerErrors++;
         }
 
-        C_SkipComments();// skip comments and whitespace
+        C_SkipComments();
+
         if (*textptr != '[')
         {
             g_numCompilerErrors++;
@@ -2361,8 +2363,10 @@ repeatcase:
             return 1;
         }
         textptr++;
+
         C_GetNextVar();
-        C_SkipComments();// skip comments and whitespace
+        C_SkipComments();
+
         if (*textptr != ']')
         {
             g_numCompilerErrors++;
@@ -2370,6 +2374,7 @@ repeatcase:
             return 1;
         }
         textptr++;
+        // fall-through
     case CON_SETARRAY:
         C_GetNextLabelName();
 
@@ -2390,7 +2395,8 @@ repeatcase:
             g_numCompilerErrors++;
         }
 
-        C_SkipComments();// skip comments and whitespace
+        C_SkipComments();
+
         if (*textptr != '[')
         {
             g_numCompilerErrors++;
@@ -2398,8 +2404,10 @@ repeatcase:
             return 1;
         }
         textptr++;
+
         C_GetNextVar();
-        C_SkipComments();// skip comments and whitespace
+        C_SkipComments();
+
         if (*textptr != ']')
         {
             g_numCompilerErrors++;
@@ -2419,9 +2427,7 @@ repeatcase:
             *g_scriptPtr++ = i;
             if (tw==CON_RESIZEARRAY && (aGameArrays[i].dwFlags&(GAMEARRAY_TYPEMASK)))
             {
-                C_ReportError(-1);
-                initprintf("%s:%d: error: can't resize system array `%s'.\n",g_szScriptFileName,g_lineNumber,tlabel);
-                g_numCompilerErrors++;
+                C_CUSTOMERROR("can't resize system array `%s'.", tlabel);
             }
         }
         else
@@ -2566,10 +2572,8 @@ repeatcase:
         C_GetNextValue(LABEL_DEFINE);
 
         if (*(g_scriptPtr-1)<=0)
-        {
-            initprintf("%s:%d: error: scale value in integer/float conversion must be greater zero.\n",g_szScriptFileName,g_lineNumber);
-            g_numCompilerErrors++;
-        }
+            C_CUSTOMERROR("scale value in integer/float conversion must be greater zero.");
+
         return 0;
 
 // *** other math
@@ -2615,12 +2619,10 @@ repeatcase:
         C_GetNextVarType(GAMEVAR_READONLY|GAMEVAR_SPECIAL);  // only simple vars allowed
 
         C_GetNextLabelName();
-        how = hash_find(&iterH, tlabel);
+        how = hash_find(&h_iter, tlabel);
         if (how < 0)
         {
-            C_ReportError(-1);
-            initprintf("%s:%d: error: unknown iteration type `%s'.\n",g_szScriptFileName,g_lineNumber,tlabel);
-            g_numCompilerErrors++;
+            C_CUSTOMERROR("unknown iteration type `%s'.", tlabel);
             return 1;
         }
         *g_scriptPtr++ = how;
@@ -2882,13 +2884,13 @@ repeatcase:
 
         if (k<0 || k >= MAXQUOTES)
         {
-            initprintf("%s:%d: error: quote number out of range (0 to %d).\n",g_szScriptFileName,g_lineNumber,MAXQUOTES-1);
-            g_numCompilerErrors++;
+            C_CUSTOMERROR("quote number out of range (0 to %d).", MAXQUOTES-1);
             k = MAXQUOTES;
         }
 
         if (ScriptQuotes[k] == NULL)
             ScriptQuotes[k] = Bcalloc(MAXQUOTELEN,sizeof(uint8_t));
+
         if (!ScriptQuotes[k])
         {
             Bsprintf(tempbuf,"Failed allocating %" PRIdPTR " byte quote text buffer.",sizeof(uint8_t) * MAXQUOTELEN);
@@ -2899,7 +2901,6 @@ repeatcase:
         if (tw == CON_DEFINEQUOTE)
             g_scriptPtr--;
 
-
         while (*textptr == ' ' || *textptr == '\t')
             textptr++;
 
@@ -2929,15 +2930,19 @@ repeatcase:
                 *(ScriptQuotes[k]+i) = *textptr;
             else
                 *(ScriptQuoteRedefinitions[g_numQuoteRedefinitions]+i) = *textptr;
-            textptr++,i++;
+
+            textptr++;
+            i++;
+
             if (i >= MAXQUOTELEN-1)
             {
-                initprintf("%s:%d: warning: truncating quote text to %d characters.\n",g_szScriptFileName,g_lineNumber,MAXQUOTELEN-1);
-                g_numCompilerWarnings++;
-                while (*textptr != 0x0a && *textptr != 0x0d && *textptr != 0) textptr++;
+                C_CUSTOMWARNING("truncating quote text to %d characters.", MAXQUOTELEN-1);
+                while (*textptr != 0x0a && *textptr != 0x0d && *textptr != 0)
+                    textptr++;
                 break;
             }
         }
+
         if (tw == CON_DEFINEQUOTE)
             *(ScriptQuotes[k]+i) = '\0';
         else
@@ -3090,17 +3095,13 @@ repeatcase:
         if (*(g_scriptPtr-1) == 32767)
         {
             *(g_scriptPtr-1) = 32768;
-            C_ReportError(-1);
-            initprintf("%s:%d: warning: tried to set cstat 32767, using 32768 instead.\n",g_szScriptFileName,g_lineNumber);
-            g_numCompilerWarnings++;
+            C_CUSTOMWARNING("tried to set cstat 32767, using 32768 instead.");
         }
         else if ((*(g_scriptPtr-1) & 32) && (*(g_scriptPtr-1) & 16))
         {
             i = *(g_scriptPtr-1);
             *(g_scriptPtr-1) ^= 48;
-            C_ReportError(-1);
-            initprintf("%s:%d: warning: tried to set cstat %d, using %d instead.\n",g_szScriptFileName,g_lineNumber,i,*(g_scriptPtr-1));
-            g_numCompilerWarnings++;
+            C_CUSTOMWARNING("tried to set cstat %d, using %d instead.", i, *(g_scriptPtr-1));
         }
         return 0;
 
@@ -3494,11 +3495,13 @@ void C_ReportError(int32_t iError)
     if (Bstrcmp(g_szCurrentBlockName, g_szLastBlockName))
     {
         if (cs.parsingEventOfs >= 0 || cs.currentStateIdx >= 0)
-            initprintf("%s: In %s `%s':\n",g_szScriptFileName,
-                       cs.parsingEventOfs >= 0 ? "event":"state", g_szCurrentBlockName);
-        else initprintf("%s: At top level:\n", g_szScriptFileName);
+            initprintf("%s: In %s `%s':\n",g_szScriptFileName, cs.parsingEventOfs >= 0 ? "event":"state", g_szCurrentBlockName);
+        else
+            initprintf("%s: At top level:\n", g_szScriptFileName);
+
         Bstrcpy(g_szLastBlockName, g_szCurrentBlockName);
     }
+
     switch (iError)
     {
     case ERROR_CLOSEBRACKET:
@@ -3509,10 +3512,10 @@ void C_ReportError(int32_t iError)
         initprintf("%s:%d: error: `%s' only valid during events.\n",
                    g_szScriptFileName, g_lineNumber, tempbuf);
         break;
-    case ERROR_EXCEEDSMAXTILES:
-        initprintf("%s:%d: error: `%s' value exceeds MAXTILES.  Maximum is %d.\n",
-                   g_szScriptFileName, g_lineNumber, tempbuf, MAXTILES-1);
-        break;
+//    case ERROR_EXCEEDSMAXTILES:
+//        initprintf("%s:%d: error: `%s' value exceeds MAXTILES.  Maximum is %d.\n",
+//                   g_szScriptFileName, g_lineNumber, tempbuf, MAXTILES-1);
+//        break;
     case ERROR_EXPECTEDKEYWORD:
         initprintf("%s:%d: error: expected a keyword but found `%s'.\n",
                    g_szScriptFileName, g_lineNumber, tempbuf);
@@ -3608,10 +3611,10 @@ void C_ReportError(int32_t iError)
     case WARNING_NAMEMATCHESVAR:
         initprintf("%s:%d: warning: symbol `%s' already used for game variable.\n",
                    g_szScriptFileName, g_lineNumber, tlabel);
-    case WARNING_CONSTANTBITSIZE:
-        initprintf("%s:%d: warning: constants where gamevars are expected save only 16 bits.\n",
-                   g_szScriptFileName,g_lineNumber);
-        break;
+//    case WARNING_CONSTANTBITSIZE:
+//        initprintf("%s:%d: warning: constants where gamevars are expected save only 16 bits.\n",
+//                   g_szScriptFileName,g_lineNumber);
+//        break;
     case WARNING_OUTSIDEDRAWSPRITE:
         initprintf("%s:%d: warning: found `%s' outside of EVENT_ANALYZESPRITES\n",
                    g_szScriptFileName,g_lineNumber,tempbuf);
diff --git a/polymer/eduke32/source/m32def.h b/polymer/eduke32/source/m32def.h
index 9c711179d..7fc8fe1af 100644
--- a/polymer/eduke32/source/m32def.h
+++ b/polymer/eduke32/source/m32def.h
@@ -25,19 +25,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef _m32def_h_
 #define _m32def_h_
 
-extern int32_t g_iReturnVarID;      // var ID of "RETURN"
-extern int32_t g_iLoTagID;          // var ID of "LOTAG"
-extern int32_t g_iHiTagID;          // var ID of "HITAG"
-extern int32_t g_iTextureID;        // var ID of "TEXTURE"
-
-extern int32_t g_iThisActorID;      // var ID of "I"  ///"THISACTOR"
-
-extern int32_t g_iSpriteVarID;
-extern int32_t g_iSectorVarID;
-extern int32_t g_iWallVarID;
-
 #define ABORTERRCNT 8
-#define CON_ERROR OSD_ERROR "Line %d, %s: "
+
+#define C_CUSTOMERROR(Text, ...) do { \
+    C_ReportError(-1);                                                  \
+    initprintf("%s:%d: error: " Text "\n", g_szScriptFileName, g_lineNumber, ## __VA_ARGS__); \
+    g_numCompilerErrors++; \
+    } while (0)
+
+#define C_CUSTOMWARNING(Text, ...) do { \
+    C_ReportError(-1);                                                  \
+    initprintf("%s:%d: warning: " Text "\n", g_szScriptFileName, g_lineNumber, ## __VA_ARGS__); \
+    g_numCompilerWarnings++; \
+    } while (0)
 
 extern char g_szScriptFileName[BMAX_PATH];
 extern int32_t g_totalLines,g_lineNumber;
@@ -111,7 +111,7 @@ enum ScriptError_t
 {
     ERROR_CLOSEBRACKET,
     ERROR_EVENTONLY,
-    ERROR_EXCEEDSMAXTILES,
+//    ERROR_EXCEEDSMAXTILES,
     ERROR_EXPECTEDKEYWORD,
     ERROR_FOUNDWITHIN,
     ERROR_ISAKEYWORD,
@@ -136,7 +136,7 @@ enum ScriptError_t
     WARNING_DUPLICATEDEFINITION,
     WARNING_LABELSONLY,
     WARNING_NAMEMATCHESVAR,
-    WARNING_CONSTANTBITSIZE,
+//    WARNING_CONSTANTBITSIZE,
     WARNING_OUTSIDEDRAWSPRITE,
 };
 
diff --git a/polymer/eduke32/source/m32exec.c b/polymer/eduke32/source/m32exec.c
index 80254bd91..f92fbc652 100644
--- a/polymer/eduke32/source/m32exec.c
+++ b/polymer/eduke32/source/m32exec.c
@@ -139,7 +139,7 @@ void VM_OnEvent(register int32_t iEventID, register int32_t iActor)
 {
     if (iEventID < 0 || iEventID >= MAXEVENTS)
     {
-        OSD_Printf(CON_ERROR "invalid event ID",g_errorLineNum,keyw[g_tw]);
+        M32_PRINTERROR("invalid event ID");
         return;
     }
 
@@ -238,7 +238,7 @@ static int32_t X_DoSort(const int32_t *lv, const int32_t *rv)
     if ((vm.g_i < 0 || vm.g_i>=MAXSPRITES) &&                           \
         (vm.g_st!=0 || searchstat!=3 || (vm.g_i=searchwall, vm.g_sp=&sprite[vm.g_i], 0))) \
     {                                                                   \
-        OSD_Printf(CON_ERROR "Current sprite index invalid!\n", g_errorLineNum, keyw[g_tw]); \
+        M32_PRINTERROR("Current sprite index invalid!"); \
         vm.flags |= VMFLAG_ERROR;                                       \
         continue;                                                       \
     }
@@ -246,7 +246,7 @@ static int32_t X_DoSort(const int32_t *lv, const int32_t *rv)
 #define X_ERROR_INVALIDSPRI(dasprite)                                   \
     if (dasprite < 0 || dasprite>=MAXSPRITES)                           \
     {                                                                   \
-        OSD_Printf(CON_ERROR "Invalid sprite index %d!\n", g_errorLineNum, keyw[g_tw], dasprite); \
+        M32_PRINTERROR("Invalid sprite index %d!",  dasprite); \
         vm.flags |= VMFLAG_ERROR;                                       \
         continue;                                                       \
     }
@@ -254,7 +254,7 @@ static int32_t X_DoSort(const int32_t *lv, const int32_t *rv)
 #define X_ERROR_INVALIDSECT(dasect)                                     \
     if (dasect < 0 || dasect>=numsectors)                               \
     {                                                                   \
-        OSD_Printf(CON_ERROR "Invalid sector index %d!\n", g_errorLineNum, keyw[g_tw], dasect); \
+        M32_PRINTERROR("Invalid sector index %d!",  dasect); \
         vm.flags |= VMFLAG_ERROR;                                       \
         continue;                                                       \
     }
@@ -262,7 +262,7 @@ static int32_t X_DoSort(const int32_t *lv, const int32_t *rv)
 #define X_ERROR_INVALIDSP()                                             \
     if (!vm.g_sp && (vm.g_st!=0 || searchstat!=3 || (vm.g_sp=&sprite[searchwall], 0))) \
     {                                                                   \
-        OSD_Printf(CON_ERROR "Current sprite invalid!\n", g_errorLineNum, keyw[g_tw]); \
+        M32_PRINTERROR("Current sprite invalid!"); \
         vm.flags |= VMFLAG_ERROR;                                       \
         continue;                                                       \
     }
@@ -270,13 +270,13 @@ static int32_t X_DoSort(const int32_t *lv, const int32_t *rv)
 #define X_ERROR_INVALIDQUOTE(q, array)                                  \
     if (q<0 || q>=MAXQUOTES)                                            \
     {                                                                   \
-        OSD_Printf(CON_ERROR "Invalid quote number %d!\n", g_errorLineNum, keyw[g_tw], q); \
+        M32_PRINTERROR("Invalid quote number %d!",  q); \
         vm.flags |= VMFLAG_ERROR;                                       \
         continue;                                                       \
     }                                                                   \
     else if (array[q] == NULL)                                          \
     {                                                                   \
-        OSD_Printf(CON_ERROR "Null quote %d!\n", g_errorLineNum, keyw[g_tw], q); \
+        M32_PRINTERROR("Null quote %d!",  q); \
         vm.flags |= VMFLAG_ERROR;                                       \
         continue;                                                       \
     }                                                                   \
@@ -420,7 +420,7 @@ skip_check:
                 int32_t j = Gv_GetVarX(*insptr++);
                 if (j<0 || j>=(g_scriptPtr-script))
                 {
-                    OSD_Printf(CON_ERROR "script index out of bounds (%d)\n", g_errorLineNum, keyw[g_tw], j);
+                    M32_PRINTERROR("script index out of bounds (%d)",  j);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -511,17 +511,17 @@ skip_check:
 
                 if (j<0 || j >= g_gameArrayCount)
                 {
-                    OSD_Printf(CON_ERROR "Tried to set invalid array ID (%d)\n", g_errorLineNum, keyw[g_tw], j);
+                    M32_PRINTERROR("Tried to set invalid array ID (%d)",  j);
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if (aGameArrays[j].dwFlags & GAMEARRAY_READONLY)
                 {
-                    OSD_Printf(CON_ERROR "Tried to set on read-only array `%s'\n", g_errorLineNum, keyw[g_tw], aGameArrays[j].szLabel);
+                    M32_PRINTERROR("Tried to set on read-only array `%s'",  aGameArrays[j].szLabel);
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if (index >= aGameArrays[j].size || index < 0)
                 {
-                    OSD_Printf(CON_ERROR "Array index %d out of bounds\n", g_errorLineNum, keyw[g_tw], index);
+                    M32_PRINTERROR("Array index %d out of bounds",  index);
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if (vm.flags&VMFLAG_ERROR) continue;
@@ -546,7 +546,7 @@ skip_check:
 
                 if (asize<=0 || asize>65536)
                 {
-                    OSD_Printf(CON_ERROR "Invalid array size %d (max: 65536)\n",g_errorLineNum,keyw[g_tw]);
+                    M32_PRINTERROR("Invalid array size %d (max: 65536)");
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -556,7 +556,7 @@ skip_check:
                 if (aGameArrays[j].vals == NULL)
                 {
                     aGameArrays[j].size = 0;
-                    OSD_Printf(CON_ERROR "Out of memory!\n",g_errorLineNum,keyw[g_tw]);
+                    M32_PRINTERROR("Out of memory!");
                     vm.flags |= VMFLAG_ERROR;
                     return 1;
                 }
@@ -576,17 +576,17 @@ skip_check:
 
                 if (si<0 || si>=g_gameArrayCount)
                 {
-                    OSD_Printf(CON_ERROR "Invalid array %d!\n",g_errorLineNum,keyw[g_tw],si);
+                    M32_PRINTERROR("Invalid array %d!", si);
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if (di<0 || di>=g_gameArrayCount)
                 {
-                    OSD_Printf(CON_ERROR "Invalid array %d!\n",g_errorLineNum,keyw[g_tw],di);
+                    M32_PRINTERROR("Invalid array %d!", di);
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if (aGameArrays[di].dwFlags & GAMEARRAY_READONLY)
                 {
-                    OSD_Printf(CON_ERROR "Array %d is read-only!\n",g_errorLineNum,keyw[g_tw],di);
+                    M32_PRINTERROR("Array %d is read-only!", di);
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if (vm.flags&VMFLAG_ERROR) continue;
@@ -655,7 +655,7 @@ skip_check:
             insptr++;
             if (*(insptr+1) == 0)
             {
-                OSD_Printf(CON_ERROR "Divide by zero.\n",g_errorLineNum,keyw[g_tw]);
+                M32_PRINTERROR("Divide by zero.");
                 insptr += 2;
                 continue;
             }
@@ -667,7 +667,7 @@ skip_check:
             insptr++;
             if (*(insptr+1) == 0)
             {
-                OSD_Printf(CON_ERROR "Mod by zero.\n",g_errorLineNum,keyw[g_tw]);
+                M32_PRINTERROR("Mod by zero.");
                 insptr += 2;
                 continue;
             }
@@ -725,7 +725,7 @@ skip_check:
 
                 if (l2==0)
                 {
-                    OSD_Printf(CON_ERROR "Divide by zero.\n",g_errorLineNum,keyw[g_tw]);
+                    M32_PRINTERROR("Divide by zero.");
                     continue;
                 }
                 Gv_SetVarX(j, Gv_GetVarX(j)/l2);
@@ -740,7 +740,7 @@ skip_check:
 
                 if (l2==0)
                 {
-                    OSD_Printf(CON_ERROR "Mod by zero.\n",g_errorLineNum,keyw[g_tw]);
+                    M32_PRINTERROR("Mod by zero.");
                     continue;
                 }
 
@@ -886,12 +886,12 @@ skip_check:
 
                 if (xvar < 0 || xvar >= MAXSPRITES || sprite[xvar].statnum==MAXSTATUS)
                 {
-                    OSD_Printf(CON_ERROR "invalid sprite %d\n",g_errorLineNum,keyw[g_tw],xvar);
+                    M32_PRINTERROR("invalid sprite %d", xvar);
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if (yvar < 0 || yvar >= MAXSPRITES || sprite[yvar].statnum==MAXSTATUS)
                 {
-                    OSD_Printf(CON_ERROR "invalid sprite %d\n",g_errorLineNum,keyw[g_tw],yvar);
+                    M32_PRINTERROR("invalid sprite %d", yvar);
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if (vm.flags&VMFLAG_ERROR) continue;
@@ -1136,7 +1136,7 @@ skip_check:
                 if (count<=0) continue;
                 if (count > aGameArrays[aridx].size)
                 {
-                    OSD_Printf(CON_ERROR "Count of elements to sort (%d) exceeds array size (%d)!\n",g_errorLineNum,keyw[g_tw],count,aGameArrays[aridx].size);
+                    M32_PRINTERROR("Count of elements to sort (%d) exceeds array size (%d)!", count,aGameArrays[aridx].size);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -1287,7 +1287,7 @@ skip_check:
                     }
                     break;
                 default:
-                    OSD_Printf(CON_ERROR "Unknown iteration type %d!\n",g_errorLineNum,keyw[g_tw],how);
+                    M32_PRINTERROR("Unknown iteration type %d!", how);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
 badindex:
@@ -1387,7 +1387,7 @@ badindex:
                 int32_t key=Gv_GetVarX(*insptr);
                 if (key<0 || key >= (int32_t)(sizeof(keystatus)/sizeof(keystatus[0])))
                 {
-                    OSD_Printf(CON_ERROR "Invalid key %d!\n",g_errorLineNum,keyw[g_tw],key);
+                    M32_PRINTERROR("Invalid key %d!", key);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -1497,8 +1497,7 @@ badindex:
                 res = inside(x, y, sectnum);
                 if (res == -1)
                 {
-                    OSD_Printf(CON_ERROR "Sector index %d out of range!\n",g_errorLineNum,keyw[g_tw],
-                               sectnum);
+                    M32_PRINTERROR("Sector index %d out of range!", sectnum);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -1538,7 +1537,7 @@ badindex:
                 X_ERROR_INVALIDSECT(dasectnum);
                 if (numsprites >= MAXSPRITES)
                 {
-                    OSD_Printf(CON_ERROR "Maximum number of sprites reached.\n",g_errorLineNum,keyw[g_tw]);
+                    M32_PRINTERROR("Maximum number of sprites reached.");
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -1558,13 +1557,13 @@ badindex:
 
                 if (ospritenum<0 || ospritenum>=MAXSPRITES || sprite[ospritenum].statnum==MAXSTATUS)
                 {
-                    OSD_Printf(CON_ERROR "Tried to duplicate nonexistent sprite %d\n",g_errorLineNum,keyw[g_tw],ospritenum);
+                    M32_PRINTERROR("Tried to duplicate nonexistent sprite %d", ospritenum);
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if ((tw==CON_DUPSPRITE && numsprites >= MAXSPRITES) ||
                         (tw==CON_DUPSPRITE && spritesortcnt >= MAXSPRITESONSCREEN))
                 {
-                    OSD_Printf(CON_ERROR "Maximum number of sprites reached.\n",g_errorLineNum,keyw[g_tw]);
+                    M32_PRINTERROR("Maximum number of sprites reached.");
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if (vm.flags&VMFLAG_ERROR) continue;
@@ -1575,7 +1574,7 @@ badindex:
 
                     if (nspritenum < 0)
                     {
-                        OSD_Printf(CON_ERROR "Internal error.\n",g_errorLineNum,keyw[g_tw]);
+                        M32_PRINTERROR("Internal error.");
                         vm.flags |= VMFLAG_ERROR;
                         continue;
                     }
@@ -1616,7 +1615,7 @@ badindex:
 
                 if (dapoint<0 || dapoint>=numwalls)
                 {
-                    OSD_Printf(CON_ERROR "Invalid wall %d\n",g_errorLineNum,keyw[g_tw],dapoint);
+                    M32_PRINTERROR("Invalid wall %d", dapoint);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -1823,7 +1822,7 @@ badindex:
                 int32_t j=Gv_GetVarX(*insptr++);
                 if (j < 0 || j > MAXSTATUS)
                 {
-                    OSD_Printf(CON_ERROR "invalid status list %d\n",g_errorLineNum,keyw[g_tw],j);
+                    M32_PRINTERROR("invalid status list %d", j);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -1893,12 +1892,12 @@ badindex:
 
                 if (lVar1<0 || lVar1>=MAXSPRITES || sprite[lVar1].statnum==MAXSTATUS)
                 {
-                    OSD_Printf(CON_ERROR "Invalid sprite %d\n",g_errorLineNum,keyw[g_tw],lVar1);
+                    M32_PRINTERROR("Invalid sprite %d", lVar1);
                     vm.flags |= VMFLAG_ERROR;
                 }
                 if (lVar2<0 || lVar2>=MAXSPRITES || sprite[lVar2].statnum==MAXSTATUS)
                 {
-                    OSD_Printf(CON_ERROR "Invalid sprite %d\n",g_errorLineNum,keyw[g_tw],lVar2);
+                    M32_PRINTERROR("Invalid sprite %d", lVar2);
                     vm.flags |= VMFLAG_ERROR;
                 }
 
@@ -1920,8 +1919,7 @@ badindex:
                 X_ERROR_INVALIDSPRI(i);
                 if (j<0 || j >= (tw==CON_CHANGESPRITESTAT?MAXSTATUS:numsectors))
                 {
-                    OSD_Printf(CON_ERROR "Invalid %s: %d\n", tw==CON_CHANGESPRITESTAT?"statnum":"sector",
-                               g_errorLineNum,keyw[g_tw],j);
+                    M32_PRINTERROR("Invalid %s: %d", tw==CON_CHANGESPRITESTAT?"statnum":"sector", j);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -1946,7 +1944,7 @@ badindex:
 
                 if (wallnum<0 || wallnum>=numwalls)
                 {
-                    OSD_Printf(CON_ERROR "Invalid wall %d\n",g_errorLineNum,keyw[g_tw],wallnum);
+                    M32_PRINTERROR("Invalid wall %d", wallnum);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
@@ -2006,14 +2004,14 @@ badindex:
             {
                 char buf[80] = "", buf2[80] = "";
                 int32_t code = (int32_t)*insptr, val = Gv_GetVarX(code);
-                int32_t negate=code&(MAXGAMEVARS<<1);
+                int32_t negate=code&M32_FLAG_NEGATE;
 
                 if (code & (0xFFFFFFFF-(MAXGAMEVARS-1)))
                 {
                     char pp1[4][8] = {"sprite","sector","wall","tsprite"};
                     const memberlabel_t *pp2[4] = {SpriteLabels, SectorLabels, WallLabels, SpriteLabels};
 
-                    if ((code&(MAXGAMEVARS<<2)) || (code&(MAXGAMEVARS<<3)))
+                    if ((code&M32_FLAG_ARRAY) || (code&M32_FLAG_SPECIAL))
                     {
                         if (code&MAXGAMEVARS)
                             Bsprintf(buf2, "%d", (code>>16)&0xffff);
@@ -2032,10 +2030,10 @@ badindex:
                         default: Bsprintf(buf, "(??? constant)"); break;
                         }
                     }
-                    else if (code&(MAXGAMEVARS<<2))
+                    else if (code&M32_FLAG_ARRAY)
                         Bsprintf(buf, "%s[%s]", aGameArrays[code&(MAXGAMEARRAYS-1)].szLabel?
                                  aGameArrays[code&(MAXGAMEARRAYS-1)].szLabel:"???", buf2);
-                    else if (code&(MAXGAMEVARS<<3))
+                    else if (code&M32_FLAG_SPECIAL)
                         Bsprintf(buf, "%s[%s].%s", pp1[code&3], buf2, pp2[code&3][(code>>2)&31].name);
                     else
                         Bsprintf(buf, "???");
@@ -2197,7 +2195,7 @@ badindex:
                 case CON_QGETSYSSTR:
                     if (ScriptQuotes[i] == NULL)
                     {
-                        OSD_Printf(CON_ERROR "null quote %d %d\n",g_errorLineNum,keyw[g_tw],i,j);
+                        M32_PRINTERROR("null quote %d %d", i,j);
                         break;
                     }
                     switch (j)
@@ -2209,7 +2207,7 @@ badindex:
                         Bstrcpy(ScriptQuotes[i], "Mapster32"VERSION BUILDDATE);
                         break;
                     default:
-                        OSD_Printf(CON_ERROR "unknown str ID %d %d\n",g_errorLineNum,keyw[g_tw],i,j);
+                        M32_PRINTERROR("unknown str ID %d %d", i,j);
                     }
                     break;
 #endif
@@ -2499,37 +2497,37 @@ dodefault:
         case CON_SPGETLOTAG:
             insptr++;
             X_ERROR_INVALIDSP();
-            Gv_SetVarX(g_iLoTagID, vm.g_sp->lotag);
+            Gv_SetVarX(M32_LOTAG_VAR_ID, vm.g_sp->lotag);
             continue;
 
         case CON_SPGETHITAG:
             insptr++;
             X_ERROR_INVALIDSP();
-            Gv_SetVarX(g_iHiTagID, vm.g_sp->hitag);
+            Gv_SetVarX(M32_HITAG_VAR_ID, vm.g_sp->hitag);
             continue;
 
         case CON_SECTGETLOTAG:
             insptr++;
             X_ERROR_INVALIDSP();
-            Gv_SetVarX(g_iLoTagID, sector[vm.g_sp->sectnum].lotag);
+            Gv_SetVarX(M32_LOTAG_VAR_ID, sector[vm.g_sp->sectnum].lotag);
             continue;
 
         case CON_SECTGETHITAG:
             insptr++;
             X_ERROR_INVALIDSP();
-            Gv_SetVarX(g_iHiTagID, sector[vm.g_sp->sectnum].hitag);
+            Gv_SetVarX(M32_HITAG_VAR_ID, sector[vm.g_sp->sectnum].hitag);
             continue;
 
         case CON_GETTEXTUREFLOOR:
             insptr++;
             X_ERROR_INVALIDSP();
-            Gv_SetVarX(g_iTextureID, sector[vm.g_sp->sectnum].floorpicnum);
+            Gv_SetVarX(M32_TEXTURE_VAR_ID, sector[vm.g_sp->sectnum].floorpicnum);
             continue;
 
         case CON_GETTEXTURECEILING:
             insptr++;
             X_ERROR_INVALIDSP();
-            Gv_SetVarX(g_iTextureID, sector[vm.g_sp->sectnum].ceilingpicnum);
+            Gv_SetVarX(M32_TEXTURE_VAR_ID, sector[vm.g_sp->sectnum].ceilingpicnum);
             continue;
 // ^^^
         case CON_DRAWLINE16:
@@ -2615,7 +2613,7 @@ dodefault:
                 int32_t j=Gv_GetVarX(*insptr);
                 if (j<0 || j>=MAXSOUNDS)
                 {
-                    OSD_Printf(CON_ERROR "Invalid sound %d\n",g_errorLineNum,keyw[g_tw],j);
+                    M32_PRINTERROR("Invalid sound %d", j);
                     vm.flags |= VMFLAG_ERROR;
                     insptr++;
                     continue;
@@ -2641,7 +2639,7 @@ dodefault:
                 int32_t j=Gv_GetVarX(*insptr++), var=*insptr++;
                 if (j<0 || j>=MAXSOUNDS)
                 {
-                    OSD_Printf(CON_ERROR "Invalid sound %d\n",g_errorLineNum,keyw[g_tw],j);
+                    M32_PRINTERROR("Invalid sound %d", j);
                     vm.flags |= VMFLAG_ERROR;
                     insptr++;
                     continue;
@@ -2661,7 +2659,7 @@ dodefault:
 
                 if (j<0 || j>=MAXSOUNDS)
                 {
-                    OSD_Printf(CON_ERROR "Invalid sound %d\n",g_errorLineNum,keyw[g_tw],j);
+                    M32_PRINTERROR("Invalid sound %d", j);
                     vm.flags |= VMFLAG_ERROR;
                     continue;
                 }
diff --git a/polymer/eduke32/source/m32structures.c b/polymer/eduke32/source/m32structures.c
index 8dce73af0..f7b651868 100644
--- a/polymer/eduke32/source/m32structures.c
+++ b/polymer/eduke32/source/m32structures.c
@@ -120,10 +120,10 @@ static int32_t __fastcall VM_AccessWall(int32_t how, int32_t lVar1, int32_t lLab
     }
 
 badwall:
-    OSD_Printf(CON_ERROR "Invalid wall %d\n",g_errorLineNum,keyw[g_tw],i);
+    M32_PRINTERROR("Invalid wall %d", i);
     return -1;
 readonly:
-    OSD_Printf(CON_ERROR "Wall structure member `%s' is read-only.\n",g_errorLineNum,keyw[g_tw],WallLabels[lLabelID].name);
+    M32_PRINTERROR("Wall structure member `%s' is read-only.", WallLabels[lLabelID].name);
     return -1;
 }
 
@@ -133,7 +133,7 @@ static int32_t __fastcall VM_AccessSector(int32_t how, int32_t lVar1, int32_t lL
     int32_t lValue;
     int32_t i = (how&ACCESS_USEVARS) ? sprite[vm.g_i].sectnum : lVar1;
 
-    if ((how&ACCESS_USEVARS) && lVar1 != g_iThisActorID)
+    if ((how&ACCESS_USEVARS) && lVar1 != M32_THISACTOR_VAR_ID)
         i = Gv_GetVarX(lVar1);
 
     if (i<0 || i >= numsectors)
@@ -237,10 +237,10 @@ static int32_t __fastcall VM_AccessSector(int32_t how, int32_t lVar1, int32_t lL
     }
 
 badsector:
-    OSD_Printf(CON_ERROR "Invalid sector %d\n",g_errorLineNum,keyw[g_tw],i);
+    M32_PRINTERROR("Invalid sector %d", i);
     return -1;
 readonly:
-    OSD_Printf(CON_ERROR "Sector structure member `%s' is read-only.\n",g_errorLineNum,keyw[g_tw],SectorLabels[lLabelID].name);
+    M32_PRINTERROR("Sector structure member `%s' is read-only.", SectorLabels[lLabelID].name);
     return -1;
 }
 
@@ -250,7 +250,7 @@ static int32_t __fastcall VM_AccessSprite(int32_t how, int32_t lVar1, int32_t lL
     int32_t lValue;
     register int32_t i = (how&ACCESS_USEVARS) ? vm.g_i : lVar1;
 
-    if ((how&ACCESS_USEVARS) && lVar1 != g_iThisActorID)
+    if ((how&ACCESS_USEVARS) && lVar1 != M32_THISACTOR_VAR_ID)
         i = Gv_GetVarX(lVar1);
 
     if (i < 0 || i >= MAXSPRITES)
@@ -348,11 +348,10 @@ badactor:
 //    OSD_Printf(CON_ERROR "tried to set %s on invalid target sprite (%d) from spr %d pic %d gv %s\n",g_errorLineNum,keyw[g_tw],
 //               SpriteLabels[lLabelID].name,i,vm.g_i,vm.g_sp->picnum,
 //               (lVar1<MAXGAMEVARS)?aGameVars[lVar1].szLabel:"extended");
-    OSD_Printf(CON_ERROR "tried to set %s on invalid target sprite (%d)\n",g_errorLineNum,keyw[g_tw],
-               SpriteLabels[lLabelID].name,i);
+    M32_PRINTERROR("tried to set %s on invalid target sprite (%d)", SpriteLabels[lLabelID].name, i);
     return -1;
 readonly:
-    OSD_Printf(CON_ERROR "Sprite structure member `%s' is read-only.\n",g_errorLineNum,keyw[g_tw],SpriteLabels[lLabelID].name);
+    M32_PRINTERROR("Sprite structure member `%s' is read-only.", SpriteLabels[lLabelID].name);
     return -1;
 }
 
@@ -363,7 +362,7 @@ static int32_t __fastcall VM_AccessTsprite(int32_t how, int32_t lVar1, int32_t l
     int32_t i = (how&ACCESS_USEVARS) ? vm.g_i : lVar1;
     spritetype *datspr;
 
-    if ((how&ACCESS_USEVARS) && lVar1 != g_iThisActorID)
+    if ((how&ACCESS_USEVARS) && lVar1 != M32_THISACTOR_VAR_ID)
         i = Gv_GetVarX(lVar1);
 
     if (how&ACCESS_SPRITEEXT)
@@ -458,10 +457,10 @@ static int32_t __fastcall VM_AccessTsprite(int32_t how, int32_t lVar1, int32_t l
     }
 
 badsprite:
-    OSD_Printf(CON_ERROR "invalid target sprite (%d)\n",g_errorLineNum,keyw[g_tw],i);
+    M32_PRINTERROR("invalid target sprite (%d)", i);
     return -1;
 badtspr:
-    OSD_Printf(CON_ERROR "Internal bug, tsprite is unavailable\n",g_errorLineNum,keyw[g_tw]);
+    M32_PRINTERROR("Internal bug, tsprite is unavailable");
     return -1;
 }
 
diff --git a/polymer/eduke32/source/m32vars.c b/polymer/eduke32/source/m32vars.c
index 5cdc996cf..af7738176 100644
--- a/polymer/eduke32/source/m32vars.c
+++ b/polymer/eduke32/source/m32vars.c
@@ -77,17 +77,13 @@ int32_t Gv_NewArray(const char *pszLabel, void *arrayptr, intptr_t asize, uint32
 
     if (g_gameArrayCount >= MAXGAMEARRAYS)
     {
-        g_numCompilerErrors++;
-        C_ReportError(-1);
-        initprintf("%s:%d: error: too many arrays! (max: %d)\n",g_szScriptFileName,g_lineNumber, MAXGAMEARRAYS);
+        C_CUSTOMERROR("too many arrays! (max: %d)", MAXGAMEARRAYS);
         return 0;
     }
 
     if (Bstrlen(pszLabel) > (MAXARRAYLABEL-1))
     {
-        g_numCompilerErrors++;
-        C_ReportError(-1);
-        initprintf("%s:%d: error: array name `%s' exceeds limit of %d characters.\n",g_szScriptFileName,g_lineNumber,pszLabel, MAXARRAYLABEL);
+        C_CUSTOMERROR("array name `%s' exceeds limit of %d characters.", pszLabel, MAXARRAYLABEL);
         return 0;
     }
 
@@ -98,9 +94,7 @@ int32_t Gv_NewArray(const char *pszLabel, void *arrayptr, intptr_t asize, uint32
 
         if (aGameArrays[i].dwFlags&GAMEARRAY_TYPEMASK)
         {
-            g_numCompilerWarnings++;
-            C_ReportError(-1);
-            initprintf("%s:%d: warning: didn't redefine system array `%s'.\n",g_szScriptFileName,g_lineNumber,pszLabel);
+            C_CUSTOMWARNING("ignored redefining system array `%s'.", pszLabel);
         }
 //        C_ReportError(WARNING_DUPLICATEDEFINITION);
         return 0;
@@ -108,9 +102,7 @@ int32_t Gv_NewArray(const char *pszLabel, void *arrayptr, intptr_t asize, uint32
 
     if (!(dwFlags&GAMEARRAY_VARSIZE) && (asize<=0 || asize>=65536))
     {
-        g_numCompilerErrors++;
-        C_ReportError(-1);
-        initprintf("%s:%d: error: invalid array size %d. Must be between 1 and 65536\n",g_szScriptFileName,g_lineNumber,(int32_t)asize);
+        C_CUSTOMERROR("invalid array size %d. Must be between 1 and 65536", (int32_t)asize);
         return 0;
     }
 
@@ -143,17 +135,13 @@ int32_t Gv_NewVar(const char *pszLabel, intptr_t lValue, uint32_t dwFlags)
 
     if (g_gameVarCount >= MAXGAMEVARS)
     {
-        g_numCompilerErrors++;
-        C_ReportError(-1);
-        initprintf("%s:%d: error: too many gamevars!\n",g_szScriptFileName,g_lineNumber);
+        C_CUSTOMERROR("too many gamevars! (max: %d)", MAXGAMEVARS);
         return 0;
     }
 
     if (Bstrlen(pszLabel) > (MAXVARLABEL-1))
     {
-        g_numCompilerErrors++;
-        C_ReportError(-1);
-        initprintf("%s:%d: error: variable name `%s' exceeds limit of %d characters.\n",g_szScriptFileName,g_lineNumber,pszLabel, MAXVARLABEL);
+        C_CUSTOMERROR("variable name `%s' exceeds limit of %d characters.", pszLabel, MAXVARLABEL);
         return 0;
     }
 
@@ -222,12 +210,12 @@ int32_t Gv_NewVar(const char *pszLabel, intptr_t lValue, uint32_t dwFlags)
 
 int32_t __fastcall Gv_GetVarN(register int32_t id)  // 'N' for "no side-effects"... vars only!
 {
-    if (id == g_iThisActorID)
+    if (id == M32_THISACTOR_VAR_ID)
         return vm.g_i;
 
     if (id & (0xFFFFFFFF-(MAXGAMEVARS-1)))
     {
-        OSD_Printf(CON_ERROR "Gv_GetVarN(): invalid var index %d\n",g_errorLineNum,keyw[g_tw],id);
+        M32_PRINTERROR("Gv_GetVarN(): invalid var index %d", id);
         vm.flags |= VMFLAG_ERROR;
         return -1;
     }
@@ -249,7 +237,7 @@ int32_t __fastcall Gv_GetVarN(register int32_t id)  // 'N' for "no side-effects"
     case GAMEVAR_CHARPTR:
         return *((uint8_t*)aGameVars[id].val.lValue);
     default:
-        OSD_Printf(CON_ERROR "Gv_GetVarN(): WTF??\n",g_errorLineNum,keyw[g_tw]);
+        M32_PRINTERROR("Gv_GetVarN(): WTF??");
         vm.flags |= VMFLAG_ERROR;
         return -1;
     }
@@ -257,7 +245,7 @@ int32_t __fastcall Gv_GetVarN(register int32_t id)  // 'N' for "no side-effects"
 
 int32_t __fastcall Gv_GetVarX(register int32_t id)
 {
-    if (id == g_iThisActorID)
+    if (id == M32_THISACTOR_VAR_ID)
         return vm.g_i;
 
     if ((id & 0x0000FFFC) == MAXGAMEVARS)
@@ -271,18 +259,18 @@ int32_t __fastcall Gv_GetVarX(register int32_t id)
         case 2:
             return labelval[(id>>16)&0xffff];
         default:
-            OSD_Printf(CON_ERROR "Gv_GetVarX() (constant): WTF??\n",g_errorLineNum,keyw[g_tw]);
+            M32_PRINTERROR("Gv_GetVarX() (constant): WTF??");
             vm.flags |= VMFLAG_ERROR;
             return -1;
         }
     }
 
     {
-        register int32_t negateResult = (id&(MAXGAMEVARS<<1))>>(LOG2MAXGV+1);
+        register int32_t negateResult = (id&M32_FLAG_NEGATE)>>(LOG2MAXGV+1);
 
         if (id & (0xFFFFFFFF-(MAXGAMEVARS-1)))
         {
-            if (id&(MAXGAMEVARS<<2)) // array
+            if (id&M32_FLAG_ARRAY) // array
             {
                 register int32_t index;
                 int32_t siz;
@@ -300,7 +288,7 @@ int32_t __fastcall Gv_GetVarX(register int32_t id)
 
                 if (index < 0 || index >= siz)
                 {
-                    OSD_Printf(CON_ERROR "Gv_GetVarX(): invalid array index (%s[%d])\n",g_errorLineNum,keyw[g_tw],aGameArrays[id].szLabel,index);
+                    M32_PRINTERROR("Gv_GetVarX(): invalid array index (%s[%d])", aGameArrays[id].szLabel, index);
                     return -1;
                 }
 
@@ -314,13 +302,13 @@ int32_t __fastcall Gv_GetVarX(register int32_t id)
                 case GAMEARRAY_OFCHAR:
                     return ((((uint8_t *)aGameArrays[id].vals)[index] ^ -negateResult) + negateResult);
                 default:
-                    OSD_Printf(CON_ERROR "Gv_GetVarX() (array): WTF??\n",g_errorLineNum,keyw[g_tw]);
+                    M32_PRINTERROR("Gv_GetVarX() (array): WTF??");
                     vm.flags |= VMFLAG_ERROR;
                     return -1;
                 }
             }
 
-            if (id&(MAXGAMEVARS<<3)) // struct shortcut vars
+            if (id&M32_FLAG_SPECIAL) // struct shortcut vars
             {
                 register int32_t index, memberid;
 
@@ -332,17 +320,17 @@ int32_t __fastcall Gv_GetVarX(register int32_t id)
 
                 switch (id&3)
                 {
-                case 0: //if (id == g_iSpriteVarID)
+                case M32_SPRITE_VAR_ID:
                     return ((VM_AccessSprite(0, index, memberid, 0) ^ -negateResult) + negateResult);
-                case 1: //else if (id == g_iSectorVarID)
+                case M32_SECTOR_VAR_ID:
 //                    if (index == vm.g_i) index = sprite[vm.g_i].sectnum;
                     return ((VM_AccessSector(0, index, memberid, 0) ^ -negateResult) + negateResult);
-                case 2: //else if (id == g_iWallVarID)
+                case M32_WALL_VAR_ID:
                     return ((VM_AccessWall(0, index, memberid, 0) ^ -negateResult) + negateResult);
-                case 3:
+                case M32_TSPRITE_VAR_ID:
                     return ((VM_AccessTsprite(0, index, memberid, 0) ^ -negateResult) + negateResult);
 //                default:
-//                    OSD_Printf(CON_ERROR "Gv_GetVarX() (special): WTF??\n",g_errorLineNum,keyw[g_tw]);
+//                    M32_PRINTERROR("Gv_GetVarX() (special): WTF??");
 //                    return -1;
                 }
             }
@@ -351,7 +339,7 @@ int32_t __fastcall Gv_GetVarX(register int32_t id)
 
             if (!negateResult)
             {
-                OSD_Printf(CON_ERROR "Gv_GetVarX(): invalid gamevar ID (%d)\n",g_errorLineNum,keyw[g_tw],id);
+                M32_PRINTERROR("Gv_GetVarX(): invalid gamevar ID (%d)", id);
                 vm.flags |= VMFLAG_ERROR;
                 return -1;
             }
@@ -377,7 +365,7 @@ int32_t __fastcall Gv_GetVarX(register int32_t id)
         case GAMEVAR_CHARPTR:
             return ((*((uint8_t*)aGameVars[id].val.lValue) ^ -negateResult) + negateResult);
         default:
-            OSD_Printf(CON_ERROR "Gv_GetVarX(): WTF??\n",g_errorLineNum,keyw[g_tw]);
+            M32_PRINTERROR("Gv_GetVarX(): WTF??");
             vm.flags |= VMFLAG_ERROR;
             return -1;
         }
@@ -388,7 +376,7 @@ void __fastcall Gv_SetVarX(register int32_t id, register int32_t lValue)
 {
     if (id & (0xFFFFFFFF-(MAXGAMEVARS-1)))
     {
-        if (id&(MAXGAMEVARS<<2)) // array
+        if (id&M32_FLAG_ARRAY) // array
         {
             register int32_t index;
             int32_t siz;
@@ -405,7 +393,7 @@ void __fastcall Gv_SetVarX(register int32_t id, register int32_t lValue)
 
             if (index < 0 || index >= siz)
             {
-                OSD_Printf(CON_ERROR "Gv_SetVarX(): invalid array index (%s[%d])\n",g_errorLineNum,keyw[g_tw],aGameArrays[id].szLabel,index);
+                M32_PRINTERROR("Gv_SetVarX(): invalid array index (%s[%d])", aGameArrays[id].szLabel, index);
                 vm.flags |= VMFLAG_ERROR;
                 return;
             }
@@ -423,14 +411,14 @@ void __fastcall Gv_SetVarX(register int32_t id, register int32_t lValue)
                 ((uint8_t *)aGameArrays[id].vals)[index] = (uint8_t)lValue;
                 return;
             default:
-                OSD_Printf(CON_ERROR "Gv_SetVarX() (array): WTF??\n",g_errorLineNum,keyw[g_tw]);
+                M32_PRINTERROR("Gv_SetVarX() (array): WTF??");
                 vm.flags |= VMFLAG_ERROR;
                 return;
             }
             return;
         }
 
-        if (id&(MAXGAMEVARS<<3)) // struct shortcut vars
+        if (id&M32_FLAG_SPECIAL) // struct shortcut vars
         {
             register int32_t index, memberid;
 
@@ -442,26 +430,26 @@ void __fastcall Gv_SetVarX(register int32_t id, register int32_t lValue)
 
             switch (id&3)
             {
-            case 0: //if (id == g_iSpriteVarID)
+            case M32_SPRITE_VAR_ID:
                 VM_AccessSprite(1, index, memberid, lValue);
                 return;
-            case 1: //else if (id == g_iSectorVarID)
+            case M32_SECTOR_VAR_ID:
 //                    if (index == vm.g_i) index = sprite[vm.g_i].sectnum;
                 VM_AccessSector(1, index, memberid, lValue);
                 return;
-            case 2: //else if (id == g_iWallVarID)
+            case M32_WALL_VAR_ID:
                 VM_AccessWall(1, index, memberid, lValue);
                 return;
-            case 3:
+            case M32_TSPRITE_VAR_ID:
                 VM_AccessTsprite(1, index, memberid, lValue);
                 return;
 //                default:
-//                    OSD_Printf(CON_ERROR "Gv_SetVarX(): WTF??\n",g_errorLineNum,keyw[g_tw]);
+//                    M32_PRINTERROR("Gv_SetVarX(): WTF??");
 //                    return;
             }
         }
 
-        OSD_Printf(CON_ERROR "Gv_SetVarX(): invalid gamevar ID (%d)\n",g_errorLineNum,keyw[g_tw],id);
+        M32_PRINTERROR("Gv_SetVarX(): invalid gamevar ID (%d)", id);
         vm.flags |= VMFLAG_ERROR;
         return;
     }
@@ -479,9 +467,9 @@ void __fastcall Gv_SetVarX(register int32_t id, register int32_t lValue)
     {
         int32_t ival = lValue;
         float fval = *(float *)&ival;
-        if (fval!=fval || fval<-3.3e38 || fval > 3.3e38)
+        if (fval!=fval || fval<-3.4e38 || fval > 3.4e38)
         {
-            OSD_Printf(CON_ERROR "Gv_SetVarX(): tried to set float var to NaN or infinity\n",g_errorLineNum,keyw[g_tw]);
+            M32_PRINTERROR("Gv_SetVarX(): tried to set float var to NaN or infinity");
             vm.flags |= VMFLAG_ERROR;
             return;
         }
@@ -496,7 +484,7 @@ void __fastcall Gv_SetVarX(register int32_t id, register int32_t lValue)
         *((uint8_t*)aGameVars[id].val.lValue)=(uint8_t)lValue;
         return;
     default:
-        OSD_Printf(CON_ERROR "Gv_SetVarX(): WTF??\n",g_errorLineNum,keyw[g_tw]);
+        M32_PRINTERROR("Gv_SetVarX(): WTF??");
         vm.flags |= VMFLAG_ERROR;
         return;
     }
@@ -525,25 +513,19 @@ static void Gv_AddSystemVars(void)
 
     //AddLog("Gv_AddSystemVars");
 
-    // special vars for struct access; must be at top and in this order
-    g_iSpriteVarID = g_gameVarCount;
+    // special vars for struct access
+    // MUST be at top and in this order!!!
     Gv_NewVar("sprite", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
-    g_iSectorVarID = g_gameVarCount;
     Gv_NewVar("sector", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
-    g_iWallVarID = g_gameVarCount;
     Gv_NewVar("wall", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
     Gv_NewVar("tsprite", -1, GAMEVAR_READONLY | GAMEVAR_SYSTEM | GAMEVAR_SPECIAL);
 
-    g_iReturnVarID = g_gameVarCount;
-    Gv_NewVar("RETURN", (intptr_t)&g_iReturnVar, GAMEVAR_INTPTR | GAMEVAR_SYSTEM);
-    g_iLoTagID = g_gameVarCount;
-    Gv_NewVar("LOTAG", 0, GAMEVAR_SYSTEM);
-    g_iHiTagID = g_gameVarCount;
-    Gv_NewVar("HITAG", 0, GAMEVAR_SYSTEM);
-    g_iTextureID = g_gameVarCount;
-    Gv_NewVar("TEXTURE", 0, GAMEVAR_SYSTEM);
-    g_iThisActorID = g_gameVarCount;
+    // these too have to be in here and in order!
     Gv_NewVar("I", 0, GAMEVAR_READONLY | GAMEVAR_SYSTEM);  // THISACTOR
+    Gv_NewVar("RETURN", (intptr_t)&g_iReturnVar, GAMEVAR_INTPTR | GAMEVAR_SYSTEM);
+    Gv_NewVar("LOTAG", 0, GAMEVAR_SYSTEM);
+    Gv_NewVar("HITAG", 0, GAMEVAR_SYSTEM);
+    Gv_NewVar("TEXTURE", 0, GAMEVAR_SYSTEM);
 
     Gv_NewVar("xdim",(intptr_t)&xdim, GAMEVAR_INTPTR | GAMEVAR_SYSTEM | GAMEVAR_READONLY);
     Gv_NewVar("ydim",(intptr_t)&ydim, GAMEVAR_INTPTR | GAMEVAR_SYSTEM | GAMEVAR_READONLY);