Change Makefile and instructions