Adding a final bunch of analytics (for now) Fixes #48