Improved behavior when tmp directory exists
More intermittent improvements and cleanup
Merge branch 'dev-env-script-improvement'