Updated scripts and makefile