Update makefile and script