improve tournament interface, fix match play