fixed some bugs in safari
Merge branch 'temkav'