Adding lots of windows env updates