try to fix safari, clean up