cleaned up Makefile, few other things