improve Config-dist.xml and stability