Enhance Makefile and .gitignore