Brought up to date with new options and env vars.