Various tweaks in the script file