Added analytic tracker among other small changes