cleaned and made more intelligent configs