Use environment variables where possible
Usage typo fixes