fixed some issues with safari and firefox