Added more names, reworked config_save