new version of config
fix bugs