add environment configuration, more goblin cleanup