Fix some hard-wired locations
Document environment variable