update plugin and tidy xml