Added some more useful stuff.
Modifications to support Safari