adding analytics and other small changes