Add flash player
Options improvements
Merge