Revise the env dump and try and mask out some logging so it's easier to see what's going on