reworked config stuff, after checking