config and fixes