Analytics
Cleanup & fixes.

Fixing recording as well as other stability issues.