Removed static data
Misc fixes
Better player retrieval