Fix the way that old tournament laws are looked up
Rearrange output