Improve Makefile and README