Minor Tweaks To Scripts