Add options to player.
Add missing reference.
Merge.
Add some player options.