alpha of configs
fixes and stuff
cleaning up
Merge branch 'config' into development