Update scripts, still WIP but getting there.
minor Tweaks to scripts