safari fixes + split logging