made makefile, minor changes