complete fixes in Safari, Firefox