diff --git a/MakeEnums.c b/MakeEnums.c
index de5e218..96a8438 100644
--- a/MakeEnums.c
+++ b/MakeEnums.c
@@ -335,6 +335,26 @@ void dump_WDPBRec(void)
   printf("\n");
 }
 
+void dump_SysEnvRec(void)
+{
+  printf("/* SysEnvRec */\n");
+
+  printf("_environsVersion = %u,\n", offsetof(SysEnvRec, environsVersion));
+  printf("_machineType = %u,\n", offsetof(SysEnvRec, machineType));
+  printf("_systemVersion = %u,\n", offsetof(SysEnvRec, systemVersion));
+  printf("_processor = %u,\n", offsetof(SysEnvRec, processor));
+  printf("_hasFPU = %u,\n", offsetof(SysEnvRec, hasFPU));
+  printf("_hasColorQD = %u,\n", offsetof(SysEnvRec, hasColorQD));
+  printf("_keyBoardType = %u,\n", offsetof(SysEnvRec, keyBoardType));
+  printf("_atDrvrVersNum = %u,\n", offsetof(SysEnvRec, atDrvrVersNum));
+  printf("_sysVRefNum = %u,\n", offsetof(SysEnvRec, sysVRefNum));
+
+  printf("\n");
+  printf("\n");
+}
+
+
+
 #define DUMP(xname) if (strcasecmp(name, #xname) == 0) { dump_ ## xname(); continue; }
 int main(int argc, char **argv)
 {
@@ -352,6 +372,7 @@ int main(int argc, char **argv)
     dump_IOParam();
     dump_VolumeParam();
     dump_WDPBRec();
+    dump_SysEnvRec();
   }
 
   for (i = 1; i < argc; ++i)
@@ -382,6 +403,10 @@ int main(int argc, char **argv)
         DUMP(IOParam);
         break;
 
+      case 's':
+        DUMP(SysEnvRec);
+        break;
+
       case 'v':
         DUMP(VolumeParam);
         break;
diff --git a/makefile b/makefile
index f486fd8..6f1d0f8 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,7 @@
 # makefile
 
+MPW ?= mpw
+
 # MPW 3.2
 LIBS = \
 	{Libraries}Stubs.o \
@@ -30,41 +32,35 @@ clean:
 	rm -f Help GetEnv Duplicate SetFile OverlayIIgs MakeEnums
 
 GetEnv: GetEnv.c.o
-	mpw Link $(LDFLAGS) -o $@ $^ $(LIBS) 
+	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 Help: Help.c.o
-	mpw Link $(LDFLAGS) -o $@ $^ $(LIBS) 
+	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 
 Duplicate: Duplicate.c.o
-	mpw Link $(LDFLAGS) -o $@ $^ $(LIBS) 
+	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 
 SetFile: SetFile.c.o SetFile-flags.c.o
-	mpw Link $(LDFLAGS) -o $@ $^ $(LIBS) 
+	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 
 OverlayIIgs: OverlayIIgs.c.o OverlayIIgs-flags.c.o
-	mpw Link $(LDFLAGS) -o $@ $^ $(LIBS) 
+	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 ListRez: ListRez.c.o
-	mpw Link $(LDFLAGS) -o $@ $^ $(LIBS) 
+	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 ListRezIIgs: ListRezIIgs.c.o
-	mpw Link $(LDFLAGS) -o $@ $^ $(LIBS) 
+	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 MakeEnums: MakeEnums.c.o
-	mpw Link $(LDFLAGS) -o $@ $^ $(LIBS) 
+	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 #SetFile.c : SetFile.rl
 #	ragel -G2 -p -m -o $@ $<
 
 
 %.c.o : %.c
-	mpw SC -p $< -o $@
-
-# GetEnv.c.o : GetEnv.c
-# 	mpw SC -p GetEnv.c -o $@
-
-# Help.c.o : Help.c
-# 	mpw SC -p Help.c -o $@
\ No newline at end of file
+	$(MPW) SC -p $< -o $@