Moved more settings into environment variables