Fixing Makefile and Improved