improvements in scripts