Cleanup, and fixes (absolute path for env_file)