A few more updates to analytics
A few more updates to analytics