config updates/improvements