Massive config update, cost fix