cleaned up makefile and setenv scripts