Varioos changes in the scripts