update more variables and such

make everything work with the dev environment.