Tidy up xml, bump version