Fixing issues in script after completing run thru