environ: reorg notes a little