More analytics events. Removed some debug logging statements