script tweaks
Latest fixes