env improvements