Env guide: Various improvements

Fixes #3