upgrade changes, fixed player select bug