Improve Makefile and revise README