add notes on environments
Merge branch 'upstream-clean'