Added options hash to player, and a couple other pieces.