diff --git a/TODO.txt b/TODO.txt
index 80d517e..b43ba97 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -15,7 +15,9 @@ expression '(' expression ')' -> 16-bit offset.
 
 stack dump?  any safe way to get the previous address (how many bytes for jsr?)
 
-
+option for MPW 3.2 vs 3.5?
+store as MPWVersion (standard shell variable)
+CLibraries=$MPW:Libraries:CLibraries-$MPWVersion:
 
 
 
diff --git a/Tools/makefile b/Tools/makefile
index 590ef3f..af2c33f 100644
--- a/Tools/makefile
+++ b/Tools/makefile
@@ -3,7 +3,9 @@
 Libraries=~/mpw/Libraries/Libraries
 CLibraries=~/mpw/Libraries/CLibraries
 
-LIBS = 	$(Libraries)/Stubs.o \
+# MPW 3.2
+LIBS = \
+	$(Libraries)/Stubs.o \
 	$(CLibraries)/StdCLib.o \
 	$(Libraries)/Interface.o \
 	$(Libraries)/Runtime.o \
@@ -12,8 +14,24 @@ LIBS = 	$(Libraries)/Stubs.o \
 LDFLAGS = -w -c 'MPS ' -t MPST \
 	-sn STDIO=Main -sn INTENV=Main -sn %A5Init=Main
 
+# MPW 3.5
+
+# LIBS = \
+# 	$(CLibraries)/StdCLib.o \
+# 	$(Libraries)/Stubs.o \
+# 	$(Libraries)/IntEnv.o \
+# 	$(Libraries)/MacRuntime.o \
+# 	$(Libraries)/Interface.o \
+# 	$(Libraries)/ToolLibs.o
+
+# LDFLAGS = -d -c 'MPS ' -t MPST
+
 all: Help GetEnv Duplicate SetFile
 
+clean:
+	rm -f *.c.o
+	rm -f Help GetEnv Duplicate SetFile
+
 GetEnv: GetEnv.c.o
 	mpw Link $(LDFLAGS) -o $@ $^ $(LIBS)