Add fixes and config file