A Few fixes, config.xml added.