Minor tweaks, added analytics.