rename config, fix bugs