Add Tournament annotations
Fix updating
Clean tournaments