various changes in scripts