fixes for gibberish in firefox
merge