Tweaks to script and small things