analytics + bugfixes