Updated scripts and Makefile