reformatted some stuff
some configuration changes