Tightened up config a bit