Fixed config... Most ID's fixed again