environment config, Evidence Updates for Event relationship, some cleanup