More fine tuning of scripts