Change tense and joining word
Don't care about catchAll
Document environment variables