More config options and fixes