Rework of the player wrapper in-progress.
Some updates and comments.