got rid of duplicate scripts
Minor script changes