04.15.13 cleaned up makefile