firefox fixes, and remove of non-demo options
wording fix