add config file
various fixes