reordered stuff, added some configuration changes