plugin.xml fixes and a few other things...