fixes and config file