Unified "player" (or fixed bugs)