Got rid of a few debug traces, added env vars