Added umpire and team controllers, fixed wattball controller