Minor adjustments and runscript.