Minor changes of script