more script tweaks