document the environment option and some cleanups. Go over the code and
fix/tweak random bits here and there.

Condense a few lines here and there.
Signed-off-by: Miek Gieben <miek@miek.nl>