some env improvements.