Restored vanilla tournaments

Plus some other small updates and fixes.