More tweaking to runscript
More runscript work