config fix and stuffs