config.xml fixes and improvements