attempt at fixing issues on safari, in progress