Doc environment variables 593

fixes #593 
fixes #460 
Fixed in latest commit.