renamed 3 scripts and updated some functions