Tidied up collection, added player numbering, added 16 player limit