Update .env files and Fix Errors in Setup File