Lots of env updates