More places and player
Fix location association