Cleaned up config stuff, still work to do