Small  improvements and adapted config.xml