fixed all xml annotations