Add annexes and correct mistakes

Also indent XML files