clean up, fix makefile