some general cleanup, add support for desktop safari