diff --git a/glide3x/cvg/glide3/tests/display.c b/glide3x/cvg/glide3/tests/display.c
index ff5f9cd..ca0f5b3 100644
--- a/glide3x/cvg/glide3/tests/display.c
+++ b/glide3x/cvg/glide3/tests/display.c
@@ -32,11 +32,6 @@ static const char name[]    = "display";
 static const char purpose[] = "display a 16 bit frame buffer (565 format) dump out";
 static const char usage[]   = "-n <frames> -r <res> -s srcimage -t testimage";
 
-static const char *renderBufferString[] = {
-    "GR_BUFFER_FRONTBUFFER",
-    "GR_BUFFER_BACKBUFFER "
-};
-
 static const char *sourceFormatString[] = {
     "GR_LFB_SRC_FMT_565       ",
     "GR_LFB_SRC_FMT_555       ",
@@ -61,7 +56,8 @@ static void imageConvert( void *dst,
                           GrLfbSrcFmt_t format,
                           FxU32 *bpp );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv)
+{
     char match; 
     char **remArgs;
     int  rv;
@@ -77,7 +73,7 @@ void main( int argc, char **argv) {
     LFB_Img src, dst, diff;
     FxBool txtdisplay = FXTRUE;
 
-    void *image;
+    void *image = NULL;
     FxU32 bpp;
 
     GrLfbSrcFmt_t sourceFormat;
@@ -89,13 +85,13 @@ void main( int argc, char **argv) {
     dstfname[0] = 0;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrst", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -161,8 +157,8 @@ void main( int argc, char **argv) {
         /* readng the LFB file header */
         fread(&src.signature, 4, 1, fp);
         if (src.signature != IMAGE_SRLE) {
-          printf("%s file type incorrect\n");
-          return;
+          printf("%s file type incorrect\n", srcfname);
+          return -1;
         }
         fread(&src.width, 2, 1, fp);
         fread(&src.height, 2, 1, fp);
@@ -195,8 +191,8 @@ void main( int argc, char **argv) {
         /* readng the LFB file header */
         fread(&dst.signature, 4, 1, fp);
         if (dst.signature != IMAGE_SRLE) {
-          printf("%s file type incorrect\n");
-          return;
+          printf("%s file type incorrect\n", dstfname);
+          return -1;
         }
         fread(&dst.width, 2, 1, fp);
         fread(&dst.height, 2, 1, fp);
@@ -214,6 +210,7 @@ void main( int argc, char **argv) {
       }
     }
 
+    diff.data = NULL;
     diff.width = 0;
     diff.height = 0;
         
@@ -259,7 +256,7 @@ void main( int argc, char **argv) {
     }
     if ( ( imageWidth > (FxU32)scrWidth ) ||
          ( imageHeight > (FxU32)scrHeight ) )
-        return;
+        return -1;
 
     while( frames-- ) {
 
@@ -351,7 +348,7 @@ void main( int argc, char **argv) {
     if (srcfname[0] && dstfname[0])
       free(diff.data);
     free(image);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/sbench.c b/glide3x/cvg/glide3/tests/sbench.c
index de71ffa..4414dc2 100644
--- a/glide3x/cvg/glide3/tests/sbench.c
+++ b/glide3x/cvg/glide3/tests/sbench.c
@@ -27,7 +27,7 @@ static const char name[]    = "sbench";
 static const char purpose[] = "benchmark grDrawVertexArray for gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename> -l <primitive type> -v <vertex array size> -t <triangel size> -p -a";
 
-char *Usage(void)
+void Usage(void)
 {
     printf ("       -l <type> => primitive type\n");
     printf ("                 => 0 point\n");
@@ -41,7 +41,6 @@ char *Usage(void)
     printf ("       -t <size> => triangle size\n");
     printf ("       -p        => packed color\n");
     printf ("       -a        => antialiased\n");
-    return NULL;
 }
 
 void
@@ -65,7 +64,7 @@ setVertexXyzRgbaSt( FxFloat *v, FxFloat x, FxFloat y, FxFloat z,
     *(v+GR_VERTEX_TOW_TMU1_OFFSET) = t * 1.f;
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -105,14 +104,14 @@ main( int argc, char **argv)
   FxU32 wrange[2];
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
       Usage();
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -427,10 +426,5 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
-
-
-
-
-
diff --git a/glide3x/cvg/glide3/tests/test00.c b/glide3x/cvg/glide3/tests/test00.c
index 5103ff3..71b15a8 100644
--- a/glide3x/cvg/glide3/tests/test00.c
+++ b/glide3x/cvg/glide3/tests/test00.c
@@ -23,7 +23,7 @@ static const char name[]    = "test00";
 static const char purpose[] = "Clear screen to blue";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -43,13 +43,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -118,6 +118,6 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
diff --git a/glide3x/cvg/glide3/tests/test01.c b/glide3x/cvg/glide3/tests/test01.c
index e32b53f..18f38f4 100644
--- a/glide3x/cvg/glide3/tests/test01.c
+++ b/glide3x/cvg/glide3/tests/test01.c
@@ -24,7 +24,7 @@ static const char name[]    = "test01";
 static const char purpose[] = "draws a diagonal line of points from top-left to bottom-right";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void
+int
 main( int argc, char **argv) {
   char match; 
   char **remArgs;
@@ -43,13 +43,13 @@ main( int argc, char **argv) {
   assert( hwconfig = tlVoodooType() );
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -138,7 +138,7 @@ main( int argc, char **argv) {
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test02.c b/glide3x/cvg/glide3/tests/test02.c
index 2d0f21d..128a369 100644
--- a/glide3x/cvg/glide3/tests/test02.c
+++ b/glide3x/cvg/glide3/tests/test02.c
@@ -24,7 +24,7 @@ static const char name[]    = "test02";
 static const char purpose[] = "draws a parabolic envelope of lines";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -141,7 +141,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test03.c b/glide3x/cvg/glide3/tests/test03.c
index 04b9b74..e6f4827 100644
--- a/glide3x/cvg/glide3/tests/test03.c
+++ b/glide3x/cvg/glide3/tests/test03.c
@@ -24,7 +24,7 @@ static const char name[]    = "test03";
 static const char purpose[] = "draws gouraud shaded lines";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -136,7 +136,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test04.c b/glide3x/cvg/glide3/tests/test04.c
index 2c8aec4..9e918bb 100644
--- a/glide3x/cvg/glide3/tests/test04.c
+++ b/glide3x/cvg/glide3/tests/test04.c
@@ -24,7 +24,7 @@ static const char name[]    = "test04";
 static const char purpose[] = "draws gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -140,7 +140,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test04a.c b/glide3x/cvg/glide3/tests/test04a.c
index f846213..3a5ceb7 100644
--- a/glide3x/cvg/glide3/tests/test04a.c
+++ b/glide3x/cvg/glide3/tests/test04a.c
@@ -24,7 +24,7 @@ static const char name[]    = "test04";
 static const char purpose[] = "draws gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -141,7 +141,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test05.c b/glide3x/cvg/glide3/tests/test05.c
index cbcd4d8..239bbcb 100644
--- a/glide3x/cvg/glide3/tests/test05.c
+++ b/glide3x/cvg/glide3/tests/test05.c
@@ -24,7 +24,7 @@ static const char name[]    = "test05";
 static const char purpose[] = "renders two interpenetrating triangles with z-buffering";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -44,13 +44,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -174,7 +174,7 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test06.c b/glide3x/cvg/glide3/tests/test06.c
index 9b7ba81..ec62abf 100644
--- a/glide3x/cvg/glide3/tests/test06.c
+++ b/glide3x/cvg/glide3/tests/test06.c
@@ -24,7 +24,7 @@ static const char name[]    = "test06";
 static const char purpose[] = "renders two interpenetrating triangles with w-buffering";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -172,7 +172,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test07.c b/glide3x/cvg/glide3/tests/test07.c
index aefb78e..bfec93f 100644
--- a/glide3x/cvg/glide3/tests/test07.c
+++ b/glide3x/cvg/glide3/tests/test07.c
@@ -24,7 +24,7 @@ static const char name[]    = "test07";
 static const char purpose[] = "alpha blending test";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -41,13 +41,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -153,7 +153,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test08.c b/glide3x/cvg/glide3/tests/test08.c
index c08c3b6..48f5b46 100644
--- a/glide3x/cvg/glide3/tests/test08.c
+++ b/glide3x/cvg/glide3/tests/test08.c
@@ -24,7 +24,7 @@ static const char name[]    = "test08";
 static const char purpose[] = "fogging";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -43,13 +43,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -158,7 +158,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test09.c b/glide3x/cvg/glide3/tests/test09.c
index c7ddaff..ed766bc 100644
--- a/glide3x/cvg/glide3/tests/test09.c
+++ b/glide3x/cvg/glide3/tests/test09.c
@@ -26,7 +26,7 @@ static const char purpose[] = "chromakey and chromarange - render a red and blue
                               " triangle but chromakey one out";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -48,13 +48,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -190,7 +190,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -230,7 +230,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test10.c b/glide3x/cvg/glide3/tests/test10.c
index 59f9ef8..c268434 100644
--- a/glide3x/cvg/glide3/tests/test10.c
+++ b/glide3x/cvg/glide3/tests/test10.c
@@ -26,7 +26,7 @@ static const char purpose[] = "culling test - render a red and blue"
                               ", blue negative";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -46,13 +46,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -154,7 +154,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -187,7 +187,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test11.c b/glide3x/cvg/glide3/tests/test11.c
index 72ee2c7..1303636 100644
--- a/glide3x/cvg/glide3/tests/test11.c
+++ b/glide3x/cvg/glide3/tests/test11.c
@@ -27,7 +27,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 static int rRandom(int s, int e);
 static unsigned int iRandom (unsigned int maxr);
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -47,13 +47,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return 0;
         }
         switch( match ) {
         case 'n':
@@ -138,7 +138,7 @@ void main( int argc, char **argv) {
 
         if ( tlScaleX(1.0f) < 64.0 ||
              tlScaleY(1.0f) < 64.0 )
-            return;
+            return -1;
         
         /* generate random start position */
         startX = (int)rRandom( 64, (int)tlScaleX(1.0f) - 65 );
@@ -213,7 +213,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 static unsigned int randx = 1;
diff --git a/glide3x/cvg/glide3/tests/test12.c b/glide3x/cvg/glide3/tests/test12.c
index f7e54e8..18013f9 100644
--- a/glide3x/cvg/glide3/tests/test12.c
+++ b/glide3x/cvg/glide3/tests/test12.c
@@ -59,7 +59,7 @@ static const char *pixPipeString[] = {
   "PIXELPIPE ENABLED "
 };
 
-void
+int
 main( int argc, char **argv)
 {
   char match; 
@@ -87,13 +87,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -109,7 +109,7 @@ main( int argc, char **argv)
 
   if ( resolution == GR_RESOLUTION_NONE ) {
     tlErrorMessage( "Error!: Frontbuffer rendering not supported in a window\n" );
-    return;
+    return -1;
   }
 
   tlSetScreen( scrWidth, scrHeight );
@@ -326,7 +326,7 @@ main( int argc, char **argv)
   }
     
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/cvg/glide3/tests/test13.c b/glide3x/cvg/glide3/tests/test13.c
index 0b67ef7..a0483fe 100644
--- a/glide3x/cvg/glide3/tests/test13.c
+++ b/glide3x/cvg/glide3/tests/test13.c
@@ -25,7 +25,7 @@ static const char name[]    = "test13";
 static const char purpose[] = "iterated alpha test - blue triangle fades towards one vertex\n";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -160,5 +160,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/cvg/glide3/tests/test14.c b/glide3x/cvg/glide3/tests/test14.c
index ccf1bf8..fc1f773 100644
--- a/glide3x/cvg/glide3/tests/test14.c
+++ b/glide3x/cvg/glide3/tests/test14.c
@@ -25,7 +25,7 @@ static const char purpose[] = "depth bias test: vary depth bias \n"
                                "over time with two interpenetrating triangles";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -44,13 +44,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -171,5 +171,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/cvg/glide3/tests/test15.c b/glide3x/cvg/glide3/tests/test15.c
index 2906195..cc5c677 100644
--- a/glide3x/cvg/glide3/tests/test15.c
+++ b/glide3x/cvg/glide3/tests/test15.c
@@ -24,7 +24,7 @@ static const char name[]    = "test15";
 static const char purpose[] = "clip rectangle testing - clip rectangle travels around screen";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -204,5 +204,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/cvg/glide3/tests/test16.c b/glide3x/cvg/glide3/tests/test16.c
index 04a4ba4..2faf1af 100644
--- a/glide3x/cvg/glide3/tests/test16.c
+++ b/glide3x/cvg/glide3/tests/test16.c
@@ -25,7 +25,7 @@ static const char name[]    = "test16";
 static const char purpose[] = "test grShamelessPlug and grSplash";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -43,13 +43,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -191,5 +191,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/cvg/glide3/tests/test17.c b/glide3x/cvg/glide3/tests/test17.c
index e635a5c..d4bd71a 100644
--- a/glide3x/cvg/glide3/tests/test17.c
+++ b/glide3x/cvg/glide3/tests/test17.c
@@ -45,7 +45,7 @@ const char *textureModeNames[] = {
     "(ITRGB * TEXTURE)+WHITE SPECULAR"
 };
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -62,13 +62,13 @@ void main( int argc, char **argv) {
     FxU32                zrange[2];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -285,7 +285,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -313,5 +313,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/cvg/glide3/tests/test18.c b/glide3x/cvg/glide3/tests/test18.c
index 7e7b87b..9de35db 100644
--- a/glide3x/cvg/glide3/tests/test18.c
+++ b/glide3x/cvg/glide3/tests/test18.c
@@ -25,7 +25,7 @@ static const char name[]    = "test18";
 static const char purpose[] = "alpha texture test";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -45,13 +45,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -246,5 +246,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/cvg/glide3/tests/test19.c b/glide3x/cvg/glide3/tests/test19.c
index 680ee6a..464bef0 100644
--- a/glide3x/cvg/glide3/tests/test19.c
+++ b/glide3x/cvg/glide3/tests/test19.c
@@ -52,7 +52,7 @@ static int loadTexture( const char *filename,
                         void *table );
 static GrTexTable_t texTableType( GrTextureFormat_t format );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -75,13 +75,13 @@ void main( int argc, char **argv) {
 
     strcpy(texfilename, "miro.3df");
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrdt", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrdt", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -296,7 +296,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -350,7 +350,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test20.c b/glide3x/cvg/glide3/tests/test20.c
index ce816cb..a972717 100644
--- a/glide3x/cvg/glide3/tests/test20.c
+++ b/glide3x/cvg/glide3/tests/test20.c
@@ -27,7 +27,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 typedef enum { DISABLE, NEAREST, TRILINEAR } MipMapMode;
 
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -49,13 +49,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -304,7 +304,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test21.c b/glide3x/cvg/glide3/tests/test21.c
index edf832b..5fbd526 100644
--- a/glide3x/cvg/glide3/tests/test21.c
+++ b/glide3x/cvg/glide3/tests/test21.c
@@ -26,7 +26,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 
 typedef enum { LIGHTMAP, SPECULAR, DETAIL } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -54,13 +54,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -356,7 +356,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test22.c b/glide3x/cvg/glide3/tests/test22.c
index 6cae7ee..f92c324 100644
--- a/glide3x/cvg/glide3/tests/test22.c
+++ b/glide3x/cvg/glide3/tests/test22.c
@@ -24,7 +24,7 @@ static const char name[]    = "test22";
 static const char purpose[] = "fog with multi-pass texturing";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -295,7 +295,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test23.c b/glide3x/cvg/glide3/tests/test23.c
index 9c136cc..7e543b0 100644
--- a/glide3x/cvg/glide3/tests/test23.c
+++ b/glide3x/cvg/glide3/tests/test23.c
@@ -29,7 +29,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -55,13 +55,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -233,7 +233,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 static unsigned int randx = 1;
diff --git a/glide3x/cvg/glide3/tests/test24.c b/glide3x/cvg/glide3/tests/test24.c
index ec8998f..09fd17a 100644
--- a/glide3x/cvg/glide3/tests/test24.c
+++ b/glide3x/cvg/glide3/tests/test24.c
@@ -29,7 +29,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -54,13 +54,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -232,7 +232,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 static unsigned int randx = 1;
diff --git a/glide3x/cvg/glide3/tests/test25.c b/glide3x/cvg/glide3/tests/test25.c
index f320f82..42fbc0d 100644
--- a/glide3x/cvg/glide3/tests/test25.c
+++ b/glide3x/cvg/glide3/tests/test25.c
@@ -152,7 +152,7 @@ static int screenFulls[] = {
 #define NFRAMES 20
 #define NVERTS 3
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -175,7 +175,7 @@ void main( int argc, char **argv) {
     y_angle = 0.0f;             /* rotation amount */
     
   int
-    firstTime;                  /* Used for performance calculations */
+    firstTime = 1;              /* Used for performance calculations */
 
   FxBool
     plugging = FXFALSE,         /* Show shameless plug */
@@ -196,7 +196,7 @@ void main( int argc, char **argv) {
     swapDelay = 1,              /* Arg to grBufferSwap */
     trisDrawn,                  /* # triangles drawn */
     trisProcessed,              /* # triangles through pipeline */
-    lastFrame,                  /* Number of last frame we did perf stats */
+    lastFrame = 0,              /* Number of last frame we did perf stats */
     frameNum = 0L;              /* id of each frame drawn */
     
   GrCullMode_t
@@ -231,13 +231,13 @@ void main( int argc, char **argv) {
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrbtea", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrbtea", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -872,4 +872,5 @@ void main( int argc, char **argv) {
       break;
   }
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/cvg/glide3/tests/test26.c b/glide3x/cvg/glide3/tests/test26.c
index 9503875..d81bd16 100644
--- a/glide3x/cvg/glide3/tests/test26.c
+++ b/glide3x/cvg/glide3/tests/test26.c
@@ -24,11 +24,6 @@ static const char name[]    = "test26";
 static const char purpose[] = "tests grLfbWriteRegion, and grLfbReadRegion";
 static const char usage[]   = "-n <frames> -r <res>";
 
-static const char *renderBufferString[] = {
-    "GR_BUFFER_FRONTBUFFER",
-    "GR_BUFFER_BACKBUFFER "
-};
-
 static const char *sourceFormatString[] = {
     "GR_LFB_SRC_FMT_565       ",
     "GR_LFB_SRC_FMT_555       ",
@@ -53,7 +48,7 @@ static void imageConvert( void *dst,
                           GrLfbSrcFmt_t format,
                           FxU32 *bpp );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -78,13 +73,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -144,7 +139,7 @@ void main( int argc, char **argv) {
               (int) scrWidth, (int) scrHeight);
 
       tlErrorMessage(errMsg);
-      return;
+      return -1;
     }
 
     sourceFormat = GR_LFB_SRC_FMT_565;
@@ -228,7 +223,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test27.c b/glide3x/cvg/glide3/tests/test27.c
index ab9862f..472f8a8 100644
--- a/glide3x/cvg/glide3/tests/test27.c
+++ b/glide3x/cvg/glide3/tests/test27.c
@@ -25,7 +25,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 static int rRandom(int s, int e);
 static unsigned int iRandom (unsigned int maxr);
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -44,13 +44,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "Nnr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "Nnr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -157,7 +157,7 @@ doNothing:
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 static unsigned int randx = 1;
diff --git a/glide3x/cvg/glide3/tests/test28.c b/glide3x/cvg/glide3/tests/test28.c
index fd8fd43..f92c9e0 100644
--- a/glide3x/cvg/glide3/tests/test28.c
+++ b/glide3x/cvg/glide3/tests/test28.c
@@ -79,7 +79,7 @@ static const char name[]    = "test28";
 static const char purpose[] = "planar polygon test";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -101,13 +101,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -215,5 +215,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/cvg/glide3/tests/test29.c b/glide3x/cvg/glide3/tests/test29.c
index 8ea6aa1..3a39a1d 100644
--- a/glide3x/cvg/glide3/tests/test29.c
+++ b/glide3x/cvg/glide3/tests/test29.c
@@ -30,7 +30,7 @@ static const char usage[]   = "\t-d <screen dump filename>\n"
                               "\t-s [force single texturing]\n";
                               
 
-void main(int argc, char **argv) {
+int main(int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -58,13 +58,13 @@ void main(int argc, char **argv) {
   assert(hwconfig = tlVoodooType());
 
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) {
+  while ((rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
       printf("Available resolutions:\n%s\n",
               tlGetResolutionList());
-      return;
+      return -1;
     }
     switch(match) {
     case 'd':
@@ -358,4 +358,5 @@ void main(int argc, char **argv) {
 
 __errExit:    
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/cvg/glide3/tests/test30.c b/glide3x/cvg/glide3/tests/test30.c
index 0dadb61..0a021dd 100644
--- a/glide3x/cvg/glide3/tests/test30.c
+++ b/glide3x/cvg/glide3/tests/test30.c
@@ -128,7 +128,7 @@ main(int argc, char **argv) {
     char **remArgs;
     int  rv;
 
-    while(rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) {
+    while((rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) != 0) {
       if(rv == -1) {
         printf("Unrecognized command line argument\n");
         printf("%s %s\n", name, usage);
diff --git a/glide3x/cvg/glide3/tests/test31.c b/glide3x/cvg/glide3/tests/test31.c
index 1d0cda7..340381c 100644
--- a/glide3x/cvg/glide3/tests/test31.c
+++ b/glide3x/cvg/glide3/tests/test31.c
@@ -46,7 +46,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -80,13 +80,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -379,7 +379,7 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/cvg/glide3/tests/test32.c b/glide3x/cvg/glide3/tests/test32.c
index 0f9daf2..58908c1 100644
--- a/glide3x/cvg/glide3/tests/test32.c
+++ b/glide3x/cvg/glide3/tests/test32.c
@@ -46,7 +46,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -86,13 +86,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -493,7 +493,7 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/cvg/glide3/tests/test33.c b/glide3x/cvg/glide3/tests/test33.c
index 4ba4e6b..d4d8b04 100644
--- a/glide3x/cvg/glide3/tests/test33.c
+++ b/glide3x/cvg/glide3/tests/test33.c
@@ -27,7 +27,7 @@ static const char name[]    = "test33";
 static const char purpose[] = "draws gouraud shaded triangle strip and fan with grDrawVertexArray(GR_TRIANGLE_STRIP(FAN)_CONTINUE";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            goto _quit;
         }
         switch( match ) {
         case 'n':
@@ -181,15 +181,15 @@ void main( int argc, char **argv) {
               printf( "Cannot open %s\n", filename);
             scrgrab = FXFALSE;
           }
-          if ( tlKbHit() ) goto exit;
+          if ( tlKbHit() ) goto _quit;
         }
       }
     }
     
     tlSleep( 1 );
-exit:
+_quit:
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test34.c b/glide3x/cvg/glide3/tests/test34.c
index ac0dda3..b07a481 100644
--- a/glide3x/cvg/glide3/tests/test34.c
+++ b/glide3x/cvg/glide3/tests/test34.c
@@ -35,7 +35,7 @@ static const char name[]    = "test34";
 static const char purpose[] = "fogging with table/fogcoord";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -65,13 +65,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -120,7 +120,7 @@ void main( int argc, char **argv) {
     if (!extstr) {
       printf( "FOGCOORD is not supported in %s\n", grGetString(GR_HARDWARE) );
       grGlideShutdown();
-      return;
+      return -1;
     }
     if (!strncmp(extstr, "FOGCOORD", 8)) {
       fogext = FXTRUE;
@@ -297,7 +297,7 @@ void main( int argc, char **argv) {
 
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test35.c b/glide3x/cvg/glide3/tests/test35.c
index 20d0b82..8aaf847 100644
--- a/glide3x/cvg/glide3/tests/test35.c
+++ b/glide3x/cvg/glide3/tests/test35.c
@@ -24,7 +24,7 @@ static const char name[]    = "test35";
 static const char purpose[] = "texture chromarange";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -35,7 +35,6 @@ void main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
 
     TlTexture  baseTexture;
     unsigned int baseTextureAddr;
@@ -55,13 +54,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -125,7 +124,7 @@ void main( int argc, char **argv) {
       */
       extension = grGetString(GR_EXTENSION);
 
-      if (extstr = strstr(extension, "CHROMARANGE")) {
+      if ((extstr = strstr(extension, "CHROMARANGE")) != NULL) {
         if (!strncmp(extstr, "CHROMARANGE", 11)) {
           grTexChromaModeExt = grGetProcAddress("grTexChromaModeExt");
           grTexChromaRangeExt = grGetProcAddress("grTexChromaRangeExt");
@@ -304,5 +303,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/cvg/glide3/tests/test36.c b/glide3x/cvg/glide3/tests/test36.c
index fdba374..b2c7e48 100644
--- a/glide3x/cvg/glide3/tests/test36.c
+++ b/glide3x/cvg/glide3/tests/test36.c
@@ -17,8 +17,6 @@
 #include "tlib.h"
 
 int hwconfig;
-static const char *version;
-static const char *extension;
 
 static const char name[]    = "test36";
 static const char purpose[] = "screen resolutions";
@@ -26,7 +24,7 @@ static const char usage[]   = "-p show passed, -n no progress";
 
 static const char status[]  = "-\\|/";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
         FxBool bShowPassed = FXFALSE;
         FxBool bNoProgress = FXFALSE;
         GrResolution resTemplate;
@@ -35,7 +33,7 @@ void main( int argc, char **argv) {
                 iFailures = 0, iStatusAt = 0,
                 viewport[4];
         GrContext_t context;
-	unsigned int hWndMain = tlGethWnd();
+	unsigned long hWndMain = tlGethWnd();
 
         printf ( "Test36 - Glide resolution checker.  All output goes to the console.\n\n" );
         tlGetCH ();
@@ -103,7 +101,7 @@ void main( int argc, char **argv) {
 
         printf ( "Press any key.\n" );
         tlGetCH ();
-        return;
+        return 0;
 }
 
 
diff --git a/glide3x/cvg/glide3/tests/test37.c b/glide3x/cvg/glide3/tests/test37.c
index 2b0c93b..2500e2f 100644
--- a/glide3x/cvg/glide3/tests/test37.c
+++ b/glide3x/cvg/glide3/tests/test37.c
@@ -50,24 +50,20 @@
 #define CORRECT_GR_VIEWPORT_WIDTH 640
 #define CORRECT_GR_VIEWPORT_HEIGHT 480
 
-void TestGet(char * getvalstr, int getval, int memcount , int * memval, int * failures);
+void TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures);
 void TestGetString(char * getvalstr, int getval, int * failures);
 
 int hwconfig;
-static const char *version;
-static const char *extension;
 
-extern unsigned int hWndMain;
-
-void 
+int 
 main( int argc, char **argv) 
 {
   GrScreenResolution_t resolution = GR_RESOLUTION_640x480;
   float                scrWidth   = 640.0f;
   float                scrHeight  = 480.0f;
-  int val4[4];
-  int * histbuffer;
-  int histsize;
+  FxI32 val4[4];
+  FxI32 * histbuffer;
+  FxI32 histsize;
   const char * str;
   int ret;
   int i;
@@ -83,7 +79,7 @@ main( int argc, char **argv)
   /* Process Command Line Arguments */
   tlSetScreen( scrWidth, scrHeight );
   
-  version = grGetString( GR_VERSION );
+  str = grGetString( GR_VERSION );
   
   printf("Test 37 - grGet() Stress Test. All output goes to the Console.\n\n");
   tlGetCH ();
@@ -245,10 +241,10 @@ main( int argc, char **argv)
   ret = grGet(GR_NUM_SWAP_HISTORY_BUFFER, sizeof(histsize), &histsize );
   
   if(ret==sizeof(histsize)) {
-    histbuffer = malloc(histsize*sizeof(int));
+    histbuffer = malloc(histsize*sizeof(FxI32));
     
-    ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(int), histbuffer );
-    if(ret==(int)(histsize*sizeof(int)))
+    ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(FxI32), histbuffer );
+    if(ret==(int)(histsize*sizeof(FxI32)))
       printf("Success(%d) - ",ret);
     else {
       printf("Failed (%d) - ", ret);
@@ -260,7 +256,7 @@ main( int argc, char **argv)
     for(i=0;i<histsize;i++) {
       printf("%d ", histbuffer[i]);
     }
-    printf("\n", histbuffer[i]);
+    printf("\n");
     free(histbuffer);
   } else {
     printf("GR_NUM_SWAP_HISTORY_BUFFER failed, so unable to call GR_SWAP_HISTORY\n");   
@@ -316,12 +312,12 @@ main( int argc, char **argv)
  __errExit:    
   grGlideShutdown();
   
-  return;
+  return 0;
 } /* main */
 
 
 void
-TestGet(char * getvalstr, int getval, int memcount , int * memval, int * failures)
+TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures)
 {
   int ret;
   int i;
@@ -332,7 +328,7 @@ TestGet(char * getvalstr, int getval, int memcount , int * memval, int * failure
   for(i=0;i<4;i++)              /*Clear Memory to some unique Pattern*/
     memval[i] =0xdeadbeef;
   
-  ret = grGet(getval, memcount*sizeof(int), memval );  /*Do the Get*/
+  ret = grGet(getval, memcount*sizeof(FxI32), memval );  /*Do the Get*/
   
   for(i=0;i<memcount;i++)
     /*if pattern still exists, then we have a problem*/
@@ -340,7 +336,7 @@ TestGet(char * getvalstr, int getval, int memcount , int * memval, int * failure
       correct=FXFALSE;
   
   /* if Number of bytes returned is wrong, then we have a problem*/
-  if(ret!=(int)(memcount*sizeof(int))) 
+  if(ret!=(int)(memcount*sizeof(FxI32))) 
     correct=FXFALSE;
   
   if(correct)                   /*print the results*/
diff --git a/glide3x/cvg/glide3/tests/test38.c b/glide3x/cvg/glide3/tests/test38.c
index aed5e8c..e1e1ea1 100644
--- a/glide3x/cvg/glide3/tests/test38.c
+++ b/glide3x/cvg/glide3/tests/test38.c
@@ -39,9 +39,7 @@ static const char name[]    = "test38";
 static const char purpose[] = "Test the guGammaCorrectionRGB(..) function.";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-extern unsigned int hWndMain;
-
-void main( int argc, char **argv) 
+int main( int argc, char **argv) 
 {
   char match; 
   char **remArgs;
@@ -65,13 +63,13 @@ void main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return 0;
     }
     switch( match ) {
     case 'n':
@@ -195,6 +193,6 @@ void main( int argc, char **argv)
   
  __errExit:    
   grGlideShutdown();
-  return;
+  return 0;
 }
 
diff --git a/glide3x/cvg/glide3/tests/test39.c b/glide3x/cvg/glide3/tests/test39.c
index 958d46c..eec4d52 100644
--- a/glide3x/cvg/glide3/tests/test39.c
+++ b/glide3x/cvg/glide3/tests/test39.c
@@ -58,7 +58,6 @@ main(int argc, char **argv)
   FxU32                wrange[2];
 
   FxU32
-    multiBaseMode = 0, 
     minTexSize = 1,
     maxTexSize = 256;
 
@@ -78,7 +77,7 @@ main(int argc, char **argv)
     exit(-1);
   }
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) {
+  while((rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
@@ -369,9 +368,6 @@ main(int argc, char **argv)
 
   tlConOutput("Press a key to quit\n");
   while(frames-- && tlOkToRender()) {
-    static float 
-      curOOW = 1.0f;
-
     if (hwconfig == TL_VOODOORUSH) {
       tlGetDimsByConst(resolution,
                        &scrWidth, 
diff --git a/glide3x/h3/glide3/tests/display.c b/glide3x/h3/glide3/tests/display.c
index ff5f9cd..ca0f5b3 100644
--- a/glide3x/h3/glide3/tests/display.c
+++ b/glide3x/h3/glide3/tests/display.c
@@ -32,11 +32,6 @@ static const char name[]    = "display";
 static const char purpose[] = "display a 16 bit frame buffer (565 format) dump out";
 static const char usage[]   = "-n <frames> -r <res> -s srcimage -t testimage";
 
-static const char *renderBufferString[] = {
-    "GR_BUFFER_FRONTBUFFER",
-    "GR_BUFFER_BACKBUFFER "
-};
-
 static const char *sourceFormatString[] = {
     "GR_LFB_SRC_FMT_565       ",
     "GR_LFB_SRC_FMT_555       ",
@@ -61,7 +56,8 @@ static void imageConvert( void *dst,
                           GrLfbSrcFmt_t format,
                           FxU32 *bpp );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv)
+{
     char match; 
     char **remArgs;
     int  rv;
@@ -77,7 +73,7 @@ void main( int argc, char **argv) {
     LFB_Img src, dst, diff;
     FxBool txtdisplay = FXTRUE;
 
-    void *image;
+    void *image = NULL;
     FxU32 bpp;
 
     GrLfbSrcFmt_t sourceFormat;
@@ -89,13 +85,13 @@ void main( int argc, char **argv) {
     dstfname[0] = 0;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrst", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -161,8 +157,8 @@ void main( int argc, char **argv) {
         /* readng the LFB file header */
         fread(&src.signature, 4, 1, fp);
         if (src.signature != IMAGE_SRLE) {
-          printf("%s file type incorrect\n");
-          return;
+          printf("%s file type incorrect\n", srcfname);
+          return -1;
         }
         fread(&src.width, 2, 1, fp);
         fread(&src.height, 2, 1, fp);
@@ -195,8 +191,8 @@ void main( int argc, char **argv) {
         /* readng the LFB file header */
         fread(&dst.signature, 4, 1, fp);
         if (dst.signature != IMAGE_SRLE) {
-          printf("%s file type incorrect\n");
-          return;
+          printf("%s file type incorrect\n", dstfname);
+          return -1;
         }
         fread(&dst.width, 2, 1, fp);
         fread(&dst.height, 2, 1, fp);
@@ -214,6 +210,7 @@ void main( int argc, char **argv) {
       }
     }
 
+    diff.data = NULL;
     diff.width = 0;
     diff.height = 0;
         
@@ -259,7 +256,7 @@ void main( int argc, char **argv) {
     }
     if ( ( imageWidth > (FxU32)scrWidth ) ||
          ( imageHeight > (FxU32)scrHeight ) )
-        return;
+        return -1;
 
     while( frames-- ) {
 
@@ -351,7 +348,7 @@ void main( int argc, char **argv) {
     if (srcfname[0] && dstfname[0])
       free(diff.data);
     free(image);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/sbench.c b/glide3x/h3/glide3/tests/sbench.c
index de71ffa..4414dc2 100644
--- a/glide3x/h3/glide3/tests/sbench.c
+++ b/glide3x/h3/glide3/tests/sbench.c
@@ -27,7 +27,7 @@ static const char name[]    = "sbench";
 static const char purpose[] = "benchmark grDrawVertexArray for gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename> -l <primitive type> -v <vertex array size> -t <triangel size> -p -a";
 
-char *Usage(void)
+void Usage(void)
 {
     printf ("       -l <type> => primitive type\n");
     printf ("                 => 0 point\n");
@@ -41,7 +41,6 @@ char *Usage(void)
     printf ("       -t <size> => triangle size\n");
     printf ("       -p        => packed color\n");
     printf ("       -a        => antialiased\n");
-    return NULL;
 }
 
 void
@@ -65,7 +64,7 @@ setVertexXyzRgbaSt( FxFloat *v, FxFloat x, FxFloat y, FxFloat z,
     *(v+GR_VERTEX_TOW_TMU1_OFFSET) = t * 1.f;
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -105,14 +104,14 @@ main( int argc, char **argv)
   FxU32 wrange[2];
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
       Usage();
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -427,10 +426,5 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
-
-
-
-
-
diff --git a/glide3x/h3/glide3/tests/test00.c b/glide3x/h3/glide3/tests/test00.c
index 5103ff3..71b15a8 100644
--- a/glide3x/h3/glide3/tests/test00.c
+++ b/glide3x/h3/glide3/tests/test00.c
@@ -23,7 +23,7 @@ static const char name[]    = "test00";
 static const char purpose[] = "Clear screen to blue";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -43,13 +43,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -118,6 +118,6 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
diff --git a/glide3x/h3/glide3/tests/test01.c b/glide3x/h3/glide3/tests/test01.c
index e32b53f..18f38f4 100644
--- a/glide3x/h3/glide3/tests/test01.c
+++ b/glide3x/h3/glide3/tests/test01.c
@@ -24,7 +24,7 @@ static const char name[]    = "test01";
 static const char purpose[] = "draws a diagonal line of points from top-left to bottom-right";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void
+int
 main( int argc, char **argv) {
   char match; 
   char **remArgs;
@@ -43,13 +43,13 @@ main( int argc, char **argv) {
   assert( hwconfig = tlVoodooType() );
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -138,7 +138,7 @@ main( int argc, char **argv) {
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test02.c b/glide3x/h3/glide3/tests/test02.c
index 2d0f21d..128a369 100644
--- a/glide3x/h3/glide3/tests/test02.c
+++ b/glide3x/h3/glide3/tests/test02.c
@@ -24,7 +24,7 @@ static const char name[]    = "test02";
 static const char purpose[] = "draws a parabolic envelope of lines";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -141,7 +141,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test03.c b/glide3x/h3/glide3/tests/test03.c
index 04b9b74..e6f4827 100644
--- a/glide3x/h3/glide3/tests/test03.c
+++ b/glide3x/h3/glide3/tests/test03.c
@@ -24,7 +24,7 @@ static const char name[]    = "test03";
 static const char purpose[] = "draws gouraud shaded lines";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -136,7 +136,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test04.c b/glide3x/h3/glide3/tests/test04.c
index 2c8aec4..9e918bb 100644
--- a/glide3x/h3/glide3/tests/test04.c
+++ b/glide3x/h3/glide3/tests/test04.c
@@ -24,7 +24,7 @@ static const char name[]    = "test04";
 static const char purpose[] = "draws gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -140,7 +140,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test04a.c b/glide3x/h3/glide3/tests/test04a.c
index f846213..3a5ceb7 100644
--- a/glide3x/h3/glide3/tests/test04a.c
+++ b/glide3x/h3/glide3/tests/test04a.c
@@ -24,7 +24,7 @@ static const char name[]    = "test04";
 static const char purpose[] = "draws gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -141,7 +141,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test05.c b/glide3x/h3/glide3/tests/test05.c
index cbcd4d8..239bbcb 100644
--- a/glide3x/h3/glide3/tests/test05.c
+++ b/glide3x/h3/glide3/tests/test05.c
@@ -24,7 +24,7 @@ static const char name[]    = "test05";
 static const char purpose[] = "renders two interpenetrating triangles with z-buffering";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -44,13 +44,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -174,7 +174,7 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test06.c b/glide3x/h3/glide3/tests/test06.c
index 9b7ba81..ec62abf 100644
--- a/glide3x/h3/glide3/tests/test06.c
+++ b/glide3x/h3/glide3/tests/test06.c
@@ -24,7 +24,7 @@ static const char name[]    = "test06";
 static const char purpose[] = "renders two interpenetrating triangles with w-buffering";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -172,7 +172,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test07.c b/glide3x/h3/glide3/tests/test07.c
index aefb78e..bfec93f 100644
--- a/glide3x/h3/glide3/tests/test07.c
+++ b/glide3x/h3/glide3/tests/test07.c
@@ -24,7 +24,7 @@ static const char name[]    = "test07";
 static const char purpose[] = "alpha blending test";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -41,13 +41,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -153,7 +153,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test08.c b/glide3x/h3/glide3/tests/test08.c
index c08c3b6..48f5b46 100644
--- a/glide3x/h3/glide3/tests/test08.c
+++ b/glide3x/h3/glide3/tests/test08.c
@@ -24,7 +24,7 @@ static const char name[]    = "test08";
 static const char purpose[] = "fogging";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -43,13 +43,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -158,7 +158,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test09.c b/glide3x/h3/glide3/tests/test09.c
index 078c4e0..e673448 100644
--- a/glide3x/h3/glide3/tests/test09.c
+++ b/glide3x/h3/glide3/tests/test09.c
@@ -26,7 +26,7 @@ static const char purpose[] = "chromakey and chromarange - render a red and blue
                               " triangle but chromakey one out";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -48,13 +48,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -190,7 +190,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -230,7 +230,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test10.c b/glide3x/h3/glide3/tests/test10.c
index 59f9ef8..c268434 100644
--- a/glide3x/h3/glide3/tests/test10.c
+++ b/glide3x/h3/glide3/tests/test10.c
@@ -26,7 +26,7 @@ static const char purpose[] = "culling test - render a red and blue"
                               ", blue negative";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -46,13 +46,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -154,7 +154,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -187,7 +187,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test11.c b/glide3x/h3/glide3/tests/test11.c
index b2a4d74..1a689a7 100644
--- a/glide3x/h3/glide3/tests/test11.c
+++ b/glide3x/h3/glide3/tests/test11.c
@@ -27,7 +27,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 static int rRandom(int s, int e);
 static unsigned int iRandom (unsigned int maxr);
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -47,13 +47,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -138,7 +138,7 @@ void main( int argc, char **argv) {
 
         if ( tlScaleX(1.0f) < 64.0 ||
              tlScaleY(1.0f) < 64.0 )
-            return;
+            return -1;
         
         /* generate random start position */
         startX = (int)rRandom( 64, (int)tlScaleX(1.0f) - 65 );
@@ -213,7 +213,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/h3/glide3/tests/test12.c b/glide3x/h3/glide3/tests/test12.c
index f7e54e8..18013f9 100644
--- a/glide3x/h3/glide3/tests/test12.c
+++ b/glide3x/h3/glide3/tests/test12.c
@@ -59,7 +59,7 @@ static const char *pixPipeString[] = {
   "PIXELPIPE ENABLED "
 };
 
-void
+int
 main( int argc, char **argv)
 {
   char match; 
@@ -87,13 +87,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -109,7 +109,7 @@ main( int argc, char **argv)
 
   if ( resolution == GR_RESOLUTION_NONE ) {
     tlErrorMessage( "Error!: Frontbuffer rendering not supported in a window\n" );
-    return;
+    return -1;
   }
 
   tlSetScreen( scrWidth, scrHeight );
@@ -326,7 +326,7 @@ main( int argc, char **argv)
   }
     
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/h3/glide3/tests/test13.c b/glide3x/h3/glide3/tests/test13.c
index 0b67ef7..a0483fe 100644
--- a/glide3x/h3/glide3/tests/test13.c
+++ b/glide3x/h3/glide3/tests/test13.c
@@ -25,7 +25,7 @@ static const char name[]    = "test13";
 static const char purpose[] = "iterated alpha test - blue triangle fades towards one vertex\n";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -160,5 +160,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h3/glide3/tests/test14.c b/glide3x/h3/glide3/tests/test14.c
index ccf1bf8..fc1f773 100644
--- a/glide3x/h3/glide3/tests/test14.c
+++ b/glide3x/h3/glide3/tests/test14.c
@@ -25,7 +25,7 @@ static const char purpose[] = "depth bias test: vary depth bias \n"
                                "over time with two interpenetrating triangles";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -44,13 +44,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -171,5 +171,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h3/glide3/tests/test15.c b/glide3x/h3/glide3/tests/test15.c
index 2906195..cc5c677 100644
--- a/glide3x/h3/glide3/tests/test15.c
+++ b/glide3x/h3/glide3/tests/test15.c
@@ -24,7 +24,7 @@ static const char name[]    = "test15";
 static const char purpose[] = "clip rectangle testing - clip rectangle travels around screen";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -204,5 +204,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h3/glide3/tests/test16.c b/glide3x/h3/glide3/tests/test16.c
index 04a4ba4..2faf1af 100644
--- a/glide3x/h3/glide3/tests/test16.c
+++ b/glide3x/h3/glide3/tests/test16.c
@@ -25,7 +25,7 @@ static const char name[]    = "test16";
 static const char purpose[] = "test grShamelessPlug and grSplash";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -43,13 +43,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -191,5 +191,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h3/glide3/tests/test17.c b/glide3x/h3/glide3/tests/test17.c
index e635a5c..d4bd71a 100644
--- a/glide3x/h3/glide3/tests/test17.c
+++ b/glide3x/h3/glide3/tests/test17.c
@@ -45,7 +45,7 @@ const char *textureModeNames[] = {
     "(ITRGB * TEXTURE)+WHITE SPECULAR"
 };
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -62,13 +62,13 @@ void main( int argc, char **argv) {
     FxU32                zrange[2];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -285,7 +285,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -313,5 +313,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h3/glide3/tests/test18.c b/glide3x/h3/glide3/tests/test18.c
index 7e7b87b..9de35db 100644
--- a/glide3x/h3/glide3/tests/test18.c
+++ b/glide3x/h3/glide3/tests/test18.c
@@ -25,7 +25,7 @@ static const char name[]    = "test18";
 static const char purpose[] = "alpha texture test";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -45,13 +45,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -246,5 +246,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h3/glide3/tests/test19.c b/glide3x/h3/glide3/tests/test19.c
index 680ee6a..464bef0 100644
--- a/glide3x/h3/glide3/tests/test19.c
+++ b/glide3x/h3/glide3/tests/test19.c
@@ -52,7 +52,7 @@ static int loadTexture( const char *filename,
                         void *table );
 static GrTexTable_t texTableType( GrTextureFormat_t format );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -75,13 +75,13 @@ void main( int argc, char **argv) {
 
     strcpy(texfilename, "miro.3df");
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrdt", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrdt", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -296,7 +296,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -350,7 +350,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test20.c b/glide3x/h3/glide3/tests/test20.c
index ce816cb..a972717 100644
--- a/glide3x/h3/glide3/tests/test20.c
+++ b/glide3x/h3/glide3/tests/test20.c
@@ -27,7 +27,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 typedef enum { DISABLE, NEAREST, TRILINEAR } MipMapMode;
 
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -49,13 +49,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -304,7 +304,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test21.c b/glide3x/h3/glide3/tests/test21.c
index 4086da5..ddff06d 100644
--- a/glide3x/h3/glide3/tests/test21.c
+++ b/glide3x/h3/glide3/tests/test21.c
@@ -26,7 +26,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 
 typedef enum { LIGHTMAP, SPECULAR, DETAIL } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -54,13 +54,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -356,7 +356,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test22.c b/glide3x/h3/glide3/tests/test22.c
index 75cebd0..1b6f8d4 100644
--- a/glide3x/h3/glide3/tests/test22.c
+++ b/glide3x/h3/glide3/tests/test22.c
@@ -24,7 +24,7 @@ static const char name[]    = "test22";
 static const char purpose[] = "fog with multi-pass texturing";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -295,7 +295,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test23.c b/glide3x/h3/glide3/tests/test23.c
index cdc8615..5f4f116 100644
--- a/glide3x/h3/glide3/tests/test23.c
+++ b/glide3x/h3/glide3/tests/test23.c
@@ -29,7 +29,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -55,13 +55,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -233,7 +233,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/h3/glide3/tests/test24.c b/glide3x/h3/glide3/tests/test24.c
index ce67f1d..067561e 100644
--- a/glide3x/h3/glide3/tests/test24.c
+++ b/glide3x/h3/glide3/tests/test24.c
@@ -29,7 +29,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -54,13 +54,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -232,7 +232,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/h3/glide3/tests/test25.c b/glide3x/h3/glide3/tests/test25.c
index f320f82..42fbc0d 100644
--- a/glide3x/h3/glide3/tests/test25.c
+++ b/glide3x/h3/glide3/tests/test25.c
@@ -152,7 +152,7 @@ static int screenFulls[] = {
 #define NFRAMES 20
 #define NVERTS 3
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -175,7 +175,7 @@ void main( int argc, char **argv) {
     y_angle = 0.0f;             /* rotation amount */
     
   int
-    firstTime;                  /* Used for performance calculations */
+    firstTime = 1;              /* Used for performance calculations */
 
   FxBool
     plugging = FXFALSE,         /* Show shameless plug */
@@ -196,7 +196,7 @@ void main( int argc, char **argv) {
     swapDelay = 1,              /* Arg to grBufferSwap */
     trisDrawn,                  /* # triangles drawn */
     trisProcessed,              /* # triangles through pipeline */
-    lastFrame,                  /* Number of last frame we did perf stats */
+    lastFrame = 0,              /* Number of last frame we did perf stats */
     frameNum = 0L;              /* id of each frame drawn */
     
   GrCullMode_t
@@ -231,13 +231,13 @@ void main( int argc, char **argv) {
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrbtea", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrbtea", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -872,4 +872,5 @@ void main( int argc, char **argv) {
       break;
   }
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/h3/glide3/tests/test26.c b/glide3x/h3/glide3/tests/test26.c
index 9503875..d81bd16 100644
--- a/glide3x/h3/glide3/tests/test26.c
+++ b/glide3x/h3/glide3/tests/test26.c
@@ -24,11 +24,6 @@ static const char name[]    = "test26";
 static const char purpose[] = "tests grLfbWriteRegion, and grLfbReadRegion";
 static const char usage[]   = "-n <frames> -r <res>";
 
-static const char *renderBufferString[] = {
-    "GR_BUFFER_FRONTBUFFER",
-    "GR_BUFFER_BACKBUFFER "
-};
-
 static const char *sourceFormatString[] = {
     "GR_LFB_SRC_FMT_565       ",
     "GR_LFB_SRC_FMT_555       ",
@@ -53,7 +48,7 @@ static void imageConvert( void *dst,
                           GrLfbSrcFmt_t format,
                           FxU32 *bpp );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -78,13 +73,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -144,7 +139,7 @@ void main( int argc, char **argv) {
               (int) scrWidth, (int) scrHeight);
 
       tlErrorMessage(errMsg);
-      return;
+      return -1;
     }
 
     sourceFormat = GR_LFB_SRC_FMT_565;
@@ -228,7 +223,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test27.c b/glide3x/h3/glide3/tests/test27.c
index 28485f7..0651f6d 100644
--- a/glide3x/h3/glide3/tests/test27.c
+++ b/glide3x/h3/glide3/tests/test27.c
@@ -25,7 +25,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 static int rRandom(int s, int e);
 static unsigned int iRandom (unsigned int maxr);
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -44,13 +44,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "Nnr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "Nnr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -157,7 +157,7 @@ doNothing:
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/h3/glide3/tests/test28.c b/glide3x/h3/glide3/tests/test28.c
index fd8fd43..f92c9e0 100644
--- a/glide3x/h3/glide3/tests/test28.c
+++ b/glide3x/h3/glide3/tests/test28.c
@@ -79,7 +79,7 @@ static const char name[]    = "test28";
 static const char purpose[] = "planar polygon test";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -101,13 +101,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -215,5 +215,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h3/glide3/tests/test29.c b/glide3x/h3/glide3/tests/test29.c
index 8ea6aa1..3a39a1d 100644
--- a/glide3x/h3/glide3/tests/test29.c
+++ b/glide3x/h3/glide3/tests/test29.c
@@ -30,7 +30,7 @@ static const char usage[]   = "\t-d <screen dump filename>\n"
                               "\t-s [force single texturing]\n";
                               
 
-void main(int argc, char **argv) {
+int main(int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -58,13 +58,13 @@ void main(int argc, char **argv) {
   assert(hwconfig = tlVoodooType());
 
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) {
+  while ((rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
       printf("Available resolutions:\n%s\n",
               tlGetResolutionList());
-      return;
+      return -1;
     }
     switch(match) {
     case 'd':
@@ -358,4 +358,5 @@ void main(int argc, char **argv) {
 
 __errExit:    
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/h3/glide3/tests/test30.c b/glide3x/h3/glide3/tests/test30.c
index 0dadb61..0a021dd 100644
--- a/glide3x/h3/glide3/tests/test30.c
+++ b/glide3x/h3/glide3/tests/test30.c
@@ -128,7 +128,7 @@ main(int argc, char **argv) {
     char **remArgs;
     int  rv;
 
-    while(rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) {
+    while((rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) != 0) {
       if(rv == -1) {
         printf("Unrecognized command line argument\n");
         printf("%s %s\n", name, usage);
diff --git a/glide3x/h3/glide3/tests/test31.c b/glide3x/h3/glide3/tests/test31.c
index 765d76d..2b4aa8d 100644
--- a/glide3x/h3/glide3/tests/test31.c
+++ b/glide3x/h3/glide3/tests/test31.c
@@ -46,7 +46,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -80,13 +80,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -379,7 +379,7 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/h3/glide3/tests/test32.c b/glide3x/h3/glide3/tests/test32.c
index 0f9daf2..58908c1 100644
--- a/glide3x/h3/glide3/tests/test32.c
+++ b/glide3x/h3/glide3/tests/test32.c
@@ -46,7 +46,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -86,13 +86,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -493,7 +493,7 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/h3/glide3/tests/test33.c b/glide3x/h3/glide3/tests/test33.c
index 4ba4e6b..d4d8b04 100644
--- a/glide3x/h3/glide3/tests/test33.c
+++ b/glide3x/h3/glide3/tests/test33.c
@@ -27,7 +27,7 @@ static const char name[]    = "test33";
 static const char purpose[] = "draws gouraud shaded triangle strip and fan with grDrawVertexArray(GR_TRIANGLE_STRIP(FAN)_CONTINUE";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            goto _quit;
         }
         switch( match ) {
         case 'n':
@@ -181,15 +181,15 @@ void main( int argc, char **argv) {
               printf( "Cannot open %s\n", filename);
             scrgrab = FXFALSE;
           }
-          if ( tlKbHit() ) goto exit;
+          if ( tlKbHit() ) goto _quit;
         }
       }
     }
     
     tlSleep( 1 );
-exit:
+_quit:
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test34.c b/glide3x/h3/glide3/tests/test34.c
index ec23e9a..1be0ace 100644
--- a/glide3x/h3/glide3/tests/test34.c
+++ b/glide3x/h3/glide3/tests/test34.c
@@ -35,7 +35,7 @@ static const char name[]    = "test34";
 static const char purpose[] = "fogging with table/fogcoord";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -65,13 +65,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -120,7 +120,7 @@ void main( int argc, char **argv) {
     if (!extstr) {
       printf( "FOGCOORD is not supported in %s\n", grGetString(GR_HARDWARE) );
       grGlideShutdown();
-      return;
+      return -1;
     }
     if (!strncmp(extstr, "FOGCOORD", 8)) {
       fogext = FXTRUE;
@@ -297,7 +297,7 @@ void main( int argc, char **argv) {
 
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test35.c b/glide3x/h3/glide3/tests/test35.c
index 24cc2b3..34718eb 100644
--- a/glide3x/h3/glide3/tests/test35.c
+++ b/glide3x/h3/glide3/tests/test35.c
@@ -24,7 +24,7 @@ static const char name[]    = "test35";
 static const char purpose[] = "texture chromarange";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -35,7 +35,6 @@ void main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
 
     TlTexture  baseTexture;
     unsigned long baseTextureAddr;
@@ -55,13 +54,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -125,7 +124,7 @@ void main( int argc, char **argv) {
       */
       extension = grGetString(GR_EXTENSION);
 
-      if (extstr = strstr(extension, "CHROMARANGE")) {
+      if ((extstr = strstr(extension, "CHROMARANGE")) != NULL) {
         if (!strncmp(extstr, "CHROMARANGE", 11)) {
           grTexChromaModeExt = grGetProcAddress("grTexChromaModeExt");
           grTexChromaRangeExt = grGetProcAddress("grTexChromaRangeExt");
@@ -304,5 +303,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h3/glide3/tests/test36.c b/glide3x/h3/glide3/tests/test36.c
index 2873f16..b2c7e48 100644
--- a/glide3x/h3/glide3/tests/test36.c
+++ b/glide3x/h3/glide3/tests/test36.c
@@ -17,8 +17,6 @@
 #include "tlib.h"
 
 int hwconfig;
-static const char *version;
-static const char *extension;
 
 static const char name[]    = "test36";
 static const char purpose[] = "screen resolutions";
@@ -26,7 +24,7 @@ static const char usage[]   = "-p show passed, -n no progress";
 
 static const char status[]  = "-\\|/";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
         FxBool bShowPassed = FXFALSE;
         FxBool bNoProgress = FXFALSE;
         GrResolution resTemplate;
@@ -103,7 +101,7 @@ void main( int argc, char **argv) {
 
         printf ( "Press any key.\n" );
         tlGetCH ();
-        return;
+        return 0;
 }
 
 
diff --git a/glide3x/h3/glide3/tests/test37.c b/glide3x/h3/glide3/tests/test37.c
index 7fe3c12..2500e2f 100644
--- a/glide3x/h3/glide3/tests/test37.c
+++ b/glide3x/h3/glide3/tests/test37.c
@@ -50,24 +50,20 @@
 #define CORRECT_GR_VIEWPORT_WIDTH 640
 #define CORRECT_GR_VIEWPORT_HEIGHT 480
 
-void TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failures);
+void TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures);
 void TestGetString(char * getvalstr, int getval, int * failures);
 
 int hwconfig;
-static const char *version;
-static const char *extension;
 
-extern unsigned long hWndMain;
-
-void 
+int 
 main( int argc, char **argv) 
 {
   GrScreenResolution_t resolution = GR_RESOLUTION_640x480;
   float                scrWidth   = 640.0f;
   float                scrHeight  = 480.0f;
-  long val4[4];
-  long * histbuffer;
-  long histsize;
+  FxI32 val4[4];
+  FxI32 * histbuffer;
+  FxI32 histsize;
   const char * str;
   int ret;
   int i;
@@ -83,7 +79,7 @@ main( int argc, char **argv)
   /* Process Command Line Arguments */
   tlSetScreen( scrWidth, scrHeight );
   
-  version = grGetString( GR_VERSION );
+  str = grGetString( GR_VERSION );
   
   printf("Test 37 - grGet() Stress Test. All output goes to the Console.\n\n");
   tlGetCH ();
@@ -245,10 +241,10 @@ main( int argc, char **argv)
   ret = grGet(GR_NUM_SWAP_HISTORY_BUFFER, sizeof(histsize), &histsize );
   
   if(ret==sizeof(histsize)) {
-    histbuffer = malloc(histsize*sizeof(long));
+    histbuffer = malloc(histsize*sizeof(FxI32));
     
-    ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(long), histbuffer );
-    if(ret==(int)(histsize*sizeof(long)))
+    ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(FxI32), histbuffer );
+    if(ret==(int)(histsize*sizeof(FxI32)))
       printf("Success(%d) - ",ret);
     else {
       printf("Failed (%d) - ", ret);
@@ -260,7 +256,7 @@ main( int argc, char **argv)
     for(i=0;i<histsize;i++) {
       printf("%d ", histbuffer[i]);
     }
-    printf("\n", histbuffer[i]);
+    printf("\n");
     free(histbuffer);
   } else {
     printf("GR_NUM_SWAP_HISTORY_BUFFER failed, so unable to call GR_SWAP_HISTORY\n");   
@@ -316,12 +312,12 @@ main( int argc, char **argv)
  __errExit:    
   grGlideShutdown();
   
-  return;
+  return 0;
 } /* main */
 
 
 void
-TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failures)
+TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures)
 {
   int ret;
   int i;
@@ -332,7 +328,7 @@ TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failur
   for(i=0;i<4;i++)              /*Clear Memory to some unique Pattern*/
     memval[i] =0xdeadbeef;
   
-  ret = grGet(getval, memcount*sizeof(long), memval );  /*Do the Get*/
+  ret = grGet(getval, memcount*sizeof(FxI32), memval );  /*Do the Get*/
   
   for(i=0;i<memcount;i++)
     /*if pattern still exists, then we have a problem*/
@@ -340,7 +336,7 @@ TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failur
       correct=FXFALSE;
   
   /* if Number of bytes returned is wrong, then we have a problem*/
-  if(ret!=(int)(memcount*sizeof(long))) 
+  if(ret!=(int)(memcount*sizeof(FxI32))) 
     correct=FXFALSE;
   
   if(correct)                   /*print the results*/
diff --git a/glide3x/h3/glide3/tests/test38.c b/glide3x/h3/glide3/tests/test38.c
index dc391b2..b78ed8b 100644
--- a/glide3x/h3/glide3/tests/test38.c
+++ b/glide3x/h3/glide3/tests/test38.c
@@ -39,9 +39,7 @@ static const char name[]    = "test38";
 static const char purpose[] = "Test the guGammaCorrectionRGB(..) function.";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-extern unsigned long hWndMain;
-
-void main( int argc, char **argv) 
+int main( int argc, char **argv) 
 {
   char match; 
   char **remArgs;
@@ -65,13 +63,13 @@ void main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -195,6 +193,6 @@ void main( int argc, char **argv)
   
  __errExit:    
   grGlideShutdown();
-  return;
+  return 0;
 }
 
diff --git a/glide3x/h3/glide3/tests/test39.c b/glide3x/h3/glide3/tests/test39.c
index 958d46c..eec4d52 100644
--- a/glide3x/h3/glide3/tests/test39.c
+++ b/glide3x/h3/glide3/tests/test39.c
@@ -58,7 +58,6 @@ main(int argc, char **argv)
   FxU32                wrange[2];
 
   FxU32
-    multiBaseMode = 0, 
     minTexSize = 1,
     maxTexSize = 256;
 
@@ -78,7 +77,7 @@ main(int argc, char **argv)
     exit(-1);
   }
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) {
+  while((rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
@@ -369,9 +368,6 @@ main(int argc, char **argv)
 
   tlConOutput("Press a key to quit\n");
   while(frames-- && tlOkToRender()) {
-    static float 
-      curOOW = 1.0f;
-
     if (hwconfig == TL_VOODOORUSH) {
       tlGetDimsByConst(resolution,
                        &scrWidth, 
diff --git a/glide3x/h5/glide3/tests/display.c b/glide3x/h5/glide3/tests/display.c
index c44bc8e..8c840c7 100644
--- a/glide3x/h5/glide3/tests/display.c
+++ b/glide3x/h5/glide3/tests/display.c
@@ -48,11 +48,6 @@ static const char name[]    = "display";
 static const char purpose[] = "display a 16 bit frame buffer (565 format) dump out";
 static const char usage[]   = "-n <frames> -r <res> -s srcimage -t testimage";
 
-static const char *renderBufferString[] = {
-    "GR_BUFFER_FRONTBUFFER",
-    "GR_BUFFER_BACKBUFFER "
-};
-
 static const char *sourceFormatString[] = {
     "GR_LFB_SRC_FMT_565       ",
     "GR_LFB_SRC_FMT_555       ",
@@ -77,7 +72,8 @@ static void imageConvert( void *dst,
                           GrLfbSrcFmt_t format,
                           FxU32 *bpp );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv)
+{
     char match; 
     char **remArgs;
     int  rv;
@@ -93,7 +89,7 @@ void main( int argc, char **argv) {
     LFB_Img src, dst, diff;
     FxBool txtdisplay = FXTRUE;
 
-    void *image;
+    void *image = NULL;
     FxU32 bpp;
 
     GrLfbSrcFmt_t sourceFormat;
@@ -105,13 +101,13 @@ void main( int argc, char **argv) {
     dstfname[0] = 0;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrst", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -177,8 +173,8 @@ void main( int argc, char **argv) {
         /* readng the LFB file header */
         fread(&src.signature, 4, 1, fp);
         if (src.signature != IMAGE_SRLE) {
-          printf("%s file type incorrect\n");
-          return;
+          printf("%s file type incorrect\n", srcfname);
+          return -1;
         }
         fread(&src.width, 2, 1, fp);
         fread(&src.height, 2, 1, fp);
@@ -211,8 +207,8 @@ void main( int argc, char **argv) {
         /* readng the LFB file header */
         fread(&dst.signature, 4, 1, fp);
         if (dst.signature != IMAGE_SRLE) {
-          printf("%s file type incorrect\n");
-          return;
+          printf("%s file type incorrect\n", dstfname);
+          return -1;
         }
         fread(&dst.width, 2, 1, fp);
         fread(&dst.height, 2, 1, fp);
@@ -230,6 +226,7 @@ void main( int argc, char **argv) {
       }
     }
 
+    diff.data = NULL;
     diff.width = 0;
     diff.height = 0;
         
@@ -275,7 +272,7 @@ void main( int argc, char **argv) {
     }
     if ( ( imageWidth > (FxU32)scrWidth ) ||
          ( imageHeight > (FxU32)scrHeight ) )
-        return;
+        return -1;
 
     while( frames-- ) {
 
@@ -367,7 +364,7 @@ void main( int argc, char **argv) {
     if (srcfname[0] && dstfname[0])
       free(diff.data);
     free(image);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/sbench.c b/glide3x/h5/glide3/tests/sbench.c
index 0959d01..ebdfd08 100644
--- a/glide3x/h5/glide3/tests/sbench.c
+++ b/glide3x/h5/glide3/tests/sbench.c
@@ -41,7 +41,7 @@ static const char name[]    = "sbench";
 static const char purpose[] = "benchmark grDrawVertexArray for gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename> -l <primitive type> -v <vertex array size> -t <triangel size> -p -a";
 
-char *Usage(void)
+void Usage(void)
 {
     printf ("       -l <type> => primitive type\n");
     printf ("                 => 0 point\n");
@@ -55,7 +55,6 @@ char *Usage(void)
     printf ("       -t <size> => triangle size\n");
     printf ("       -p        => packed color\n");
     printf ("       -a        => antialiased\n");
-    return NULL;
 }
 
 void
@@ -79,7 +78,7 @@ setVertexXyzRgbaSt( FxFloat *v, FxFloat x, FxFloat y, FxFloat z,
     *(v+GR_VERTEX_TOW_TMU1_OFFSET) = t * 1.f;
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -119,14 +118,14 @@ main( int argc, char **argv)
   FxU32 wrange[2];
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
       Usage();
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -441,10 +440,5 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
-
-
-
-
-
diff --git a/glide3x/h5/glide3/tests/test00.c b/glide3x/h5/glide3/tests/test00.c
index 12f350c..3597668 100644
--- a/glide3x/h5/glide3/tests/test00.c
+++ b/glide3x/h5/glide3/tests/test00.c
@@ -40,7 +40,7 @@ static const char name[]    = "test00";
 static const char purpose[] = "Clear screen to blue";
 static const char usage[]   = "-n <frames> -r <res> -d <filename> -p <pixel format>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -62,13 +62,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrdp", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrdp", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -159,6 +159,6 @@ main( int argc, char **argv)
   
  __errExit:   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
diff --git a/glide3x/h5/glide3/tests/test01.c b/glide3x/h5/glide3/tests/test01.c
index 0716941..42f05b7 100644
--- a/glide3x/h5/glide3/tests/test01.c
+++ b/glide3x/h5/glide3/tests/test01.c
@@ -40,7 +40,7 @@ static const char name[]    = "test01";
 static const char purpose[] = "draws a diagonal line of points from top-left to bottom-right";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void
+int
 main( int argc, char **argv) {
   char match; 
   char **remArgs;
@@ -60,13 +60,13 @@ main( int argc, char **argv) {
   assert( hwconfig = tlVoodooType() );
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -160,7 +160,7 @@ main( int argc, char **argv) {
   
  __errExit:   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test02.c b/glide3x/h5/glide3/tests/test02.c
index bea7eb7..2fd410b 100644
--- a/glide3x/h5/glide3/tests/test02.c
+++ b/glide3x/h5/glide3/tests/test02.c
@@ -41,7 +41,7 @@ static const char name[]    = "test02";
 static const char purpose[] = "draws a parabolic envelope of lines";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -60,13 +60,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -164,7 +164,7 @@ void main( int argc, char **argv) {
     
  __errExit:   
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test03.c b/glide3x/h5/glide3/tests/test03.c
index c5eb632..4f47974 100644
--- a/glide3x/h5/glide3/tests/test03.c
+++ b/glide3x/h5/glide3/tests/test03.c
@@ -40,7 +40,7 @@ static const char name[]    = "test03";
 static const char purpose[] = "draws gouraud shaded lines";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -59,13 +59,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -158,7 +158,7 @@ void main( int argc, char **argv) {
     
  __errExit:   
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test04.c b/glide3x/h5/glide3/tests/test04.c
index a55b560..e303219 100644
--- a/glide3x/h5/glide3/tests/test04.c
+++ b/glide3x/h5/glide3/tests/test04.c
@@ -41,7 +41,7 @@ static const char name[]    = "test04";
 static const char purpose[] = "draws gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename> -p <pixel format>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -61,13 +61,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrdp", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrdp", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -181,7 +181,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
    grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test05.c b/glide3x/h5/glide3/tests/test05.c
index 9627819..99aa56a 100644
--- a/glide3x/h5/glide3/tests/test05.c
+++ b/glide3x/h5/glide3/tests/test05.c
@@ -41,7 +41,7 @@ static const char name[]    = "test05";
 static const char purpose[] = "renders two interpenetrating triangles with z-buffering";
 static const char usage[]   = "-n <frames> -r <res> -d <filename> -p <pixel format>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -63,13 +63,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrdp", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrdp", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -216,7 +216,7 @@ main( int argc, char **argv)
   
  __errExit:    
   grGlideShutdown();
-  return;
+  return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test06.c b/glide3x/h5/glide3/tests/test06.c
index 7e3c36c..b910e82 100644
--- a/glide3x/h5/glide3/tests/test06.c
+++ b/glide3x/h5/glide3/tests/test06.c
@@ -41,7 +41,7 @@ static const char name[]    = "test06";
 static const char purpose[] = "renders two interpenetrating triangles with w-buffering";
 static const char usage[]   = "-n <frames> -r <res> -d <filename> -p <pixel format>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -61,13 +61,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrdp", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrdp", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -214,7 +214,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test07.c b/glide3x/h5/glide3/tests/test07.c
index 574e064..f50c4fb 100644
--- a/glide3x/h5/glide3/tests/test07.c
+++ b/glide3x/h5/glide3/tests/test07.c
@@ -40,7 +40,7 @@ static const char name[]    = "test07";
 static const char purpose[] = "alpha blending test";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -58,13 +58,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -174,7 +174,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test08.c b/glide3x/h5/glide3/tests/test08.c
index 954b7a0..dd9ee26 100644
--- a/glide3x/h5/glide3/tests/test08.c
+++ b/glide3x/h5/glide3/tests/test08.c
@@ -40,7 +40,7 @@ static const char name[]    = "test08";
 static const char purpose[] = "fogging";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -60,13 +60,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -180,7 +180,7 @@ void main( int argc, char **argv) {
     free(fogtable);
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test09.c b/glide3x/h5/glide3/tests/test09.c
index c6eb35f..ecbfda0 100644
--- a/glide3x/h5/glide3/tests/test09.c
+++ b/glide3x/h5/glide3/tests/test09.c
@@ -42,7 +42,7 @@ static const char purpose[] = "chromakey and chromarange - render a red and blue
                               " triangle but chromakey one out";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -65,13 +65,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -211,7 +211,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -252,7 +252,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test10.c b/glide3x/h5/glide3/tests/test10.c
index 1c872b2..8c2c7a9 100644
--- a/glide3x/h5/glide3/tests/test10.c
+++ b/glide3x/h5/glide3/tests/test10.c
@@ -42,7 +42,7 @@ static const char purpose[] = "culling test - render a red and blue"
                               ", blue negative";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -62,13 +62,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -174,7 +174,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -208,7 +208,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test11.c b/glide3x/h5/glide3/tests/test11.c
index a003ed6..9e1463e 100644
--- a/glide3x/h5/glide3/tests/test11.c
+++ b/glide3x/h5/glide3/tests/test11.c
@@ -43,7 +43,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 static int rRandom(int s, int e);
 static unsigned int iRandom (unsigned int maxr);
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -64,13 +64,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return 0;
         }
         switch( match ) {
         case 'n':
@@ -159,7 +159,7 @@ void main( int argc, char **argv) {
 
         if ( tlScaleX(1.0f) < 64.0 ||
              tlScaleY(1.0f) < 64.0 )
-            return;
+            return -1;
         
         /* generate random start position */
         startX = (int)rRandom( 64, (int)tlScaleX(1.0f) - 65 );
@@ -235,7 +235,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/h5/glide3/tests/test12.c b/glide3x/h5/glide3/tests/test12.c
index b3f68b0..33d332a 100644
--- a/glide3x/h5/glide3/tests/test12.c
+++ b/glide3x/h5/glide3/tests/test12.c
@@ -75,7 +75,7 @@ static const char *pixPipeString[] = {
   "PIXELPIPE ENABLED "
 };
 
-void
+int
 main( int argc, char **argv)
 {
   char match; 
@@ -104,13 +104,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -126,7 +126,7 @@ main( int argc, char **argv)
 
   if ( resolution == GR_RESOLUTION_NONE ) {
     tlErrorMessage( "Error!: Frontbuffer rendering not supported in a window\n" );
-    return;
+    return -1;
   }
 
   tlSetScreen( scrWidth, scrHeight );
@@ -348,7 +348,7 @@ main( int argc, char **argv)
     
  __errExit:    
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/h5/glide3/tests/test13.c b/glide3x/h5/glide3/tests/test13.c
index 12163a7..f6467f3 100644
--- a/glide3x/h5/glide3/tests/test13.c
+++ b/glide3x/h5/glide3/tests/test13.c
@@ -41,7 +41,7 @@ static const char name[]    = "test13";
 static const char purpose[] = "iterated alpha test - blue triangle fades towards one vertex\n";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -59,13 +59,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -182,5 +182,5 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test14.c b/glide3x/h5/glide3/tests/test14.c
index 3a7cbf6..f64863d 100644
--- a/glide3x/h5/glide3/tests/test14.c
+++ b/glide3x/h5/glide3/tests/test14.c
@@ -41,7 +41,7 @@ static const char purpose[] = "depth bias test: vary depth bias \n"
                                "over time with two interpenetrating triangles";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -61,13 +61,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -193,5 +193,5 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test15.c b/glide3x/h5/glide3/tests/test15.c
index 82696a4..63f754f 100644
--- a/glide3x/h5/glide3/tests/test15.c
+++ b/glide3x/h5/glide3/tests/test15.c
@@ -22,10 +22,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifndef	__linux__
+#ifndef __linux__
 #include <conio.h>
 #else
-#include <linio.h>
+#include <linutil.h>
 #endif
 #include <assert.h>
 
@@ -40,7 +40,7 @@ static const char name[]    = "test15";
 static const char purpose[] = "clip rectangle testing - clip rectangle travels around screen";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -59,13 +59,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -229,5 +229,5 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test16.c b/glide3x/h5/glide3/tests/test16.c
index a82f298..44da910 100644
--- a/glide3x/h5/glide3/tests/test16.c
+++ b/glide3x/h5/glide3/tests/test16.c
@@ -41,7 +41,7 @@ static const char name[]    = "test16";
 static const char purpose[] = "test grShamelessPlug and grSplash";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -60,13 +60,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -213,5 +213,5 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test17.c b/glide3x/h5/glide3/tests/test17.c
index a16f5cd..be64e08 100644
--- a/glide3x/h5/glide3/tests/test17.c
+++ b/glide3x/h5/glide3/tests/test17.c
@@ -53,7 +53,7 @@ const char *cmodeName[] = {
   "ON      "
 };
 
-void 
+int 
 main(int argc, char **argv) 
 {
   char match; 
@@ -81,13 +81,13 @@ main(int argc, char **argv)
     yBottom;
 
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) {
+  while ((rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
       printf("Available resolutions:\n%s\n",
              tlGetResolutionList());
-      return;
+      return -1;
     }
     switch(match) {
     case 'n':
@@ -377,7 +377,7 @@ main(int argc, char **argv)
       cnt = strcspn(filename, ".");
       strncpy(fname, filename, cnt);
       fname[cnt] = 0;
-      sprintf(tmp,"_%d\0", subframe);
+      sprintf(tmp,"_%d", subframe);
       strcat(fname, tmp);
       strcat(fname, filename+cnt);
       if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -415,4 +415,5 @@ main(int argc, char **argv)
     
  __errExit:    
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test18.c b/glide3x/h5/glide3/tests/test18.c
index 7390d72..9ab8958 100644
--- a/glide3x/h5/glide3/tests/test18.c
+++ b/glide3x/h5/glide3/tests/test18.c
@@ -41,7 +41,7 @@ static const char name[]    = "test18";
 static const char purpose[] = "alpha texture test";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -62,13 +62,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -268,5 +268,5 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test19.c b/glide3x/h5/glide3/tests/test19.c
index 0f1c5a9..14aeccc 100644
--- a/glide3x/h5/glide3/tests/test19.c
+++ b/glide3x/h5/glide3/tests/test19.c
@@ -68,7 +68,7 @@ static int loadTexture( const char *filename,
                         void *table );
 static GrTexTable_t texTableType( GrTextureFormat_t format );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -92,13 +92,13 @@ void main( int argc, char **argv) {
 
     strcpy(texfilename, "miro.3df");
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrdt", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrdt", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -317,7 +317,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -372,7 +372,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test20.c b/glide3x/h5/glide3/tests/test20.c
index 7d7fdd0..317ffe7 100644
--- a/glide3x/h5/glide3/tests/test20.c
+++ b/glide3x/h5/glide3/tests/test20.c
@@ -43,7 +43,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 typedef enum { DISABLE, NEAREST, TRILINEAR } MipMapMode;
 
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -66,13 +66,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -326,7 +326,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test21.c b/glide3x/h5/glide3/tests/test21.c
index ce6ee63..bc18562 100644
--- a/glide3x/h5/glide3/tests/test21.c
+++ b/glide3x/h5/glide3/tests/test21.c
@@ -42,7 +42,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 
 typedef enum { LIGHTMAP, SPECULAR, DETAIL } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -71,13 +71,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -378,7 +378,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test22.c b/glide3x/h5/glide3/tests/test22.c
index 8c7818c..11940e2 100644
--- a/glide3x/h5/glide3/tests/test22.c
+++ b/glide3x/h5/glide3/tests/test22.c
@@ -40,7 +40,7 @@ static const char name[]    = "test22";
 static const char purpose[] = "fog with multi-pass texturing";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -68,13 +68,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -317,7 +317,7 @@ void main( int argc, char **argv) {
     free(fogtable);
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test23.c b/glide3x/h5/glide3/tests/test23.c
index d48c4c2..d800e32 100644
--- a/glide3x/h5/glide3/tests/test23.c
+++ b/glide3x/h5/glide3/tests/test23.c
@@ -45,7 +45,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -72,13 +72,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -255,7 +255,7 @@ void main( int argc, char **argv) {
     free(fogtable);
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/h5/glide3/tests/test24.c b/glide3x/h5/glide3/tests/test24.c
index c5fb968..5b320b8 100644
--- a/glide3x/h5/glide3/tests/test24.c
+++ b/glide3x/h5/glide3/tests/test24.c
@@ -45,7 +45,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -71,13 +71,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -254,7 +254,7 @@ void main( int argc, char **argv) {
     free(fogtable);
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/h5/glide3/tests/test25.c b/glide3x/h5/glide3/tests/test25.c
index 0736962..e98f4d0 100644
--- a/glide3x/h5/glide3/tests/test25.c
+++ b/glide3x/h5/glide3/tests/test25.c
@@ -170,7 +170,7 @@ static int screenFulls[] = {
 #define NFRAMES 20
 #define NVERTS 3
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -193,7 +193,7 @@ void main( int argc, char **argv) {
     y_angle = 0.0f;             /* rotation amount */
     
   int
-    firstTime;                  /* Used for performance calculations */
+    firstTime = 1;              /* Used for performance calculations */
 
   FxBool
     plugging = FXFALSE,         /* Show shameless plug */
@@ -214,7 +214,7 @@ void main( int argc, char **argv) {
     swapDelay = 1,              /* Arg to grBufferSwap */
     trisDrawn,                  /* # triangles drawn */
     trisProcessed,              /* # triangles through pipeline */
-    lastFrame,                  /* Number of last frame we did perf stats */
+    lastFrame = 0,              /* Number of last frame we did perf stats */
     frameNum = 0L;              /* id of each frame drawn */
     
   GrCullMode_t
@@ -251,13 +251,13 @@ void main( int argc, char **argv) {
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrbtea", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrbtea", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
               tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -929,4 +929,5 @@ void main( int argc, char **argv) {
 
   }
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test26.c b/glide3x/h5/glide3/tests/test26.c
index 5602361..3c6b689 100644
--- a/glide3x/h5/glide3/tests/test26.c
+++ b/glide3x/h5/glide3/tests/test26.c
@@ -40,11 +40,6 @@ static const char name[]    = "test26";
 static const char purpose[] = "tests grLfbWriteRegion, and grLfbReadRegion";
 static const char usage[]   = "-n <frames> -r <res>";
 
-static const char *renderBufferString[] = {
-    "GR_BUFFER_FRONTBUFFER",
-    "GR_BUFFER_BACKBUFFER "
-};
-
 static const char *sourceFormatString[] = {
     "GR_LFB_SRC_FMT_565       ",
     "GR_LFB_SRC_FMT_555       ",
@@ -69,7 +64,7 @@ static void imageConvert( void *dst,
                           GrLfbSrcFmt_t format,
                           FxU32 *bpp );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -95,13 +90,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -165,7 +160,7 @@ void main( int argc, char **argv) {
               (int) scrWidth, (int) scrHeight);
 
       tlErrorMessage(errMsg);
-      return;
+      return -1;
     }
 
     sourceFormat = GR_LFB_SRC_FMT_565;
@@ -250,7 +245,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test27.c b/glide3x/h5/glide3/tests/test27.c
index fbd8d75..31717a1 100644
--- a/glide3x/h5/glide3/tests/test27.c
+++ b/glide3x/h5/glide3/tests/test27.c
@@ -41,7 +41,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 static int rRandom(int s, int e);
 static unsigned int iRandom (unsigned int maxr);
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -60,13 +60,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "Nnr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "Nnr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -177,7 +177,7 @@ doNothing:
 
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/h5/glide3/tests/test28.c b/glide3x/h5/glide3/tests/test28.c
index 3d74ec5..5c8a8c5 100644
--- a/glide3x/h5/glide3/tests/test28.c
+++ b/glide3x/h5/glide3/tests/test28.c
@@ -95,7 +95,7 @@ static const char name[]    = "test28";
 static const char purpose[] = "planar polygon test";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -118,13 +118,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -237,5 +237,5 @@ void main( int argc, char **argv) {
 
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test29.c b/glide3x/h5/glide3/tests/test29.c
index 5c546cd..4f44bf7 100644
--- a/glide3x/h5/glide3/tests/test29.c
+++ b/glide3x/h5/glide3/tests/test29.c
@@ -76,7 +76,7 @@ main(int argc, char **argv)
   assert(hwconfig = tlVoodooType());
 
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) {
+  while ((rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
diff --git a/glide3x/h5/glide3/tests/test30.c b/glide3x/h5/glide3/tests/test30.c
index 894d259..d23c47a 100644
--- a/glide3x/h5/glide3/tests/test30.c
+++ b/glide3x/h5/glide3/tests/test30.c
@@ -129,7 +129,7 @@ main(int argc, char **argv) {
     char **remArgs;
     int  rv;
 
-    while(rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) {
+    while((rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) != 0) {
       if(rv == -1) {
         printf("Unrecognized command line argument\n");
         printf("%s %s\n", name, usage);
diff --git a/glide3x/h5/glide3/tests/test31.c b/glide3x/h5/glide3/tests/test31.c
index 33989a2..d7b769a 100644
--- a/glide3x/h5/glide3/tests/test31.c
+++ b/glide3x/h5/glide3/tests/test31.c
@@ -62,7 +62,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -97,13 +97,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -401,7 +401,7 @@ main( int argc, char **argv)
   
  __errExit:    
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/h5/glide3/tests/test32.c b/glide3x/h5/glide3/tests/test32.c
index a7ac6b7..f9d5904 100644
--- a/glide3x/h5/glide3/tests/test32.c
+++ b/glide3x/h5/glide3/tests/test32.c
@@ -62,7 +62,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -103,13 +103,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -512,10 +512,10 @@ main( int argc, char **argv)
       }
     }
   }
-  
- __errExit:    
+
+ __errExit:
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/h5/glide3/tests/test33.c b/glide3x/h5/glide3/tests/test33.c
index 9edd3fe..f3d52f5 100644
--- a/glide3x/h5/glide3/tests/test33.c
+++ b/glide3x/h5/glide3/tests/test33.c
@@ -43,7 +43,7 @@ static const char name[]    = "test33";
 static const char purpose[] = "draws gouraud shaded triangle strip and fan with grDrawVertexArray(GR_TRIANGLE_STRIP(FAN)_CONTINUE";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -68,13 +68,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -211,7 +211,7 @@ void main( int argc, char **argv) {
     tlSleep( 1 );
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test34.c b/glide3x/h5/glide3/tests/test34.c
index 418737f..d61ae52 100644
--- a/glide3x/h5/glide3/tests/test34.c
+++ b/glide3x/h5/glide3/tests/test34.c
@@ -51,7 +51,7 @@ static const char name[]    = "test34";
 static const char purpose[] = "fogging with table/fogcoord";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -82,13 +82,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -315,7 +315,7 @@ void main( int argc, char **argv) {
     free(fogtable);
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test35.c b/glide3x/h5/glide3/tests/test35.c
index 8b54140..be77109 100644
--- a/glide3x/h5/glide3/tests/test35.c
+++ b/glide3x/h5/glide3/tests/test35.c
@@ -40,7 +40,7 @@ static const char name[]    = "test35";
 static const char purpose[] = "texture chromarange";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,7 +51,6 @@ void main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
     GrContext_t          gc = 0;
 
     TlTexture  baseTexture;
@@ -72,13 +71,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -145,7 +144,7 @@ void main( int argc, char **argv) {
     */
     extension = grGetString(GR_EXTENSION);
 
-    if (extstr = strstr(extension, "TEXCHROMA")) {
+    if ((extstr = strstr(extension, "TEXCHROMA")) != NULL) {
       if (!strncmp(extstr, "TEXCHROMA", 9)) {
         grTexChromaModeExt = grGetProcAddress("grTexChromaModeExt");
         grTexChromaRangeExt = grGetProcAddress("grTexChromaRangeExt");
@@ -155,7 +154,7 @@ void main( int argc, char **argv) {
     if (!grTexChromaModeExt) {
       printf( "TEXCHROMA is not supported in %s\n", grGetString(GR_HARDWARE) );
       grGlideShutdown();
-      return;
+      return -1;
     }
 
     grTexChromaModeExt(GR_TMU0, texchroma);
@@ -331,5 +330,5 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test36.c b/glide3x/h5/glide3/tests/test36.c
index ebc6a96..06cdcbd 100644
--- a/glide3x/h5/glide3/tests/test36.c
+++ b/glide3x/h5/glide3/tests/test36.c
@@ -33,8 +33,6 @@
 #include "tlib.h"
 
 int hwconfig;
-static const char *version;
-static const char *extension;
 
 static const char name[]    = "test36";
 static const char purpose[] = "screen resolutions";
@@ -42,7 +40,7 @@ static const char usage[]   = "-p show passed, -n no progress";
 
 static const char status[]  = "-\\|/";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
         FxBool bShowPassed = FXFALSE;
         FxBool bNoProgress = FXFALSE;
         GrResolution resTemplate;
@@ -51,7 +49,6 @@ void main( int argc, char **argv) {
                 iFailures = 0, iStatusAt = 0,
                 viewport[4];
         GrContext_t context;
-        extern unsigned long hWndMain;
 
         printf ( "Test36 - Glide resolution checker.  All output goes to the console.\n\n" );
         tlGetCH ();
@@ -119,7 +116,7 @@ void main( int argc, char **argv) {
 
         printf ( "Press any key.\n" );
         tlGetCH ();
-        return;
+        return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test37.c b/glide3x/h5/glide3/tests/test37.c
index 7fe3c12..2500e2f 100644
--- a/glide3x/h5/glide3/tests/test37.c
+++ b/glide3x/h5/glide3/tests/test37.c
@@ -50,24 +50,20 @@
 #define CORRECT_GR_VIEWPORT_WIDTH 640
 #define CORRECT_GR_VIEWPORT_HEIGHT 480
 
-void TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failures);
+void TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures);
 void TestGetString(char * getvalstr, int getval, int * failures);
 
 int hwconfig;
-static const char *version;
-static const char *extension;
 
-extern unsigned long hWndMain;
-
-void 
+int 
 main( int argc, char **argv) 
 {
   GrScreenResolution_t resolution = GR_RESOLUTION_640x480;
   float                scrWidth   = 640.0f;
   float                scrHeight  = 480.0f;
-  long val4[4];
-  long * histbuffer;
-  long histsize;
+  FxI32 val4[4];
+  FxI32 * histbuffer;
+  FxI32 histsize;
   const char * str;
   int ret;
   int i;
@@ -83,7 +79,7 @@ main( int argc, char **argv)
   /* Process Command Line Arguments */
   tlSetScreen( scrWidth, scrHeight );
   
-  version = grGetString( GR_VERSION );
+  str = grGetString( GR_VERSION );
   
   printf("Test 37 - grGet() Stress Test. All output goes to the Console.\n\n");
   tlGetCH ();
@@ -245,10 +241,10 @@ main( int argc, char **argv)
   ret = grGet(GR_NUM_SWAP_HISTORY_BUFFER, sizeof(histsize), &histsize );
   
   if(ret==sizeof(histsize)) {
-    histbuffer = malloc(histsize*sizeof(long));
+    histbuffer = malloc(histsize*sizeof(FxI32));
     
-    ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(long), histbuffer );
-    if(ret==(int)(histsize*sizeof(long)))
+    ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(FxI32), histbuffer );
+    if(ret==(int)(histsize*sizeof(FxI32)))
       printf("Success(%d) - ",ret);
     else {
       printf("Failed (%d) - ", ret);
@@ -260,7 +256,7 @@ main( int argc, char **argv)
     for(i=0;i<histsize;i++) {
       printf("%d ", histbuffer[i]);
     }
-    printf("\n", histbuffer[i]);
+    printf("\n");
     free(histbuffer);
   } else {
     printf("GR_NUM_SWAP_HISTORY_BUFFER failed, so unable to call GR_SWAP_HISTORY\n");   
@@ -316,12 +312,12 @@ main( int argc, char **argv)
  __errExit:    
   grGlideShutdown();
   
-  return;
+  return 0;
 } /* main */
 
 
 void
-TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failures)
+TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures)
 {
   int ret;
   int i;
@@ -332,7 +328,7 @@ TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failur
   for(i=0;i<4;i++)              /*Clear Memory to some unique Pattern*/
     memval[i] =0xdeadbeef;
   
-  ret = grGet(getval, memcount*sizeof(long), memval );  /*Do the Get*/
+  ret = grGet(getval, memcount*sizeof(FxI32), memval );  /*Do the Get*/
   
   for(i=0;i<memcount;i++)
     /*if pattern still exists, then we have a problem*/
@@ -340,7 +336,7 @@ TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failur
       correct=FXFALSE;
   
   /* if Number of bytes returned is wrong, then we have a problem*/
-  if(ret!=(int)(memcount*sizeof(long))) 
+  if(ret!=(int)(memcount*sizeof(FxI32))) 
     correct=FXFALSE;
   
   if(correct)                   /*print the results*/
diff --git a/glide3x/h5/glide3/tests/test38.c b/glide3x/h5/glide3/tests/test38.c
index dc391b2..cf1cff3 100644
--- a/glide3x/h5/glide3/tests/test38.c
+++ b/glide3x/h5/glide3/tests/test38.c
@@ -39,9 +39,7 @@ static const char name[]    = "test38";
 static const char purpose[] = "Test the guGammaCorrectionRGB(..) function.";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-extern unsigned long hWndMain;
-
-void main( int argc, char **argv) 
+int main( int argc, char **argv)
 {
   char match; 
   char **remArgs;
@@ -65,13 +63,13 @@ void main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -195,6 +193,6 @@ void main( int argc, char **argv)
   
  __errExit:    
   grGlideShutdown();
-  return;
+  return 0;
 }
 
diff --git a/glide3x/h5/glide3/tests/test39.c b/glide3x/h5/glide3/tests/test39.c
index e2654a2..3b66cf5 100644
--- a/glide3x/h5/glide3/tests/test39.c
+++ b/glide3x/h5/glide3/tests/test39.c
@@ -58,7 +58,6 @@ main(int argc, char **argv)
   FxU32                wrange[2];
 
   FxU32
-    multiBaseMode = 0, 
     minTexSize = 1,
     maxTexSize = 256;
 
@@ -78,7 +77,7 @@ main(int argc, char **argv)
     exit(-1);
   }
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) {
+  while((rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
@@ -369,9 +368,6 @@ main(int argc, char **argv)
 
   tlConOutput("Press a key to quit\n");
   while(frames-- && tlOkToRender()) {
-    static float 
-      curOOW = 1.0f;
-
     if (hwconfig == TL_VOODOORUSH) {
       tlGetDimsByConst(resolution,
                        &scrWidth, 
diff --git a/glide3x/h5/glide3/tests/test40.c b/glide3x/h5/glide3/tests/test40.c
index 0ae3a45..835e83f 100644
--- a/glide3x/h5/glide3/tests/test40.c
+++ b/glide3x/h5/glide3/tests/test40.c
@@ -61,7 +61,7 @@ rebuildTextureMap(struct texInfo* texMap,
 static FxBool
 rebuildLodMap(struct texInfo* texMap);
 
-void 
+int 
 main(int argc, char **argv) 
 {
   GrScreenResolution_t 
@@ -82,13 +82,13 @@ main(int argc, char **argv)
     char **remArgs;
     int  rv;
 
-    while(rv = tlGetOpt(argc, argv, "dfnr", &match, &remArgs)) {
+    while((rv = tlGetOpt(argc, argv, "dfnr", &match, &remArgs)) != 0) {
       if (rv == -1) {
         printf("Unrecognized command line argument\n");
         printf("%s %s\n", name, usage);
         printf("Available resolutions:\n%s\n",
                tlGetResolutionList());
-        return;
+        return -1;
       }
 
       switch(match) {
@@ -385,6 +385,7 @@ main(int argc, char **argv)
 
  __errExit:    
   grGlideShutdown();
+  return 0;
 }
 
 static FxBool
diff --git a/glide3x/h5/glide3/tests/test41.c b/glide3x/h5/glide3/tests/test41.c
index 095e7fe..3595263 100644
--- a/glide3x/h5/glide3/tests/test41.c
+++ b/glide3x/h5/glide3/tests/test41.c
@@ -543,7 +543,7 @@ void renderIntoTextures()
 
 
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -553,13 +553,13 @@ void main( int argc, char **argv) {
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrpbtea", &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, "nrpbtea", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
               tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -627,14 +627,14 @@ void main( int argc, char **argv) {
 
   extension = grGetString(GR_EXTENSION);
 
-  if (extstr = strstr(extension, "TEXCHROMA")) {
+  if ((extstr = strstr(extension, "TEXCHROMA")) != NULL) {
     if (!strncmp(extstr, "TEXCHROMA", 9)) {
       grChromaRangeModeExt = grGetProcAddress("grChromaRangeModeExt");
       grChromaRangeExt = grGetProcAddress("grChromaRangeExt");
     }
   }
 
-  if (extstr = strstr(extension, "TEXTUREBUFFER")) {
+  if ((extstr = strstr(extension, "TEXTUREBUFFER")) != NULL) {
     if (!strncmp(extstr, "TEXTUREBUFFER", 13)) {
       grTextureBufferExt = grGetProcAddress("grTextureBufferExt");
       grTextureAuxBufferExt = grGetProcAddress("grTextureAuxBufferExt");
@@ -973,8 +973,6 @@ void main( int argc, char **argv) {
   while ( 1 ) 
   {
     Matrix rotm;
-    static FxBool
-      resetStateP = FXTRUE;
     int i;
     
     MatMakeYRot( rotm, DEG2RAD( y_angle ) );
@@ -1332,5 +1330,6 @@ void main( int argc, char **argv) {
 
   } /* endwhile (1) */
   grGlideShutdown();
+  return 0;
 }
 
diff --git a/glide3x/h5/glide3/tests/test42.c b/glide3x/h5/glide3/tests/test42.c
index b0cfd7e..f99c76a 100644
--- a/glide3x/h5/glide3/tests/test42.c
+++ b/glide3x/h5/glide3/tests/test42.c
@@ -75,7 +75,7 @@ const char *cmodeName[] = {
   "ON      "
 };
 
-void 
+int 
 main(int argc, char **argv) 
 {
   char match; 
@@ -107,13 +107,13 @@ main(int argc, char **argv)
     yBottom;
 
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) {
+  while((rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
       printf("Available resolutions:\n%s\n",
              tlGetResolutionList());
-      return;
+      return -1;
     }
     switch(match) {
     case 'n':
@@ -450,7 +450,7 @@ main(int argc, char **argv)
       cnt = strcspn(filename, ".");
       strncpy(fname, filename, cnt);
       fname[cnt] = 0;
-      sprintf(tmp,"_%d\0", subframe);
+      sprintf(tmp,"_%d", subframe);
       strcat(fname, tmp);
       strcat(fname, filename+cnt);
       if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -511,4 +511,5 @@ main(int argc, char **argv)
     
  __errExit:    
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test43.c b/glide3x/h5/glide3/tests/test43.c
index 725aa32..73bb0e0 100644
--- a/glide3x/h5/glide3/tests/test43.c
+++ b/glide3x/h5/glide3/tests/test43.c
@@ -46,7 +46,7 @@ const char *mName[] = {
   "ON "
 };
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -70,13 +70,13 @@ void main( int argc, char **argv) {
   assert( hwconfig = tlVoodooType() );
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrdp", &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, "nrdp", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
               tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -222,7 +222,7 @@ void main( int argc, char **argv) {
   
  __errExit:    
   grGlideShutdown();
-  return;
+  return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test44.c b/glide3x/h5/glide3/tests/test44.c
index e9e9f84..018213a 100644
--- a/glide3x/h5/glide3/tests/test44.c
+++ b/glide3x/h5/glide3/tests/test44.c
@@ -40,11 +40,11 @@ static const char name[]    = "test44";
 static const char purpose[] = "mipmap modes with TXS file";
 static const char usage[]   = "-n <frames> -r <res> -t <texturename> -p <pixel format>";
 
-char *txname  = "glide.txs";
+const char *txname  = "glide.txs";
 
 typedef enum { DISABLE, NEAREST, TRILINEAR } MipMapMode;
 
-char *texfmt[]={
+const char *texfmt[]={
          "rgb332",                              // TEXFMT_RGB_332 
          "yiq",                                 // TEXFMT_YIQ_422
          "a8",                                  // TEXFMT_A_8
@@ -75,7 +75,7 @@ char *texfmt[]={
          NULL
 };
 
-char* palfmt[]={
+const char* palfmt[]={
   "ncc0",
   "ncc1",
   "palette",
@@ -83,7 +83,7 @@ char* palfmt[]={
   NULL
 };
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -112,13 +112,13 @@ void main( int argc, char **argv) {
       }
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrtp", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrtp", &match, &remArgs)) != 0) {
       if ( rv == -1 ) {
         printf( "Unrecognized command line argument\n" );
         printf( "%s %s\n", name, usage );
         printf( "Available resolutions:\n%s\n",
                 tlGetResolutionList() );
-        return;
+        return -1;
       }
       switch( match ) 
         {
@@ -426,7 +426,7 @@ void main( int argc, char **argv) {
     
  __errExit:    
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/h5/glide3/tests/test45.c b/glide3x/h5/glide3/tests/test45.c
index 2584833..e234c1e 100644
--- a/glide3x/h5/glide3/tests/test45.c
+++ b/glide3x/h5/glide3/tests/test45.c
@@ -254,7 +254,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void 
+int 
 main(int argc, char **argv) 
 {
   char match; 
@@ -285,13 +285,13 @@ main(int argc, char **argv)
   FxI32 mode = 0;
 
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) {
+  while((rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
       printf("Available resolutions:\n%s\n",
              tlGetResolutionList());
-      return;
+      return -1;
     }
     switch(match) {
     case 'n':
@@ -639,7 +639,7 @@ main(int argc, char **argv)
       cnt = strcspn(filename, ".");
       strncpy(fname, filename, cnt);
       fname[cnt] = 0;
-      sprintf(tmp,"_%d\0", subframe);
+      sprintf(tmp,"_%d", subframe);
       strcat(fname, tmp);
       strcat(fname, filename+cnt);
       if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -733,4 +733,5 @@ main(int argc, char **argv)
     
  __errExit:    
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test46.c b/glide3x/h5/glide3/tests/test46.c
index 3d64e62..8689fb7 100644
--- a/glide3x/h5/glide3/tests/test46.c
+++ b/glide3x/h5/glide3/tests/test46.c
@@ -44,7 +44,7 @@ const char *cmodeName[] = {
   "ON      "
 };
 
-void 
+int 
 main(int argc, char **argv) 
 {
   char match; 
@@ -73,13 +73,13 @@ main(int argc, char **argv)
     yBottom;
 
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) {
+  while((rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
       printf("Available resolutions:\n%s\n",
              tlGetResolutionList());
-      return;
+      return -1;
     }
     switch(match) {
     case 'n':
@@ -283,7 +283,7 @@ main(int argc, char **argv)
       cnt = strcspn(filename, ".");
       strncpy(fname, filename, cnt);
       fname[cnt] = 0;
-      sprintf(tmp,"_%d\0", subframe);
+      sprintf(tmp,"_%d", subframe);
       strcat(fname, tmp);
       strcat(fname, filename+cnt);
       if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -329,4 +329,5 @@ main(int argc, char **argv)
     
  __errExit:    
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test47.c b/glide3x/h5/glide3/tests/test47.c
index 28d03ef..3dcd7cc 100644
--- a/glide3x/h5/glide3/tests/test47.c
+++ b/glide3x/h5/glide3/tests/test47.c
@@ -120,7 +120,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void 
+int 
 main(int argc, char **argv) 
 {
   char match; 
@@ -157,13 +157,13 @@ main(int argc, char **argv)
   GrProc AlphaBlendFunctionExt = grGetProcAddress("grAlphaBlendFunctionExt");
 
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) {
+  while((rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
       printf("Available resolutions:\n%s\n",
              tlGetResolutionList());
-      return;
+      return -1;
     }
     switch(match) {
     case 'n':
@@ -492,7 +492,7 @@ main(int argc, char **argv)
       cnt = strcspn(filename, ".");
       strncpy(fname, filename, cnt);
       fname[cnt] = 0;
-      sprintf(tmp,"_%d\0", subframe);
+      sprintf(tmp,"_%d", subframe);
       strcat(fname, tmp);
       strcat(fname, filename+cnt);
       if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -566,4 +566,5 @@ main(int argc, char **argv)
     
  __errExit:    
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test48.c b/glide3x/h5/glide3/tests/test48.c
index ecb53dc..4b03448 100644
--- a/glide3x/h5/glide3/tests/test48.c
+++ b/glide3x/h5/glide3/tests/test48.c
@@ -59,7 +59,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void 
+int 
 main(int argc, char **argv) 
 {
   char match; 
@@ -95,13 +95,13 @@ main(int argc, char **argv)
     yBottom;
 
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) {
+  while((rv = tlGetOpt(argc, argv, "nrdxp", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
       printf("Available resolutions:\n%s\n",
              tlGetResolutionList());
-      return;
+      return -1;
     }
     switch(match) {
     case 'n':
@@ -356,7 +356,7 @@ main(int argc, char **argv)
       cnt = strcspn(filename, ".");
       strncpy(fname, filename, cnt);
       fname[cnt] = 0;
-      sprintf(tmp,"_%d\0", subframe);
+      sprintf(tmp,"_%d", subframe);
       strcat(fname, tmp);
       strcat(fname, filename+cnt);
       if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -401,4 +401,5 @@ main(int argc, char **argv)
     
  __errExit:    
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/h5/glide3/tests/test49.c b/glide3x/h5/glide3/tests/test49.c
index e75d055..8ff391b 100644
--- a/glide3x/h5/glide3/tests/test49.c
+++ b/glide3x/h5/glide3/tests/test49.c
@@ -162,7 +162,7 @@ static const char name[]    = "test49";
 static const char purpose[] = "renders a series of triangles with different stenciling";
 static const char usage[]   = "-n <frames> -r <res> -d <filename> -p <pixel format>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -186,13 +186,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrdp", &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, "nrdp", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -434,5 +434,5 @@ main( int argc, char **argv)
   
  __errExit:   
   grGlideShutdown();
-  return;
+  return 0;
 }
diff --git a/glide3x/h5/glide3/tests/tlib.c b/glide3x/h5/glide3/tests/tlib.c
index 39c19b1..e4329de 100644
--- a/glide3x/h5/glide3/tests/tlib.c
+++ b/glide3x/h5/glide3/tests/tlib.c
@@ -747,14 +747,15 @@ int tlConOutput( const char *fmt, ... )
 #ifndef TLIB_SMALL_FONTS
         {
           char* temp = buffer;
-          
+
           while(*temp != '\0') {
-            *temp = toupper(*temp);
+            if (*temp >= 'a' && *temp <= 'z')
+                *temp -= ('a'-'A');
             temp++;
           }
         }
 #endif
-        
+
         c = buffer;
 
         /* update console grid */
diff --git a/glide3x/sst1/glide3/tests/display.c b/glide3x/sst1/glide3/tests/display.c
index ff5f9cd..ca0f5b3 100644
--- a/glide3x/sst1/glide3/tests/display.c
+++ b/glide3x/sst1/glide3/tests/display.c
@@ -32,11 +32,6 @@ static const char name[]    = "display";
 static const char purpose[] = "display a 16 bit frame buffer (565 format) dump out";
 static const char usage[]   = "-n <frames> -r <res> -s srcimage -t testimage";
 
-static const char *renderBufferString[] = {
-    "GR_BUFFER_FRONTBUFFER",
-    "GR_BUFFER_BACKBUFFER "
-};
-
 static const char *sourceFormatString[] = {
     "GR_LFB_SRC_FMT_565       ",
     "GR_LFB_SRC_FMT_555       ",
@@ -61,7 +56,8 @@ static void imageConvert( void *dst,
                           GrLfbSrcFmt_t format,
                           FxU32 *bpp );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv)
+{
     char match; 
     char **remArgs;
     int  rv;
@@ -77,7 +73,7 @@ void main( int argc, char **argv) {
     LFB_Img src, dst, diff;
     FxBool txtdisplay = FXTRUE;
 
-    void *image;
+    void *image = NULL;
     FxU32 bpp;
 
     GrLfbSrcFmt_t sourceFormat;
@@ -89,13 +85,13 @@ void main( int argc, char **argv) {
     dstfname[0] = 0;
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrst", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrst", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -161,8 +157,8 @@ void main( int argc, char **argv) {
         /* readng the LFB file header */
         fread(&src.signature, 4, 1, fp);
         if (src.signature != IMAGE_SRLE) {
-          printf("%s file type incorrect\n");
-          return;
+          printf("%s file type incorrect\n", srcfname);
+          return -1;
         }
         fread(&src.width, 2, 1, fp);
         fread(&src.height, 2, 1, fp);
@@ -195,8 +191,8 @@ void main( int argc, char **argv) {
         /* readng the LFB file header */
         fread(&dst.signature, 4, 1, fp);
         if (dst.signature != IMAGE_SRLE) {
-          printf("%s file type incorrect\n");
-          return;
+          printf("%s file type incorrect\n", dstfname);
+          return -1;
         }
         fread(&dst.width, 2, 1, fp);
         fread(&dst.height, 2, 1, fp);
@@ -214,6 +210,7 @@ void main( int argc, char **argv) {
       }
     }
 
+    diff.data = NULL;
     diff.width = 0;
     diff.height = 0;
         
@@ -259,7 +256,7 @@ void main( int argc, char **argv) {
     }
     if ( ( imageWidth > (FxU32)scrWidth ) ||
          ( imageHeight > (FxU32)scrHeight ) )
-        return;
+        return -1;
 
     while( frames-- ) {
 
@@ -351,7 +348,7 @@ void main( int argc, char **argv) {
     if (srcfname[0] && dstfname[0])
       free(diff.data);
     free(image);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/sbench.c b/glide3x/sst1/glide3/tests/sbench.c
index de71ffa..4414dc2 100644
--- a/glide3x/sst1/glide3/tests/sbench.c
+++ b/glide3x/sst1/glide3/tests/sbench.c
@@ -27,7 +27,7 @@ static const char name[]    = "sbench";
 static const char purpose[] = "benchmark grDrawVertexArray for gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename> -l <primitive type> -v <vertex array size> -t <triangel size> -p -a";
 
-char *Usage(void)
+void Usage(void)
 {
     printf ("       -l <type> => primitive type\n");
     printf ("                 => 0 point\n");
@@ -41,7 +41,6 @@ char *Usage(void)
     printf ("       -t <size> => triangle size\n");
     printf ("       -p        => packed color\n");
     printf ("       -a        => antialiased\n");
-    return NULL;
 }
 
 void
@@ -65,7 +64,7 @@ setVertexXyzRgbaSt( FxFloat *v, FxFloat x, FxFloat y, FxFloat z,
     *(v+GR_VERTEX_TOW_TMU1_OFFSET) = t * 1.f;
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -105,14 +104,14 @@ main( int argc, char **argv)
   FxU32 wrange[2];
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
       Usage();
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -427,10 +426,5 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
-
-
-
-
-
diff --git a/glide3x/sst1/glide3/tests/test00.c b/glide3x/sst1/glide3/tests/test00.c
index 5103ff3..71b15a8 100644
--- a/glide3x/sst1/glide3/tests/test00.c
+++ b/glide3x/sst1/glide3/tests/test00.c
@@ -23,7 +23,7 @@ static const char name[]    = "test00";
 static const char purpose[] = "Clear screen to blue";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -43,13 +43,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -118,6 +118,6 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
diff --git a/glide3x/sst1/glide3/tests/test01.c b/glide3x/sst1/glide3/tests/test01.c
index e32b53f..18f38f4 100644
--- a/glide3x/sst1/glide3/tests/test01.c
+++ b/glide3x/sst1/glide3/tests/test01.c
@@ -24,7 +24,7 @@ static const char name[]    = "test01";
 static const char purpose[] = "draws a diagonal line of points from top-left to bottom-right";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void
+int
 main( int argc, char **argv) {
   char match; 
   char **remArgs;
@@ -43,13 +43,13 @@ main( int argc, char **argv) {
   assert( hwconfig = tlVoodooType() );
   
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -138,7 +138,7 @@ main( int argc, char **argv) {
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test02.c b/glide3x/sst1/glide3/tests/test02.c
index 2d0f21d..128a369 100644
--- a/glide3x/sst1/glide3/tests/test02.c
+++ b/glide3x/sst1/glide3/tests/test02.c
@@ -24,7 +24,7 @@ static const char name[]    = "test02";
 static const char purpose[] = "draws a parabolic envelope of lines";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -141,7 +141,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test03.c b/glide3x/sst1/glide3/tests/test03.c
index 04b9b74..e6f4827 100644
--- a/glide3x/sst1/glide3/tests/test03.c
+++ b/glide3x/sst1/glide3/tests/test03.c
@@ -24,7 +24,7 @@ static const char name[]    = "test03";
 static const char purpose[] = "draws gouraud shaded lines";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -136,7 +136,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test04.c b/glide3x/sst1/glide3/tests/test04.c
index 2c8aec4..9e918bb 100644
--- a/glide3x/sst1/glide3/tests/test04.c
+++ b/glide3x/sst1/glide3/tests/test04.c
@@ -24,7 +24,7 @@ static const char name[]    = "test04";
 static const char purpose[] = "draws gouraud shaded triangle";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -140,7 +140,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test05.c b/glide3x/sst1/glide3/tests/test05.c
index cbcd4d8..239bbcb 100644
--- a/glide3x/sst1/glide3/tests/test05.c
+++ b/glide3x/sst1/glide3/tests/test05.c
@@ -24,7 +24,7 @@ static const char name[]    = "test05";
 static const char purpose[] = "renders two interpenetrating triangles with z-buffering";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void 
+int 
 main( int argc, char **argv) 
 {
   char match; 
@@ -44,13 +44,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -174,7 +174,7 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test06.c b/glide3x/sst1/glide3/tests/test06.c
index 9b7ba81..ec62abf 100644
--- a/glide3x/sst1/glide3/tests/test06.c
+++ b/glide3x/sst1/glide3/tests/test06.c
@@ -24,7 +24,7 @@ static const char name[]    = "test06";
 static const char purpose[] = "renders two interpenetrating triangles with w-buffering";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -172,7 +172,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test07.c b/glide3x/sst1/glide3/tests/test07.c
index aefb78e..bfec93f 100644
--- a/glide3x/sst1/glide3/tests/test07.c
+++ b/glide3x/sst1/glide3/tests/test07.c
@@ -24,7 +24,7 @@ static const char name[]    = "test07";
 static const char purpose[] = "alpha blending test";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -41,13 +41,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -153,7 +153,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test08.c b/glide3x/sst1/glide3/tests/test08.c
index c08c3b6..48f5b46 100644
--- a/glide3x/sst1/glide3/tests/test08.c
+++ b/glide3x/sst1/glide3/tests/test08.c
@@ -24,7 +24,7 @@ static const char name[]    = "test08";
 static const char purpose[] = "fogging";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -43,13 +43,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -158,7 +158,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test09.c b/glide3x/sst1/glide3/tests/test09.c
index 078c4e0..e673448 100644
--- a/glide3x/sst1/glide3/tests/test09.c
+++ b/glide3x/sst1/glide3/tests/test09.c
@@ -26,7 +26,7 @@ static const char purpose[] = "chromakey and chromarange - render a red and blue
                               " triangle but chromakey one out";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -48,13 +48,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -190,7 +190,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -230,7 +230,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test10.c b/glide3x/sst1/glide3/tests/test10.c
index 59f9ef8..c268434 100644
--- a/glide3x/sst1/glide3/tests/test10.c
+++ b/glide3x/sst1/glide3/tests/test10.c
@@ -26,7 +26,7 @@ static const char purpose[] = "culling test - render a red and blue"
                               ", blue negative";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -46,13 +46,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -154,7 +154,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -187,7 +187,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test11.c b/glide3x/sst1/glide3/tests/test11.c
index b2a4d74..47f1ee7 100644
--- a/glide3x/sst1/glide3/tests/test11.c
+++ b/glide3x/sst1/glide3/tests/test11.c
@@ -27,7 +27,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 static int rRandom(int s, int e);
 static unsigned int iRandom (unsigned int maxr);
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -47,13 +47,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return 0;
         }
         switch( match ) {
         case 'n':
@@ -138,7 +138,7 @@ void main( int argc, char **argv) {
 
         if ( tlScaleX(1.0f) < 64.0 ||
              tlScaleY(1.0f) < 64.0 )
-            return;
+            return -1;
         
         /* generate random start position */
         startX = (int)rRandom( 64, (int)tlScaleX(1.0f) - 65 );
@@ -213,7 +213,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/sst1/glide3/tests/test12.c b/glide3x/sst1/glide3/tests/test12.c
index f7e54e8..18013f9 100644
--- a/glide3x/sst1/glide3/tests/test12.c
+++ b/glide3x/sst1/glide3/tests/test12.c
@@ -59,7 +59,7 @@ static const char *pixPipeString[] = {
   "PIXELPIPE ENABLED "
 };
 
-void
+int
 main( int argc, char **argv)
 {
   char match; 
@@ -87,13 +87,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -109,7 +109,7 @@ main( int argc, char **argv)
 
   if ( resolution == GR_RESOLUTION_NONE ) {
     tlErrorMessage( "Error!: Frontbuffer rendering not supported in a window\n" );
-    return;
+    return -1;
   }
 
   tlSetScreen( scrWidth, scrHeight );
@@ -326,7 +326,7 @@ main( int argc, char **argv)
   }
     
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/sst1/glide3/tests/test13.c b/glide3x/sst1/glide3/tests/test13.c
index 0b67ef7..a0483fe 100644
--- a/glide3x/sst1/glide3/tests/test13.c
+++ b/glide3x/sst1/glide3/tests/test13.c
@@ -25,7 +25,7 @@ static const char name[]    = "test13";
 static const char purpose[] = "iterated alpha test - blue triangle fades towards one vertex\n";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -160,5 +160,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/sst1/glide3/tests/test14.c b/glide3x/sst1/glide3/tests/test14.c
index ccf1bf8..fc1f773 100644
--- a/glide3x/sst1/glide3/tests/test14.c
+++ b/glide3x/sst1/glide3/tests/test14.c
@@ -25,7 +25,7 @@ static const char purpose[] = "depth bias test: vary depth bias \n"
                                "over time with two interpenetrating triangles";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -44,13 +44,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -171,5 +171,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/sst1/glide3/tests/test15.c b/glide3x/sst1/glide3/tests/test15.c
index 2906195..cc5c677 100644
--- a/glide3x/sst1/glide3/tests/test15.c
+++ b/glide3x/sst1/glide3/tests/test15.c
@@ -24,7 +24,7 @@ static const char name[]    = "test15";
 static const char purpose[] = "clip rectangle testing - clip rectangle travels around screen";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -42,13 +42,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -204,5 +204,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/sst1/glide3/tests/test16.c b/glide3x/sst1/glide3/tests/test16.c
index 04a4ba4..2faf1af 100644
--- a/glide3x/sst1/glide3/tests/test16.c
+++ b/glide3x/sst1/glide3/tests/test16.c
@@ -25,7 +25,7 @@ static const char name[]    = "test16";
 static const char purpose[] = "test grShamelessPlug and grSplash";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -43,13 +43,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -191,5 +191,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/sst1/glide3/tests/test17.c b/glide3x/sst1/glide3/tests/test17.c
index e635a5c..d4bd71a 100644
--- a/glide3x/sst1/glide3/tests/test17.c
+++ b/glide3x/sst1/glide3/tests/test17.c
@@ -45,7 +45,7 @@ const char *textureModeNames[] = {
     "(ITRGB * TEXTURE)+WHITE SPECULAR"
 };
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -62,13 +62,13 @@ void main( int argc, char **argv) {
     FxU32                zrange[2];
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -285,7 +285,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -313,5 +313,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/sst1/glide3/tests/test18.c b/glide3x/sst1/glide3/tests/test18.c
index 7e7b87b..9de35db 100644
--- a/glide3x/sst1/glide3/tests/test18.c
+++ b/glide3x/sst1/glide3/tests/test18.c
@@ -25,7 +25,7 @@ static const char name[]    = "test18";
 static const char purpose[] = "alpha texture test";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -45,13 +45,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -246,5 +246,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/sst1/glide3/tests/test19.c b/glide3x/sst1/glide3/tests/test19.c
index 680ee6a..464bef0 100644
--- a/glide3x/sst1/glide3/tests/test19.c
+++ b/glide3x/sst1/glide3/tests/test19.c
@@ -52,7 +52,7 @@ static int loadTexture( const char *filename,
                         void *table );
 static GrTexTable_t texTableType( GrTextureFormat_t format );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -75,13 +75,13 @@ void main( int argc, char **argv) {
 
     strcpy(texfilename, "miro.3df");
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrdt", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nrdt", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -296,7 +296,7 @@ void main( int argc, char **argv) {
           cnt = strcspn(filename, ".");
           strncpy(fname, filename, cnt);
           fname[cnt] = 0;
-          sprintf(tmp,"_%d\0", subframe);
+          sprintf(tmp,"_%d", subframe);
           strcat(fname, tmp);
           strcat(fname, filename+cnt);
           if (!tlScreenDump(fname, (FxU16)scrWidth, (FxU16)scrHeight))
@@ -350,7 +350,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test20.c b/glide3x/sst1/glide3/tests/test20.c
index ce816cb..a972717 100644
--- a/glide3x/sst1/glide3/tests/test20.c
+++ b/glide3x/sst1/glide3/tests/test20.c
@@ -27,7 +27,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 typedef enum { DISABLE, NEAREST, TRILINEAR } MipMapMode;
 
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -49,13 +49,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -304,7 +304,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test21.c b/glide3x/sst1/glide3/tests/test21.c
index 4086da5..ddff06d 100644
--- a/glide3x/sst1/glide3/tests/test21.c
+++ b/glide3x/sst1/glide3/tests/test21.c
@@ -26,7 +26,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 
 typedef enum { LIGHTMAP, SPECULAR, DETAIL } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -54,13 +54,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -356,7 +356,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test22.c b/glide3x/sst1/glide3/tests/test22.c
index 75cebd0..1b6f8d4 100644
--- a/glide3x/sst1/glide3/tests/test22.c
+++ b/glide3x/sst1/glide3/tests/test22.c
@@ -24,7 +24,7 @@ static const char name[]    = "test22";
 static const char purpose[] = "fog with multi-pass texturing";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -295,7 +295,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test23.c b/glide3x/sst1/glide3/tests/test23.c
index cdc8615..5f4f116 100644
--- a/glide3x/sst1/glide3/tests/test23.c
+++ b/glide3x/sst1/glide3/tests/test23.c
@@ -29,7 +29,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -55,13 +55,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -233,7 +233,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/sst1/glide3/tests/test24.c b/glide3x/sst1/glide3/tests/test24.c
index 0b3e3a0..51c59a9 100644
--- a/glide3x/sst1/glide3/tests/test24.c
+++ b/glide3x/sst1/glide3/tests/test24.c
@@ -31,7 +31,7 @@ static unsigned int iRandom (unsigned int maxr);
 
 typedef enum { NORMAL, ANTIALIASED } Mode;
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -56,13 +56,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -238,7 +238,7 @@ void main( int argc, char **argv) {
     
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/sst1/glide3/tests/test25.c b/glide3x/sst1/glide3/tests/test25.c
index ec08eca..736cfa0 100644
--- a/glide3x/sst1/glide3/tests/test25.c
+++ b/glide3x/sst1/glide3/tests/test25.c
@@ -154,7 +154,7 @@ static int screenFulls[] = {
 #define NFRAMES 20
 #define NVERTS 3
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -177,7 +177,7 @@ void main( int argc, char **argv) {
     y_angle = 0.0f;             /* rotation amount */
     
   int
-    firstTime;                  /* Used for performance calculations */
+    firstTime = 1;              /* Used for performance calculations */
 
   FxBool
     plugging = FXFALSE,         /* Show shameless plug */
@@ -198,7 +198,7 @@ void main( int argc, char **argv) {
     swapDelay = 1,              /* Arg to grBufferSwap */
     trisDrawn,                  /* # triangles drawn */
     trisProcessed,              /* # triangles through pipeline */
-    lastFrame,                  /* Number of last frame we did perf stats */
+    lastFrame = 0,              /* Number of last frame we did perf stats */
     frameNum = 0L;              /* id of each frame drawn */
     
   GrCullMode_t
@@ -233,13 +233,13 @@ void main( int argc, char **argv) {
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrbtea", &match, &remArgs ) ) {
+  while ((rv = tlGetOpt(argc, argv, "nrbtea", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -876,4 +876,5 @@ void main( int argc, char **argv) {
       break;
   }
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/sst1/glide3/tests/test26.c b/glide3x/sst1/glide3/tests/test26.c
index 9503875..d81bd16 100644
--- a/glide3x/sst1/glide3/tests/test26.c
+++ b/glide3x/sst1/glide3/tests/test26.c
@@ -24,11 +24,6 @@ static const char name[]    = "test26";
 static const char purpose[] = "tests grLfbWriteRegion, and grLfbReadRegion";
 static const char usage[]   = "-n <frames> -r <res>";
 
-static const char *renderBufferString[] = {
-    "GR_BUFFER_FRONTBUFFER",
-    "GR_BUFFER_BACKBUFFER "
-};
-
 static const char *sourceFormatString[] = {
     "GR_LFB_SRC_FMT_565       ",
     "GR_LFB_SRC_FMT_555       ",
@@ -53,7 +48,7 @@ static void imageConvert( void *dst,
                           GrLfbSrcFmt_t format,
                           FxU32 *bpp );
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -78,13 +73,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -144,7 +139,7 @@ void main( int argc, char **argv) {
               (int) scrWidth, (int) scrHeight);
 
       tlErrorMessage(errMsg);
-      return;
+      return -1;
     }
 
     sourceFormat = GR_LFB_SRC_FMT_565;
@@ -228,7 +223,7 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test27.c b/glide3x/sst1/glide3/tests/test27.c
index 28485f7..0651f6d 100644
--- a/glide3x/sst1/glide3/tests/test27.c
+++ b/glide3x/sst1/glide3/tests/test27.c
@@ -25,7 +25,7 @@ static const char usage[]   = "-n <frames> -r <res>";
 static int rRandom(int s, int e);
 static unsigned int iRandom (unsigned int maxr);
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -44,13 +44,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "Nnr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "Nnr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -157,7 +157,7 @@ doNothing:
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 static unsigned long randx = 1;
diff --git a/glide3x/sst1/glide3/tests/test28.c b/glide3x/sst1/glide3/tests/test28.c
index fd8fd43..f92c9e0 100644
--- a/glide3x/sst1/glide3/tests/test28.c
+++ b/glide3x/sst1/glide3/tests/test28.c
@@ -79,7 +79,7 @@ static const char name[]    = "test28";
 static const char purpose[] = "planar polygon test";
 static const char usage[]   = "-n <frames> -r <res>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -101,13 +101,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nr", &match, &remArgs ) ) {
+    while ((rv = tlGetOpt(argc, argv, "nr", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -215,5 +215,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/sst1/glide3/tests/test29.c b/glide3x/sst1/glide3/tests/test29.c
index 8ea6aa1..3a39a1d 100644
--- a/glide3x/sst1/glide3/tests/test29.c
+++ b/glide3x/sst1/glide3/tests/test29.c
@@ -30,7 +30,7 @@ static const char usage[]   = "\t-d <screen dump filename>\n"
                               "\t-s [force single texturing]\n";
                               
 
-void main(int argc, char **argv) {
+int main(int argc, char **argv) {
   char match; 
   char **remArgs;
   int  rv;
@@ -58,13 +58,13 @@ void main(int argc, char **argv) {
   assert(hwconfig = tlVoodooType());
 
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) {
+  while ((rv = tlGetOpt(argc, argv, "dlmnprs", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
       printf("Available resolutions:\n%s\n",
               tlGetResolutionList());
-      return;
+      return -1;
     }
     switch(match) {
     case 'd':
@@ -358,4 +358,5 @@ void main(int argc, char **argv) {
 
 __errExit:    
   grGlideShutdown();
+  return 0;
 }
diff --git a/glide3x/sst1/glide3/tests/test30.c b/glide3x/sst1/glide3/tests/test30.c
index 9e837a2..2ee472f 100644
--- a/glide3x/sst1/glide3/tests/test30.c
+++ b/glide3x/sst1/glide3/tests/test30.c
@@ -129,7 +129,7 @@ main(int argc, char **argv) {
     char **remArgs;
     int  rv;
 
-    while(rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) {
+    while((rv = tlGetOpt(argc, argv, "ndv", &match, &remArgs)) != 0) {
       if(rv == -1) {
         printf("Unrecognized command line argument\n");
         printf("%s %s\n", name, usage);
diff --git a/glide3x/sst1/glide3/tests/test31.c b/glide3x/sst1/glide3/tests/test31.c
index 1d0cda7..340381c 100644
--- a/glide3x/sst1/glide3/tests/test31.c
+++ b/glide3x/sst1/glide3/tests/test31.c
@@ -46,7 +46,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -80,13 +80,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -379,7 +379,7 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/sst1/glide3/tests/test32.c b/glide3x/sst1/glide3/tests/test32.c
index 0f9daf2..58908c1 100644
--- a/glide3x/sst1/glide3/tests/test32.c
+++ b/glide3x/sst1/glide3/tests/test32.c
@@ -46,7 +46,7 @@ static void doHelp( void ) {
   tlConClear();
 }
 
-void
+int
 main( int argc, char **argv)
 {
   char
@@ -86,13 +86,13 @@ main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, args, &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, args, &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return -1;
     }
     switch( match ) {
     case 'n':
@@ -493,7 +493,7 @@ main( int argc, char **argv)
   }
   
   grGlideShutdown();
-  return;
+  return 0;
 } /* main */
 
 
diff --git a/glide3x/sst1/glide3/tests/test33.c b/glide3x/sst1/glide3/tests/test33.c
index 4ba4e6b..d4d8b04 100644
--- a/glide3x/sst1/glide3/tests/test33.c
+++ b/glide3x/sst1/glide3/tests/test33.c
@@ -27,7 +27,7 @@ static const char name[]    = "test33";
 static const char purpose[] = "draws gouraud shaded triangle strip and fan with grDrawVertexArray(GR_TRIANGLE_STRIP(FAN)_CONTINUE";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -51,13 +51,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            goto _quit;
         }
         switch( match ) {
         case 'n':
@@ -181,15 +181,15 @@ void main( int argc, char **argv) {
               printf( "Cannot open %s\n", filename);
             scrgrab = FXFALSE;
           }
-          if ( tlKbHit() ) goto exit;
+          if ( tlKbHit() ) goto _quit;
         }
       }
     }
     
     tlSleep( 1 );
-exit:
+_quit:
     grGlideShutdown();
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test34.c b/glide3x/sst1/glide3/tests/test34.c
index ec23e9a..1be0ace 100644
--- a/glide3x/sst1/glide3/tests/test34.c
+++ b/glide3x/sst1/glide3/tests/test34.c
@@ -35,7 +35,7 @@ static const char name[]    = "test34";
 static const char purpose[] = "fogging with table/fogcoord";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -65,13 +65,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -120,7 +120,7 @@ void main( int argc, char **argv) {
     if (!extstr) {
       printf( "FOGCOORD is not supported in %s\n", grGetString(GR_HARDWARE) );
       grGlideShutdown();
-      return;
+      return -1;
     }
     if (!strncmp(extstr, "FOGCOORD", 8)) {
       fogext = FXTRUE;
@@ -297,7 +297,7 @@ void main( int argc, char **argv) {
 
     grGlideShutdown();
     free(fogtable);
-    return;
+    return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test35.c b/glide3x/sst1/glide3/tests/test35.c
index 24cc2b3..34718eb 100644
--- a/glide3x/sst1/glide3/tests/test35.c
+++ b/glide3x/sst1/glide3/tests/test35.c
@@ -24,7 +24,7 @@ static const char name[]    = "test35";
 static const char purpose[] = "texture chromarange";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
     char match; 
     char **remArgs;
     int  rv;
@@ -35,7 +35,6 @@ void main( int argc, char **argv) {
     int frames                      = -1;
     FxBool               scrgrab = FXFALSE;
     char                 filename[256];
-    int                  ftsize = 0;
 
     TlTexture  baseTexture;
     unsigned long baseTextureAddr;
@@ -55,13 +54,13 @@ void main( int argc, char **argv) {
     assert( hwconfig = tlVoodooType() );
 
     /* Process Command Line Arguments */
-    while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+    while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
         if ( rv == -1 ) {
             printf( "Unrecognized command line argument\n" );
             printf( "%s %s\n", name, usage );
             printf( "Available resolutions:\n%s\n",
                     tlGetResolutionList() );
-            return;
+            return -1;
         }
         switch( match ) {
         case 'n':
@@ -125,7 +124,7 @@ void main( int argc, char **argv) {
       */
       extension = grGetString(GR_EXTENSION);
 
-      if (extstr = strstr(extension, "CHROMARANGE")) {
+      if ((extstr = strstr(extension, "CHROMARANGE")) != NULL) {
         if (!strncmp(extstr, "CHROMARANGE", 11)) {
           grTexChromaModeExt = grGetProcAddress("grTexChromaModeExt");
           grTexChromaRangeExt = grGetProcAddress("grTexChromaRangeExt");
@@ -304,5 +303,5 @@ void main( int argc, char **argv) {
     }
     
     grGlideShutdown();
-    return;
+    return 0;
 }
diff --git a/glide3x/sst1/glide3/tests/test36.c b/glide3x/sst1/glide3/tests/test36.c
index 2873f16..b2c7e48 100644
--- a/glide3x/sst1/glide3/tests/test36.c
+++ b/glide3x/sst1/glide3/tests/test36.c
@@ -17,8 +17,6 @@
 #include "tlib.h"
 
 int hwconfig;
-static const char *version;
-static const char *extension;
 
 static const char name[]    = "test36";
 static const char purpose[] = "screen resolutions";
@@ -26,7 +24,7 @@ static const char usage[]   = "-p show passed, -n no progress";
 
 static const char status[]  = "-\\|/";
 
-void main( int argc, char **argv) {
+int main( int argc, char **argv) {
         FxBool bShowPassed = FXFALSE;
         FxBool bNoProgress = FXFALSE;
         GrResolution resTemplate;
@@ -103,7 +101,7 @@ void main( int argc, char **argv) {
 
         printf ( "Press any key.\n" );
         tlGetCH ();
-        return;
+        return 0;
 }
 
 
diff --git a/glide3x/sst1/glide3/tests/test37.c b/glide3x/sst1/glide3/tests/test37.c
index 7fe3c12..2500e2f 100644
--- a/glide3x/sst1/glide3/tests/test37.c
+++ b/glide3x/sst1/glide3/tests/test37.c
@@ -50,24 +50,20 @@
 #define CORRECT_GR_VIEWPORT_WIDTH 640
 #define CORRECT_GR_VIEWPORT_HEIGHT 480
 
-void TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failures);
+void TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures);
 void TestGetString(char * getvalstr, int getval, int * failures);
 
 int hwconfig;
-static const char *version;
-static const char *extension;
 
-extern unsigned long hWndMain;
-
-void 
+int 
 main( int argc, char **argv) 
 {
   GrScreenResolution_t resolution = GR_RESOLUTION_640x480;
   float                scrWidth   = 640.0f;
   float                scrHeight  = 480.0f;
-  long val4[4];
-  long * histbuffer;
-  long histsize;
+  FxI32 val4[4];
+  FxI32 * histbuffer;
+  FxI32 histsize;
   const char * str;
   int ret;
   int i;
@@ -83,7 +79,7 @@ main( int argc, char **argv)
   /* Process Command Line Arguments */
   tlSetScreen( scrWidth, scrHeight );
   
-  version = grGetString( GR_VERSION );
+  str = grGetString( GR_VERSION );
   
   printf("Test 37 - grGet() Stress Test. All output goes to the Console.\n\n");
   tlGetCH ();
@@ -245,10 +241,10 @@ main( int argc, char **argv)
   ret = grGet(GR_NUM_SWAP_HISTORY_BUFFER, sizeof(histsize), &histsize );
   
   if(ret==sizeof(histsize)) {
-    histbuffer = malloc(histsize*sizeof(long));
+    histbuffer = malloc(histsize*sizeof(FxI32));
     
-    ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(long), histbuffer );
-    if(ret==(int)(histsize*sizeof(long)))
+    ret = grGet(GR_SWAP_HISTORY, histsize*sizeof(FxI32), histbuffer );
+    if(ret==(int)(histsize*sizeof(FxI32)))
       printf("Success(%d) - ",ret);
     else {
       printf("Failed (%d) - ", ret);
@@ -260,7 +256,7 @@ main( int argc, char **argv)
     for(i=0;i<histsize;i++) {
       printf("%d ", histbuffer[i]);
     }
-    printf("\n", histbuffer[i]);
+    printf("\n");
     free(histbuffer);
   } else {
     printf("GR_NUM_SWAP_HISTORY_BUFFER failed, so unable to call GR_SWAP_HISTORY\n");   
@@ -316,12 +312,12 @@ main( int argc, char **argv)
  __errExit:    
   grGlideShutdown();
   
-  return;
+  return 0;
 } /* main */
 
 
 void
-TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failures)
+TestGet(char * getvalstr, int getval, int memcount , FxI32 * memval, int * failures)
 {
   int ret;
   int i;
@@ -332,7 +328,7 @@ TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failur
   for(i=0;i<4;i++)              /*Clear Memory to some unique Pattern*/
     memval[i] =0xdeadbeef;
   
-  ret = grGet(getval, memcount*sizeof(long), memval );  /*Do the Get*/
+  ret = grGet(getval, memcount*sizeof(FxI32), memval );  /*Do the Get*/
   
   for(i=0;i<memcount;i++)
     /*if pattern still exists, then we have a problem*/
@@ -340,7 +336,7 @@ TestGet(char * getvalstr, int getval, int memcount , long * memval, int * failur
       correct=FXFALSE;
   
   /* if Number of bytes returned is wrong, then we have a problem*/
-  if(ret!=(int)(memcount*sizeof(long))) 
+  if(ret!=(int)(memcount*sizeof(FxI32))) 
     correct=FXFALSE;
   
   if(correct)                   /*print the results*/
diff --git a/glide3x/sst1/glide3/tests/test38.c b/glide3x/sst1/glide3/tests/test38.c
index dc391b2..e1e1ea1 100644
--- a/glide3x/sst1/glide3/tests/test38.c
+++ b/glide3x/sst1/glide3/tests/test38.c
@@ -39,9 +39,7 @@ static const char name[]    = "test38";
 static const char purpose[] = "Test the guGammaCorrectionRGB(..) function.";
 static const char usage[]   = "-n <frames> -r <res> -d <filename>";
 
-extern unsigned long hWndMain;
-
-void main( int argc, char **argv) 
+int main( int argc, char **argv) 
 {
   char match; 
   char **remArgs;
@@ -65,13 +63,13 @@ void main( int argc, char **argv)
   assert( hwconfig = tlVoodooType() );
 
   /* Process Command Line Arguments */
-  while( rv = tlGetOpt( argc, argv, "nrd", &match, &remArgs ) ) {
+  while((rv = tlGetOpt(argc, argv, "nrd", &match, &remArgs)) != 0) {
     if ( rv == -1 ) {
       printf( "Unrecognized command line argument\n" );
       printf( "%s %s\n", name, usage );
       printf( "Available resolutions:\n%s\n",
              tlGetResolutionList() );
-      return;
+      return 0;
     }
     switch( match ) {
     case 'n':
@@ -195,6 +193,6 @@ void main( int argc, char **argv)
   
  __errExit:    
   grGlideShutdown();
-  return;
+  return 0;
 }
 
diff --git a/glide3x/sst1/glide3/tests/test39.c b/glide3x/sst1/glide3/tests/test39.c
index 958d46c..eec4d52 100644
--- a/glide3x/sst1/glide3/tests/test39.c
+++ b/glide3x/sst1/glide3/tests/test39.c
@@ -58,7 +58,6 @@ main(int argc, char **argv)
   FxU32                wrange[2];
 
   FxU32
-    multiBaseMode = 0, 
     minTexSize = 1,
     maxTexSize = 256;
 
@@ -78,7 +77,7 @@ main(int argc, char **argv)
     exit(-1);
   }
   /* Process Command Line Arguments */
-  while(rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) {
+  while((rv = tlGetOpt(argc, argv, "dmnrx", &match, &remArgs)) != 0) {
     if (rv == -1) {
       printf("Unrecognized command line argument\n");
       printf("%s %s\n", name, usage);
@@ -369,9 +368,6 @@ main(int argc, char **argv)
 
   tlConOutput("Press a key to quit\n");
   while(frames-- && tlOkToRender()) {
-    static float 
-      curOOW = 1.0f;
-
     if (hwconfig == TL_VOODOORUSH) {
       tlGetDimsByConst(resolution,
                        &scrWidth,