env vars and typo fixes