Tournament system & bug fixes