finished safari fixes and added comments