Various changes to scripts and new scripts added