Sorted config and changed few options