Modified/Fixed Makefile