fixes and config file added