finished safari fixes