Added cup detection. Added multiple players. Added minor fixes.