Fixed and improved makefile