Adding some more environment variables and default settings