Adding problems, env vars, consistency
Easier way to source env vars