Updated compat, better error handling, more safari browsers