improve config stuff
psr2 changes