Make it work in firefox and add analytics