updated scripts and makefile