analytics improvements. closes #7