Add more set commands, clean up rest of env var checks.