config.xml and other tweaks