updates to make env more versitile in other projects