Cleanup and script corrections.