some changes for env variables and stuff